133 files changed, 32209 insertions, 27951 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d907f537ff..5686c4309e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,29 @@
 Changes for 6.0.0alpha2
 
 New features:
+A.F.....S. [ZBXNEXT-6824] replaced simple macros with expression macros (asestakovs, Sasha)
+........S. [ZBXNEXT-6870] implemented support of additional HTTP methods for webhooks (dgoloscapov)
+A......... [ZBXNEXT-6470,ZBXNEXT-6866] implemented audit logging of usergroup API object (rlataria, Sasha)
+........S. [ZBXNEXT-6830] implemented audit on server (processing discovered items) (akozlovs)
+........S. [ZBXNEXT-6817] implemented audit for server (linking templates - items, items prototypes, discovery rules) (arimdjonoks)
+........S. [ZBXNEXT-6820] added utf8mb3 when checking for supported mysql character sets and collations (ashubin, wiper)
+A......... [ZBXNEXT-6470,ZBXNEXT-6859] added logging of deleted tokens when deleting a user (rlataria, Sasha)
+.........T [ZBXNEXT-6789] added template for Travis CI (abiba)
 A.F....... [ZBXNEXT-6800] implemented complex service status calculation and propagation rules (ashubin, averza, wiper)
 
 Bug fixes:
+.........T [ZBX-19865] fixed typos in "F5 Big-IP SNMP" template (abakaldin)
+.........T [ZBX-19835] fixed incorrect master item in template "Hikvision camera by HTTP" (abakaldin)
+.........T [ZBX-19849] fixed a trigger name typo in the "MSSQL by ODBC" template (mchudinov)
+...G...... [ZBX-19613] fixed Zabbix agent 2 redis plugin to closer match redis-cli connection (esneiders)
+...G...... [ZBX-19510] fixed re-reading of old Windows events for various Windows event system synchronization problems (MVekslers)
+...G...... [ZBX-16803] fixed ability to use Interface Guid in network interface LLD (akozlovs)
+........S. [ZBX-19236] fixed task manager constantly busy with close_problem task if trigger no longer exists but event still exist (dgoloscapov)
+..F....... [ZBX-19581] fixed untranslated and incorrectly translated strings (agriscenko)
+.........T [ZBX-18680] fixed multi-channel notification issue in "Slack" media type (abiba)
+A.......S. [ZBX-19822] fixed Zabbix server not to populate housekeeper table with tasks that are never deleted when TimescaleDB partitioning is used (jfreibergs, vso)
+.........T [ZBX-19623] fixed Jira Service Desk URL in webhook (abiba)
+A......... [ZBX-19857] dropped support for the non-working option "with_gui_access" in the usergroup.get() method (Sasha)
 
 --------------------------------------------------------------------------------
 Changes for 6.0.0alpha1
@@ -35,8 +55,22 @@ Bug fixes:
 Changes for 5.4.5rc1
 
 New features:
+........S. [ZBXNEXT-6820] added utf8mb3 when checking for supported mysql character sets and collations (ashubin, wiper)
+.........T [ZBXNEXT-6789] added template for Travis CI (abiba)
 
 Bug fixes:
+.........T [ZBX-19865] fixed typos in "F5 Big-IP SNMP" template (abakaldin)
+.........T [ZBX-19835] fixed incorrect master item in template "Hikvision camera by HTTP" (abakaldin)
+.........T [ZBX-19849] fixed a trigger name typo in the "MSSQL by ODBC" template (mchudinov)
+...G...... [ZBX-19613] fixed Zabbix agent 2 redis plugin to closer match redis-cli connection (esneiders)
+...G...... [ZBX-19510] fixed re-reading of old Windows events for various Windows event system synchronization problems (MVekslers)
+...G...... [ZBX-16803] fixed ability to use Interface Guid in network interface LLD (akozlovs)
+........S. [ZBX-19236] fixed task manager constantly busy with close_problem task if trigger no longer exists but event still exist (dgoloscapov)
+..F....... [ZBX-19581] fixed untranslated and incorrectly translated strings (agriscenko)
+.........T [ZBX-18680] fixed multi-channel notification issue in "Slack" media type (abiba)
+A.......S. [ZBX-19822] fixed Zabbix server not to populate housekeeper table with tasks that are never deleted when TimescaleDB partitioning is used (jfreibergs, vso)
+.........T [ZBX-19623] fixed Jira Service Desk URL in webhook (abiba)
+A......... [ZBX-19857] dropped support for the non-working option "with_gui_access" in the usergroup.get() method (Sasha)
 
 --------------------------------------------------------------------------------
 Changes for 5.4.4
@@ -1029,8 +1063,19 @@ A......... [ZBX-17955] fixed "medias" parameter named inconsistency in user.crea
 Changes for 5.0.16rc1
 
 New features:
+........S. [ZBXNEXT-6820] added utf8mb3 when checking for supported mysql character sets and collations (ashubin, wiper)
 
 Bug fixes:
+.........T [ZBX-19865] fixed typos in "F5 Big-IP SNMP" template (abakaldin)
+.........T [ZBX-19849] fixed a trigger name typo in the "MSSQL by ODBC" template (mchudinov)
+...G...... [ZBX-19613] fixed Zabbix agent 2 redis plugin to closer match redis-cli connection (esneiders)
+...G...... [ZBX-19510] fixed re-reading of old Windows events for various Windows event system synchronization problems (MVekslers)
+...G...... [ZBX-16803] fixed ability to use Interface Guid in network interface LLD (akozlovs)
+........S. [ZBX-19236] fixed task manager constantly busy with close_problem task if trigger no longer exists but event still exist (dgoloscapov)
+.........T [ZBX-18680] fixed multi-channel notification issue in "Slack" media type (abiba)
+.........T [ZBX-19623] fixed Jira Service Desk URL in webhook (abiba)
+A.......S. [ZBX-19822] fixed Zabbix server not to populate housekeeper table with tasks that are never deleted when TimescaleDB partitioning is used (jfreibergs, vso)
+A......... [ZBX-19857] dropped support for the non-working option "with_gui_access" in the usergroup.get() method (Sasha)
 
 --------------------------------------------------------------------------------
 Changes for 5.0.15
@@ -3239,6 +3284,7 @@ Changes for 4.0.34rc1
 New features:
 
 Bug fixes:
+A......... [ZBX-19857] dropped support for the non-working option "with_gui_access" in the usergroup.get() method (Sasha)
 
 --------------------------------------------------------------------------------
 Changes for 4.0.33
diff --git a/ChangeLog.d/bugfix/ZBX-18680 b/ChangeLog.d/bugfix/ZBX-18680
deleted file mode 100644
index 20840cebc61..00000000000
--- a/ChangeLog.d/bugfix/ZBX-18680
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-18680] fixed multi-channel notification issue in "Slack" media type (abiba)
diff --git a/ChangeLog.d/bugfix/ZBX-19623 b/ChangeLog.d/bugfix/ZBX-19623
deleted file mode 100644
index 89fb8f7a4be..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19623
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-19623] fixed Jira Service Desk URL in webhook (abiba)
diff --git a/ChangeLog.d/bugfix/ZBX-19822 b/ChangeLog.d/bugfix/ZBX-19822
deleted file mode 100644
index 62f38ded031..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19822
+++ /dev/null
@@ -1 +0,0 @@
-A.......S. [ZBX-19822] fixed Zabbix server not to populate housekeeper table with tasks that are never deleted when TimescaleDB partitioning is used (jfreibergs, vso)
diff --git a/ChangeLog.d/bugfix/ZBX-19857 b/ChangeLog.d/bugfix/ZBX-19857
deleted file mode 100644
index 4493d5cb88b..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19857
+++ /dev/null
@@ -1 +0,0 @@
-A......... [ZBX-19857] dropped support for the non-working option "with_gui_access" in the usergroup.get() method (Sasha)
diff --git a/ChangeLog.d/feature/ZBXNEXT-6789 b/ChangeLog.d/feature/ZBXNEXT-6789
deleted file mode 100644
index 2d1529053b7..00000000000
--- a/ChangeLog.d/feature/ZBXNEXT-6789
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBXNEXT-6789] added template for Travis CI (abiba)
diff --git a/ChangeLog.d/feature/ZBXNEXT-6859 b/ChangeLog.d/feature/ZBXNEXT-6859
deleted file mode 100644
index f7a6ca65945..00000000000
--- a/ChangeLog.d/feature/ZBXNEXT-6859
+++ /dev/null
@@ -1 +0,0 @@
-A......... [ZBXNEXT-6470,ZBXNEXT-6859] added logging of deleted tokens when deleting a user (rlataria, Sasha)
diff --git a/build-backend.xml b/build-backend.xml
index d42f3d27e3d..75707929dc3 100644
--- a/build-backend.xml
+++ b/build-backend.xml
@@ -339,5 +339,19 @@
 		<ant antfile="../build-backend.xml" dir="sources" target="build-dist" inheritAll="true" inheritRefs="true"/>
 	</target>
 
+	<target name="agent2-tests">
+		<!-- Create, build & test agent2 -->
+		<exec executable="./bootstrap.sh" failonerror="on"/>
+		<exec executable="./configure" failonerror="on">
+			<arg line="--quiet"/>
+			<arg line="--enable-agent2"/>
+		</exec>
+		<exec executable="make" failonerror="on">
+			<arg line="-s"/>
+			<arg line="-j5"/>
+			<arg line="check"/>
+		</exec>
+	</target>
+
 	<target name="build" depends="make-dist"/>
 </project>
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl
index 52378a5b639..491c2986799 100644
--- a/create/src/schema.tmpl
+++ b/create/src/schema.tmpl
@@ -1891,4 +1891,4 @@ INDEX		|1		|serviceid
 TABLE|dbversion||
 FIELD		|mandatory	|t_integer	|'0'	|NOT NULL	|
 FIELD		|optional	|t_integer	|'0'	|NOT NULL	|
-ROW		|5050055	|5050055
+ROW		|5050068	|5050068
diff --git a/include/common.h b/include/common.h
index 9659c81c94b..36a337da2c8 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1485,14 +1485,14 @@ typedef struct
 }
 zbx_strloc_t;
 
-/* data used by macros, ldd macros and objectid tokens */
+/* data used by macros, lld macros and objectid tokens */
 typedef struct
 {
 	zbx_strloc_t	name;
 }
 zbx_token_macro_t;
 
-/* data used by macros, ldd macros and objectid tokens */
+/* data used by macros, lld macros and objectid tokens */
 typedef struct
 {
 	zbx_strloc_t	expression;
@@ -1574,6 +1574,7 @@ zbx_token_t;
 #define ZBX_TOKEN_SEARCH_REFERENCES		0x01
 #define ZBX_TOKEN_SEARCH_EXPRESSION_MACRO	0x02
 #define ZBX_TOKEN_SEARCH_FUNCTIONID		0x04
+#define ZBX_TOKEN_SEARCH_SIMPLE_MACRO		0x08	/* used by the upgrade patches only */
 
 typedef int zbx_token_search_t;
 
@@ -1583,7 +1584,8 @@ int	zbx_token_parse_user_macro(const char *expression, const char *macro, zbx_to
 int	zbx_token_parse_macro(const char *expression, const char *macro, zbx_token_t *token);
 int	zbx_token_parse_objectid(const char *expression, const char *macro, zbx_token_t *token);
 int	zbx_token_parse_lld_macro(const char *expression, const char *macro, zbx_token_t *token);
-int	zbx_token_parse_nested_macro(const char *expression, const char *macro, zbx_token_t *token);
+int	zbx_token_parse_nested_macro(const char *expression, const char *macro, int simple_macro_find,
+		zbx_token_t *token);
 
 int	zbx_strmatch_condition(const char *value, const char *pattern, unsigned char op);
 
diff --git a/include/db.h b/include/db.h
index 1f7810d58f9..b46de9a30d7 100644
--- a/include/db.h
+++ b/include/db.h
@@ -901,6 +901,7 @@ zbx_db_tag_t;
 zbx_db_tag_t	*zbx_db_tag_create(const char *tag_tag, const char *tag_value);
 void		zbx_db_tag_free(zbx_db_tag_t *tag);
 int		zbx_db_tag_compare_func(const void *d1, const void *d2);
+int		zbx_db_tag_compare_func_template(const void *d1, const void *d2);
 
 ZBX_PTR_VECTOR_DECL(db_tag_ptr, zbx_db_tag_t *)
 
diff --git a/include/dbcache.h b/include/dbcache.h
index ba0d145cc58..6023fa67e16 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -689,6 +689,7 @@ void	DCconfig_unlock_triggers(const zbx_vector_uint64_t *triggerids);
 void	DCconfig_unlock_all_triggers(void);
 void	DCconfig_get_triggers_by_itemids(zbx_hashset_t *trigger_info, zbx_vector_ptr_t *trigger_order,
 		const zbx_uint64_t *itemids, const zbx_timespec_t *timespecs, int itemids_num);
+int	DCconfig_trigger_exists(zbx_uint64_t triggerid);
 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_suggested_snmp_vars(zbx_uint64_t interfaceid, int *bulk);
@@ -994,7 +995,6 @@ unsigned char	zbx_dc_set_macro_env(unsigned char env);
 const char	*zbx_dc_get_instanceid(void);
 
 char	*zbx_dc_expand_user_macros(const char *text, zbx_uint64_t hostid);
-char	*zbx_dc_expand_user_macros_in_func_params(const char *params, zbx_uint64_t hostid);
 int	zbx_dc_expand_user_macros_len(const char *text, size_t text_len, zbx_uint64_t *hostids, int hostids_num,
 		char **value, char **error);
 
diff --git a/include/service_protocol.h b/include/service_protocol.h
index 4e3220d0868..f1093bc10e8 100644
--- a/include/service_protocol.h
+++ b/include/service_protocol.h
@@ -29,6 +29,13 @@
 #include "zbxalgo.h"
 #include "zbxservice.h"
 
+typedef struct
+{
+	zbx_uint64_t	eventid;
+	int		severity;
+}
+zbx_event_severity_t;
+
 void	zbx_service_serialize(unsigned char **data, size_t *data_alloc, size_t *data_offset, zbx_uint64_t eventid,
 		int clock, int ns, int value, int severity, const zbx_vector_ptr_t *tags);
 void	zbx_service_deserialize(const unsigned char *data, zbx_uint32_t size, zbx_vector_ptr_t *events);
@@ -41,11 +48,11 @@ void	zbx_service_serialize_rootcause(unsigned char **data, size_t *data_alloc, s
 		zbx_uint64_t serviceid, const zbx_vector_uint64_t *eventids);
 void	zbx_service_deserialize_rootcause(const unsigned char *data, zbx_uint32_t size,
 		zbx_vector_service_t *services);
-void	zbx_service_serialize_parent_service(unsigned char **data, size_t *data_alloc, size_t *data_offset,
-		zbx_uint64_t serviceid, zbx_vector_tags_t *tags);
-void	zbx_service_deserialize_parent_services(const unsigned char *data, zbx_uint32_t size,
-		zbx_vector_ptr_t *parent_services);
+
 zbx_uint32_t	zbx_service_serialize_parentids(unsigned char **data, const zbx_vector_uint64_t *ids);
 void	zbx_service_deserialize_parentids(const unsigned char *data, zbx_vector_uint64_t *ids);
 
+zbx_uint32_t	zbx_service_serialize_event_severities(unsigned char **data, const zbx_vector_ptr_t *event_severities);
+void	zbx_service_deserialize_event_severities(const unsigned char *data, zbx_vector_ptr_t *event_severities);
+
 #endif
diff --git a/include/zbxserver.h b/include/zbxserver.h
index ecf4f577f16..d3062c796ea 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -61,8 +61,6 @@
 
 #define STR_CONTAINS_MACROS(str)	(NULL != strchr(str, '{'))
 
-int	evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter,
-		const zbx_timespec_t *ts, char **error);
 int	evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function, const char *parameter,
 		const zbx_timespec_t *ts, char **error);
 
@@ -125,7 +123,6 @@ int	zbx_expression_eval_execute(zbx_expression_eval_t *eval, const zbx_timespec_
 #define ZBX_MACRO_ANY		(ZBX_TOKEN_LLD_MACRO | ZBX_TOKEN_LLD_FUNC_MACRO | ZBX_TOKEN_USER_MACRO)
 #define ZBX_MACRO_JSON		(ZBX_MACRO_ANY | ZBX_TOKEN_JSON)
 #define ZBX_MACRO_XML		(ZBX_MACRO_ANY | ZBX_TOKEN_XML)
-#define ZBX_MACRO_SIMPLE	(ZBX_MACRO_ANY | ZBX_TOKEN_SIMPLE_MACRO)
 #define ZBX_MACRO_FUNC		(ZBX_MACRO_ANY | ZBX_TOKEN_FUNC_MACRO)
 
 int	substitute_lld_macros(char **data, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths,
diff --git a/include/zbxservice.h b/include/zbxservice.h
index be37c49b829..9ce99d7af20 100644
--- a/include/zbxservice.h
+++ b/include/zbxservice.h
@@ -33,6 +33,7 @@ ZBX_PTR_VECTOR_DECL(service, DB_SERVICE *)
 #define ZBX_IPC_SERVICE_SERVICE_PROBLEMS_DELETE	3
 #define ZBX_IPC_SERVICE_SERVICE_ROOTCAUSE	4
 #define ZBX_IPC_SERVICE_SERVICE_PARENT_LIST	5
+#define ZBX_IPC_SERVICE_EVENT_SEVERITIES	6
 
 void	zbx_service_flush(zbx_uint32_t code, unsigned char *data, zbx_uint32_t size);
 void	zbx_service_send(zbx_uint32_t code, unsigned char *data, zbx_uint32_t size, zbx_ipc_message_t *response);
diff --git a/include/zbxtrends.h b/include/zbxtrends.h
index 33ed4387d14..80466d2be4b 100644
--- a/include/zbxtrends.h
+++ b/include/zbxtrends.h
@@ -32,7 +32,6 @@ int	zbx_trends_parse_nextcheck(time_t from, const char *period_shift, time_t *ne
 
 int	zbx_trends_eval_avg(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error);
 int	zbx_trends_eval_count(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error);
-int	zbx_trends_eval_delta(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error);
 int	zbx_trends_eval_max(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error);
 int	zbx_trends_eval_min(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error);
 int	zbx_trends_eval_sum(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error);
diff --git a/src/go/internal/agent/scheduler/manager.go b/src/go/internal/agent/scheduler/manager.go
index a76309a78f4..5b66df51698 100644
--- a/src/go/internal/agent/scheduler/manager.go
+++ b/src/go/internal/agent/scheduler/manager.go
@@ -60,9 +60,9 @@ type Manager struct {
 
 // updateRequest contains list of metrics monitored by a client and additional client configuration data.
 type updateRequest struct {
-	clientID uint64
-	sink     plugin.ResultWriter
-	requests []*plugin.Request
+	clientID    uint64
+	sink        plugin.ResultWriter
+	requests    []*plugin.Request
 	expressions []*glexpr.Expression
 }
 
@@ -97,7 +97,7 @@ func (m *Manager) cleanupClient(c *client, now time.Time) {
 		for deactivate := true; deactivate; {
 			deactivate = false
 			for _, t := range p.tasks {
-				if t.isRecurring() {
+				if t.isActive() && t.isRecurring() {
 					t.deactivate()
 					// deactivation can change tasks ordering, so repeat the iteration if task was deactivated
 					deactivate = true
@@ -459,12 +459,12 @@ func (m *Manager) Stop() {
 	m.input <- nil
 }
 
-func (m *Manager) UpdateTasks(clientID uint64, writer plugin.ResultWriter, 
+func (m *Manager) UpdateTasks(clientID uint64, writer plugin.ResultWriter,
 	expressions []*glexpr.Expression, requests []*plugin.Request) {
 
 	m.input <- &updateRequest{clientID: clientID,
-		sink:     writer,
-		requests: requests,
+		sink:        writer,
+		requests:    requests,
 		expressions: expressions,
 	}
 }
diff --git a/src/go/internal/agent/scheduler/manager_test.go b/src/go/internal/agent/scheduler/manager_test.go
index 025c6d63714..207bca8f53c 100644
--- a/src/go/internal/agent/scheduler/manager_test.go
+++ b/src/go/internal/agent/scheduler/manager_test.go
@@ -124,6 +124,22 @@ func (p *mockRunnerPlugin) Stop() {
 	p.call("$stop")
 }
 
+type mockPassiveRunnerPlugin struct {
+	plugin.Base
+	mockPlugin
+}
+
+func (p *mockPassiveRunnerPlugin) Export(key string, params []string, ctx plugin.ContextProvider) (result interface{}, err error) {
+	return
+}
+func (p *mockPassiveRunnerPlugin) Start() {
+	p.call("$start")
+}
+
+func (p *mockPassiveRunnerPlugin) Stop() {
+	p.call("$stop")
+}
+
 type watchTracker interface {
 	watched() []*plugin.Request
 }
@@ -136,7 +152,6 @@ type mockWatcherPlugin struct {
 
 func (p *mockWatcherPlugin) Watch(requests []*plugin.Request, ctx plugin.ContextProvider) {
 	p.call("$watch")
-	log.Debugf("WATCH %s %v", p.Name(), requests)
 	p.requests = requests
 }
 
@@ -283,6 +298,23 @@ func (m *mockManager) mockTasks() {
 				}
 				p.enqueueTask(mockTask)
 				m.clients[index[t]].exporters[t.item.itemid] = mockTask
+			case *directExporterTask:
+				mockTask := &mockExporterTask{
+					exporterTask: exporterTask{
+						taskBase: taskBase{
+							plugin:    task.getPlugin(),
+							scheduled: getNextcheck(t.item.delay, m.now).Add(priorityExporterTaskNs),
+							index:     -1,
+							active:    task.isActive(),
+							recurring: true,
+						},
+						item:   t.item,
+						client: t.client,
+						meta:   t.meta,
+					},
+					sink: m.sink,
+				}
+				p.enqueueTask(mockTask)
 			case *starterTask:
 				mockTask := &mockStarterTask{
 					taskBase: taskBase{
@@ -1227,7 +1259,6 @@ func TestRunner(t *testing.T) {
 	manager.mockTasks()
 	manager.iterate(t, 1)
 	manager.checkPluginTimeline(t, plugins, calls, 1)
-
 }
 
 func checkWatchRequests(t *testing.T, p plugin.Accessor, requests []*plugin.Request) {
@@ -1622,7 +1653,7 @@ func TestPassiveRunner(t *testing.T) {
 	plugin.ClearRegistry()
 	plugins := make([]plugin.Accessor, 3)
 	for i := range plugins {
-		plugins[i] = &mockRunnerPlugin{Base: plugin.Base{}, mockPlugin: mockPlugin{now: &manager.now}}
+		plugins[i] = &mockPassiveRunnerPlugin{Base: plugin.Base{}, mockPlugin: mockPlugin{now: &manager.now}}
 		name := fmt.Sprintf("debug%d", i+1)
 		plugin.RegisterMetrics(plugins[i], name, name, "Debug.")
 	}
@@ -1642,7 +1673,7 @@ func TestPassiveRunner(t *testing.T) {
 
 	var cache resultCacheMock
 	update := updateRequest{
-		clientID: 0,
+		clientID: agent.PassiveChecksClientID,
 		sink:     &cache,
 		requests: make([]*plugin.Request, 0),
 	}
diff --git a/src/go/pkg/metric/metric_test.go b/src/go/pkg/metric/metric_test.go
index d0fa21ba56e..32579af12c7 100644
--- a/src/go/pkg/metric/metric_test.go
+++ b/src/go/pkg/metric/metric_test.go
@@ -182,7 +182,9 @@ func TestMetric_EvalParams(t *testing.T) {
 					"Session1": {URI: "localhost", User: "user", Password: "password"},
 				},
 			},
-			want:      map[string]string{"URI": "localhost", "User": "user", "Password": "password", "Param1": "15"},
+			want: map[string]string{
+				"URI": "localhost", "User": "user", "Password": "password", "Param1": "15", "sessionName": "Session1",
+			},
 			wantErr:   false,
 			wantPanic: false,
 		},
diff --git a/src/go/plugins/kernel/kernel_test.go b/src/go/plugins/kernel/kernel_test.go
index aac40ef48e6..8c20e3bb85d 100644
--- a/src/go/plugins/kernel/kernel_test.go
+++ b/src/go/plugins/kernel/kernel_test.go
@@ -30,82 +30,83 @@ import (
 )
 
 var testSets = []testSet{
-	{"testKernel01",
+	{
+		"testKernel01_empty",
 		[]testCase{
-			{1, "test_name", "kernel.maxfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
-			{2, "test_name", "kernel.maxproc", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
-			{3, "test_name", "kernel.openfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "maxfiles", "kernel.maxfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{2, "maxproc", "kernel.maxproc", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{3, "openfiles", "kernel.openfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"",
 		"",
 	}, {
-		"testKernel02",
+		"testKernel02_file-max",
 		[]testCase{
-			{1, "test_name", "kernel.maxfiles", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
-			{2, "test_name", "kernel.maxfiles", []string{""}, true, uint64(18446744073709551615), reflect.Uint64},
-			{3, "test_name", "kernel.maxfiles", []string{"param"}, true, uint64(18446744073709551615), reflect.Uint64},
-			{4, "test_name", "wrong.key", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "maxfiles_no_params", "kernel.maxfiles", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
+			{2, "maxfiles_empty_pram_value", "kernel.maxfiles", []string{""}, true, uint64(18446744073709551615), reflect.Uint64},
+			{3, "maxfiles_with_params", "kernel.maxfiles", []string{"param"}, true, uint64(18446744073709551615), reflect.Uint64},
+			{4, "wrong_key", "wrong.key", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/fs/file-max",
 		"18446744073709551615\n",
 	}, {
-		"testKernel03",
+		"testKernel03_pid_max",
 		[]testCase{
-			{1, "test_name", "kernel.maxproc", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
-			{2, "test_name", "kernel.maxproc", []string{""}, true, uint64(18446744073709551615), reflect.Uint64},
-			{3, "test_name", "kernel.maxproc", []string{"param"}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "maxproc_no_params", "kernel.maxproc", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
+			{2, "maxproc_empty_pram_value", "kernel.maxproc", []string{""}, true, uint64(18446744073709551615), reflect.Uint64},
+			{3, "maxproc_with_params", "kernel.maxproc", []string{"param"}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/kernel/pid_max",
 		"18446744073709551615\n",
 	}, {
-		"testKernel04",
+		"testKernel04_pid_max_no_new_line",
 		[]testCase{
-			{1, "test_name", "kernel.maxproc", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
+			{1, "maxproc_no_params", "kernel.maxproc", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/kernel/pid_max",
 		"18446744073709551615",
 	}, {
-		"testKernel05",
+		"testKernel05_file-max_no_new_line",
 		[]testCase{
-			{1, "test_name", "kernel.maxfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "maxfiles_no_params", "kernel.maxfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/fs/file-max",
 		"18446744073709551616",
 	}, {
-		"testKernel06",
+		"testKernel06_pid_max_short_file",
 		[]testCase{
-			{1, "test_name", "kernel.maxproc", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "maxproc_no_params", "kernel.maxproc", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/kernel/pid_max",
 		"abc123",
 	}, {
-		"testKernel07",
+		"testKernel07_file-max_empty_file",
 		[]testCase{
-			{1, "test_name", "kernel.maxfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "maxfiles_no_params", "kernel.maxfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/fs/file-max",
 		"",
 	}, {
-		"testKernel08",
+		"testKernel08_file-nr",
 		[]testCase{
-			{1, "test_name", "kernel.openfiles", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
-			{2, "test_name", "kernel.openfiles", []string{""}, true, uint64(18446744073709551615), reflect.Uint64},
-			{3, "test_name", "kernel.openfiles", []string{"param"}, true, uint64(18446744073709551615), reflect.Uint64},
-			{4, "test_name", "wrong.key", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "openfiles_no_params", "kernel.openfiles", []string{}, false, uint64(18446744073709551615), reflect.Uint64},
+			{2, "openfiles_empty_pram_value", "kernel.openfiles", []string{""}, true, uint64(18446744073709551615), reflect.Uint64},
+			{3, "openfiles_with_params", "kernel.openfiles", []string{"param"}, true, uint64(18446744073709551615), reflect.Uint64},
+			{4, "wrong_key", "wrong.key", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/fs/file-nr",
 		"18446744073709551615\n",
 	}, {
-		"testKernel09",
+		"testKernel09_file-nr_no_new_line",
 		[]testCase{
-			{1, "test_name", "kernel.openfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "openfiles_no_params", "kernel.openfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/fs/file-nr",
 		"18446744073709551616",
 	}, {
-		"testKernel10",
+		"testKernel10_file-nr_empty_file",
 		[]testCase{
-			{1, "test_name", "kernel.openfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
+			{1, "openfiles_no_params", "kernel.openfiles", []string{}, true, uint64(18446744073709551615), reflect.Uint64},
 		},
 		"/proc/sys/fs/file-nr",
 		"",
diff --git a/src/go/plugins/net/netif/netif.go b/src/go/plugins/net/netif/netif.go
index 9c1bc41cb6b..ef2acbe21a1 100644
--- a/src/go/plugins/net/netif/netif.go
+++ b/src/go/plugins/net/netif/netif.go
@@ -46,5 +46,6 @@ const (
 )
 
 type msgIfDiscovery struct {
-	Ifname string `json:"{#IFNAME}"`
+	Ifname string  `json:"{#IFNAME}"`
+	Ifguid *string `json:"{#IFGUID},omitempty"`
 }
diff --git a/src/go/plugins/net/netif/netif_linux.go b/src/go/plugins/net/netif/netif_linux.go
index e74edf2d984..17087944066 100644
--- a/src/go/plugins/net/netif/netif_linux.go
+++ b/src/go/plugins/net/netif/netif_linux.go
@@ -127,7 +127,7 @@ func (p *Plugin) getDevDiscovery() (netInterfaces []msgIfDiscovery, err error) {
 	for sLines := bufio.NewScanner(f); sLines.Scan(); {
 		dev := strings.Split(sLines.Text(), ":")
 		if len(dev) > 1 {
-			netInterfaces = append(netInterfaces, msgIfDiscovery{strings.TrimSpace(dev[0])})
+			netInterfaces = append(netInterfaces, msgIfDiscovery{strings.TrimSpace(dev[0]), nil})
 		}
 	}
 
diff --git a/src/go/plugins/net/netif/netif_windows.go b/src/go/plugins/net/netif/netif_windows.go
index d06a7cd11d6..d12e4ddffd4 100644
--- a/src/go/plugins/net/netif/netif_windows.go
+++ b/src/go/plugins/net/netif/netif_windows.go
@@ -34,6 +34,7 @@ import (
 const (
 	errorEmptyIpTable = "Empty IP address table returned."
 	errorCannotFindIf = "Cannot obtain network interface information."
+	guidStringLen     = 38
 )
 
 func (p *Plugin) nToIP(addr uint32) net.IP {
@@ -85,6 +86,10 @@ func (p *Plugin) getIfRowByIP(ipaddr string, ifs []win32.MIB_IF_ROW2) (row *win3
 	return
 }
 
+func (p *Plugin) getGuidString(winGuid win32.GUID) string {
+	return fmt.Sprintf("{%08X-%04X-%04X-%02X-%02X}", winGuid.Data1, winGuid.Data2, winGuid.Data3, winGuid.Data4[:2], winGuid.Data4[2:])
+}
+
 func (p *Plugin) getNetStats(networkIf string, statName string, dir dirFlag) (result uint64, err error) {
 	var ifTable *win32.MIB_IF_TABLE2
 	if ifTable, err = win32.GetIfTable2(); err != nil {
@@ -96,7 +101,9 @@ func (p *Plugin) getNetStats(networkIf string, statName string, dir dirFlag) (re
 
 	var row *win32.MIB_IF_ROW2
 	for i := range ifs {
-		if networkIf == windows.UTF16ToString(ifs[i].Description[:]) {
+		if len(networkIf) == guidStringLen && networkIf[0] == '{' && networkIf[guidStringLen-1] == '}' &&
+			networkIf == p.getGuidString(ifs[i].InterfaceGuid) ||
+			networkIf == windows.UTF16ToString(ifs[i].Description[:]) {
 			row = &ifs[i]
 			break
 		}
@@ -154,7 +161,8 @@ func (p *Plugin) getDevDiscovery() (devices []msgIfDiscovery, err error) {
 	devices = make([]msgIfDiscovery, 0, table.NumEntries)
 	rows := (*win32.RGMIB_IF_ROW2)(unsafe.Pointer(&table.Table[0]))[:table.NumEntries:table.NumEntries]
 	for i := range rows {
-		devices = append(devices, msgIfDiscovery{windows.UTF16ToString(rows[i].Description[:])})
+		guid := p.getGuidString(rows[i].InterfaceGuid)
+		devices = append(devices, msgIfDiscovery{windows.UTF16ToString(rows[i].Description[:]), &guid})
 	}
 	return
 }
diff --git a/src/go/plugins/redis/conn.go b/src/go/plugins/redis/conn.go
index e16e90c67d2..1ee53ec81ed 100644
--- a/src/go/plugins/redis/conn.go
+++ b/src/go/plugins/redis/conn.go
@@ -21,6 +21,7 @@ package redis
 
 import (
 	"context"
+	"errors"
 	"sync"
 	"time"
 
@@ -32,6 +33,8 @@ import (
 
 const hkInterval = 10
 
+var errMasterDown = errors.New("MASTERDOWN Link with MASTER is down and slave-serve-stale-data is set to 'no'.")
+
 type redisClient interface {
 	Query(cmd radix.CmdAction) error
 }
@@ -149,6 +152,12 @@ func (c *ConnManager) create(uri uri.URI) (*RedisConn, error) {
 			err = conn.Do(radix.Cmd(nil, "CLIENT", "SETNAME", clientName))
 		}
 
+		// Older redis servers return this as an error and the connection is present,
+		// and redis-cli does not return this error but continues
+		if err != nil && err.Error() == errMasterDown.Error() && conn != nil {
+			return conn, nil
+		}
+
 		return conn, err
 	}
 
diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am
index d0ce97a248a..4c8b07dd871 100644
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -35,8 +35,8 @@ DIST_SUBDIRS = \
 	zbxdiag \
 	zbxtrends \
 	zbxavailability \
-	zbxaudit \
 	zbxservice \
+	zbxaudit \
 	zbxeval
 
 if SERVER
@@ -61,8 +61,8 @@ SERVER_SUBDIRS = \
 	zbxdiag \
 	zbxtrends \
 	zbxavailability \
-	zbxaudit \
 	zbxservice \
+	zbxaudit \
 	zbxeval
 else
 if PROXY
diff --git a/src/libs/zbxaudit/Makefile.am b/src/libs/zbxaudit/Makefile.am
index 2f5ed74d92b..6bff91983eb 100644
--- a/src/libs/zbxaudit/Makefile.am
+++ b/src/libs/zbxaudit/Makefile.am
@@ -6,4 +6,6 @@ libzbxaudit_a_SOURCES = \
 	audit.c \
 	audit.h \
 	audit_host.c \
-	audit_host.h
+	audit_host.h \
+	audit_item.c \
+	audit_item.h
diff --git a/src/libs/zbxaudit/audit.h b/src/libs/zbxaudit/audit.h
index f72b70bc69a..a347be457fb 100644
--- a/src/libs/zbxaudit/audit.h
+++ b/src/libs/zbxaudit/audit.h
@@ -36,9 +36,13 @@
 #define	AUDIT_DETAILS_KEY_LEN		100
 
 #define AUDIT_RESOURCE_HOST		4
-#define AUDIT_RESOURCE_HOST_PROTOTYPE	37
-#define AUDIT_RESOURCE_SCRIPT		25
 #define AUDIT_RESOURCE_HOST_GROUP	14
+#define AUDIT_RESOURCE_ITEM		15
+#define AUDIT_RESOURCE_DISCOVERY_RULE	23
+#define AUDIT_RESOURCE_SCRIPT		25
+
+#define AUDIT_RESOURCE_ITEM_PROTOTYPE	36
+#define AUDIT_RESOURCE_HOST_PROTOTYPE	37
 
 #define RETURN_IF_AUDIT_OFF()					\
 	if (ZBX_AUDITLOG_ENABLED != zbx_get_audit_mode())	\
diff --git a/src/libs/zbxaudit/audit_host.c b/src/libs/zbxaudit/audit_host.c
index 167283ab075..e124a737e6c 100644
--- a/src/libs/zbxaudit/audit_host.c
+++ b/src/libs/zbxaudit/audit_host.c
@@ -819,7 +819,6 @@ void	zbx_audit_host_group_create_entry(int audit_action, zbx_uint64_t groupid, c
 		local_audit_group_entry_insert->name = zbx_strdup(NULL, name);
 		local_audit_group_entry_insert->audit_action = audit_action;
 		local_audit_group_entry_insert->resource_type =  AUDIT_RESOURCE_HOST_GROUP;
-;
 		zbx_json_init(&(local_audit_group_entry_insert->details_json), ZBX_JSON_STAT_BUF_LEN);
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_group_entry_insert,
 				sizeof(local_audit_group_entry_insert));
diff --git a/src/libs/zbxaudit/audit_item.c b/src/libs/zbxaudit/audit_item.c
new file mode 100644
index 00000000000..614bd94fe81
--- /dev/null
+++ b/src/libs/zbxaudit/audit_item.c
@@ -0,0 +1,978 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 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 "dbcache.h"
+
+#include "log.h"
+#include "audit_item.h"
+
+static int	item_flag_to_resource_type(int flag)
+{
+	if (ZBX_FLAG_DISCOVERY_NORMAL == flag || ZBX_FLAG_DISCOVERY_CREATED == flag)
+	{
+		return AUDIT_RESOURCE_ITEM;
+	}
+	else if (ZBX_FLAG_DISCOVERY_PROTOTYPE == flag)
+	{
+		return AUDIT_RESOURCE_ITEM_PROTOTYPE;
+	}
+	else if (ZBX_FLAG_DISCOVERY_RULE == flag)
+	{
+		return AUDIT_RESOURCE_DISCOVERY_RULE;
+	}
+	else
+	{
+		zabbix_log(LOG_LEVEL_CRIT, "unexpected audit detected: ->%d<-", flag);
+		THIS_SHOULD_NEVER_HAPPEN;
+		exit(EXIT_FAILURE);
+	}
+}
+
+void	zbx_audit_item_create_entry(int audit_action, zbx_uint64_t itemid, const char *name, int flags)
+{
+	int	resource_type;
+
+	zbx_audit_entry_t	local_audit_item_entry, **found_audit_item_entry;
+	zbx_audit_entry_t	*local_audit_item_entry_x = &local_audit_item_entry;
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(flags);
+
+	local_audit_item_entry.id = itemid;
+
+	found_audit_item_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
+			&(local_audit_item_entry_x));
+	if (NULL == found_audit_item_entry)
+	{
+		zbx_audit_entry_t	*local_audit_item_entry_insert;
+
+		local_audit_item_entry_insert = (zbx_audit_entry_t*)zbx_malloc(NULL, sizeof(zbx_audit_entry_t));
+		local_audit_item_entry_insert->id = itemid;
+		local_audit_item_entry_insert->name = zbx_strdup(NULL, name);
+		local_audit_item_entry_insert->audit_action = audit_action;
+		local_audit_item_entry_insert->resource_type = resource_type;
+		zbx_json_init(&(local_audit_item_entry_insert->details_json), ZBX_JSON_STAT_BUF_LEN);
+		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_item_entry_insert,
+				sizeof(local_audit_item_entry_insert));
+	}
+}
+
+#define ONLY_ITEM (AUDIT_RESOURCE_ITEM == resource_type)
+#define ONLY_ITEM_PROTOTYPE (AUDIT_RESOURCE_ITEM_PROTOTYPE == resource_type)
+#define ONLY_LLD_RULE (AUDIT_RESOURCE_DISCOVERY_RULE == resource_type)
+#define IT_OR_ITP_OR_DR(s) ONLY_ITEM ? "item."#s : (ONLY_ITEM_PROTOTYPE ? "itemprototype."#s : "discoveryrule."#s)
+
+void	zbx_audit_item_update_json_add_data(zbx_uint64_t itemid, const zbx_template_item_t *item, zbx_uint64_t hostid)
+{
+	int	resource_type;
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item->flags);
+
+#define ONLY_ITEM_AND_ITEM_PROTOTYPE (AUDIT_RESOURCE_ITEM == resource_type || \
+		AUDIT_RESOURCE_ITEM_PROTOTYPE == resource_type)
+#define ADD_JSON_S(x)	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(x),\
+		item->x)
+#define ADD_JSON_UI(x)	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(x),\
+		item->x)
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(itemid), itemid);
+	ADD_JSON_S(delay);
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(hostid), hostid);
+	ADD_JSON_UI(interfaceid);
+	ADD_JSON_S(key); // API HAS 'key_' , but SQL 'key'
+	ADD_JSON_S(name);
+	ADD_JSON_UI(type);
+	ADD_JSON_S(url);
+
+	if ONLY_ITEM_AND_ITEM_PROTOTYPE
+	{
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.value_type" :
+				"itemprototype.value_type", item->value_type);
+	}
+
+	ADD_JSON_UI(allow_traps);
+	ADD_JSON_UI(authtype);
+	ADD_JSON_S(description);
+
+	if ONLY_ITEM
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "item.flags", item->flags);
+
+	ADD_JSON_UI(follow_redirects);
+	ADD_JSON_S(headers);
+
+	if ONLY_ITEM_AND_ITEM_PROTOTYPE
+	{
+		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.history" :
+				"itemprototype.history", item->history);
+	}
+
+	ADD_JSON_S(http_proxy);
+
+	if ONLY_ITEM
+	{
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "item.inventory_link",
+				item->inventory_link);
+	}
+
+	ADD_JSON_S(ipmi_sensor);
+	ADD_JSON_S(jmx_endpoint);
+
+	if ONLY_LLD_RULE
+	{
+		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, "discoveryrule.lifetime",
+				item->lifetime);
+	}
+
+	if ONLY_ITEM_AND_ITEM_PROTOTYPE
+	{
+		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.logtimefmt" :
+				"itemprototype.logtimefmt", item->logtimefmt);
+	}
+
+	ADD_JSON_UI(master_itemid);
+	ADD_JSON_UI(output_format);
+	ADD_JSON_S(params);
+
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(password),
+			ZBX_MACRO_SECRET_MASK);
+
+	ADD_JSON_UI(post_type);
+	ADD_JSON_S(posts);
+	ADD_JSON_S(privatekey);
+	ADD_JSON_S(publickey);
+	ADD_JSON_S(query_fields);
+	ADD_JSON_UI(request_method);
+	ADD_JSON_UI(retrieve_mode);
+	ADD_JSON_S(snmp_oid);
+	ADD_JSON_S(ssl_cert_file);
+	ADD_JSON_S(ssl_key_file);
+
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(ssl_key_password),
+			ZBX_MACRO_SECRET_MASK);
+
+	ADD_JSON_UI(status);
+	ADD_JSON_S(status_codes);
+	ADD_JSON_UI(templateid);
+	ADD_JSON_S(timeout);
+	ADD_JSON_S(trapper_hosts);
+
+	if ONLY_ITEM_AND_ITEM_PROTOTYPE
+	{
+		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.trends" :
+				"itemprototype.trends", item->trends);
+		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.units" :
+				"itemprototype.units", item->units);
+	}
+
+	ADD_JSON_S(username);
+
+	if ONLY_ITEM_AND_ITEM_PROTOTYPE
+	{
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.valuemapid" :
+				"itemprototype.valuemapid", item->valuemapid);
+	}
+
+	ADD_JSON_UI(verify_host);
+	ADD_JSON_UI(verify_peer);
+
+	if ONLY_ITEM_PROTOTYPE
+	{
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "itemprototype.discover",
+				item->discover);
+	}
+
+	if ONLY_LLD_RULE
+	{
+		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD,
+				"discoveryrule.filter.formula", item->formula);
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD,
+				"discoveryrule.filter.evaltype", item->evaltype);
+	}
+#undef ADD_JSON_UI
+#undef ADD_JSON_S
+}
+
+void	zbx_audit_item_update_json_add_lld_data(zbx_uint64_t itemid, const zbx_lld_item_full_t *item,
+		const zbx_lld_item_prototype_t *item_prototype, zbx_uint64_t hostid)
+{
+	RETURN_IF_AUDIT_OFF();
+
+#define IT(s) "item."#s
+#define ADD_JSON_S(x)	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x), item->x)
+#define ADD_JSON_UI(x)	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x), item->x)
+#define ADD_JSON_P_S(x)	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x), item_prototype->x)
+#define ADD_JSON_P_UI(x)	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x),\
+		item_prototype->x)
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(itemid), itemid);
+	ADD_JSON_S(delay);
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(hostid), hostid);
+	ADD_JSON_S(name);
+	ADD_JSON_S(key);
+	ADD_JSON_P_UI(type);
+	ADD_JSON_P_UI(value_type);
+	ADD_JSON_S(history);
+	ADD_JSON_S(trends);
+	ADD_JSON_UI(status);
+	ADD_JSON_P_S(trapper_hosts);
+	ADD_JSON_S(units);
+	ADD_JSON_P_S(formula);
+	ADD_JSON_P_S(logtimefmt);
+	ADD_JSON_P_UI(valuemapid);
+	ADD_JSON_S(params);
+	ADD_JSON_S(ipmi_sensor);
+	ADD_JSON_S(snmp_oid);
+	ADD_JSON_P_UI(authtype);
+	ADD_JSON_S(username);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(password), ZBX_MACRO_SECRET_MASK);
+	ADD_JSON_P_S(publickey);
+	ADD_JSON_P_S(privatekey);
+	ADD_JSON_S(description);
+	ADD_JSON_P_UI(interfaceid);
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "item.flags", ZBX_FLAG_DISCOVERY_CREATED);
+	ADD_JSON_S(jmx_endpoint);
+	ADD_JSON_UI(master_itemid);
+	ADD_JSON_S(timeout);
+	ADD_JSON_S(url);
+	ADD_JSON_S(query_fields);
+	ADD_JSON_S(posts);
+	ADD_JSON_S(status_codes);
+	ADD_JSON_P_UI(follow_redirects);
+	ADD_JSON_P_UI(post_type);
+	ADD_JSON_S(http_proxy);
+	ADD_JSON_S(headers);
+	ADD_JSON_P_UI(retrieve_mode);
+	ADD_JSON_P_UI(request_method);
+	ADD_JSON_P_UI(output_format);
+	ADD_JSON_S(ssl_cert_file);
+	ADD_JSON_S(ssl_key_file);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(ssl_key_password),
+			ZBX_MACRO_SECRET_MASK);
+	ADD_JSON_P_UI(verify_peer);
+	ADD_JSON_P_UI(verify_host);
+	ADD_JSON_P_UI(allow_traps);
+
+#undef ADD_JSON_UI
+#undef ADD_JSON_S
+#undef ADD_JSON_P_UI
+#undef ADD_JSON_P_S
+#undef IT
+}
+
+#define PREPARE_AUDIT_ITEM_UPDATE(resource, type1, type2)							\
+void	zbx_audit_item_update_json_update_##resource(zbx_uint64_t itemid, int flags,				\
+		type1 resource##_old, type1 resource##_new)							\
+{														\
+	int	resource_type;											\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+														\
+	resource_type = item_flag_to_resource_type(flags);							\
+	zbx_audit_update_json_update_##type2(itemid, IT_OR_ITP_OR_DR(resource), resource##_old, resource##_new);\
+}
+
+PREPARE_AUDIT_ITEM_UPDATE(interfaceid,		zbx_uint64_t,	uint64)
+PREPARE_AUDIT_ITEM_UPDATE(templateid,		zbx_uint64_t,	uint64)
+PREPARE_AUDIT_ITEM_UPDATE(name,			const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(type,			int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(value_type,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(delay,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(history,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(trends,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(status,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(trapper_hosts,	const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(units,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(formula,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(logtimefmt,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(valuemapid,		zbx_uint64_t,	uint64)
+PREPARE_AUDIT_ITEM_UPDATE(params,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(ipmi_sensor,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(snmp_oid,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(authtype,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(username,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(password,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(publickey,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(privatekey,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(flags,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(description,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(inventory_link,	int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(lifetime,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(evaltype,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(jmx_endpoint,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(master_itemid,	zbx_uint64_t,	uint64)
+PREPARE_AUDIT_ITEM_UPDATE(timeout,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(url,			const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(query_fields,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(posts,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(status_codes,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(follow_redirects,	int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(redirects,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(post_type,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(http_proxy,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(headers,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(retrieve_mode,	int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(request_method,	int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(output_format,	int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(ssl_cert_file,	const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(ssl_key_file,		const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(ssl_key_password,	const char*,	string)
+PREPARE_AUDIT_ITEM_UPDATE(verify_peer,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(verify_host,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(allow_traps,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(discover,		int,		int)
+PREPARE_AUDIT_ITEM_UPDATE(key,			const char*,	string)
+#undef PREPARE_AUDIT_ITEM_UPDATE
+
+#undef ONLY_ITEM
+#undef ONLY_ITEM_PROTOTYPE
+#undef ONLY_LLD_RULE
+#undef IT_OR_ITP_OR_DR
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_audit_item_create_entry_for_delete                           *
+ *                                                                            *
+ * Parameters: id   - [IN] resource id                                        *
+ *             name - [IN] resource name                                      *
+ *             flag - [IN] resource flag                                      *
+ *                                                                            *
+ ******************************************************************************/
+void	zbx_audit_item_create_entry_for_delete(zbx_uint64_t id, const char *name, int flag)
+{
+	int			resource_type;
+	zbx_audit_entry_t	local_audit_item_entry, **found_audit_item_entry;
+	zbx_audit_entry_t	*local_audit_item_entry_x = &local_audit_item_entry;
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(flag);
+
+	local_audit_item_entry.id = id;
+
+	found_audit_item_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
+			&(local_audit_item_entry_x));
+	if (NULL == found_audit_item_entry)
+	{
+		zbx_audit_entry_t	*local_audit_item_entry_insert;
+
+		local_audit_item_entry_insert = (zbx_audit_entry_t*)zbx_malloc(NULL, sizeof(zbx_audit_entry_t));
+		local_audit_item_entry_insert->id = id;
+		local_audit_item_entry_insert->name = zbx_strdup(NULL, name);
+		local_audit_item_entry_insert->audit_action = AUDIT_ACTION_DELETE;
+		local_audit_item_entry_insert->resource_type = resource_type;
+
+		zbx_json_init(&(local_audit_item_entry_insert->details_json), ZBX_JSON_STAT_BUF_LEN);
+		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_item_entry_insert,
+				sizeof(local_audit_item_entry_insert));
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_audit_DBselect_delete_for_item                               *
+ *                                                                            *
+ * Parameters: sql - [IN] sql statement                                       *
+ *             ids - [OUT] sorted list of selected uint64 values              *
+ *                                                                            *
+ * Return value: SUCCEED - query SUCCEEDED                                    *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+int	zbx_audit_DBselect_delete_for_item(const char *sql, zbx_vector_uint64_t *ids)
+{
+	int		ret = FAIL;
+	DB_RESULT	result;
+	DB_ROW		row;
+	zbx_uint64_t	id;
+
+	if (NULL == (result = DBselect("%s", sql)))
+		goto out;
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		ZBX_STR2UINT64(id, row[0]);
+		zbx_vector_uint64_append(ids, id);
+		zbx_audit_item_create_entry_for_delete(id, row[1], atoi(row[2]));
+	}
+
+	DBfree_result(result);
+
+	zbx_vector_uint64_sort(ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+	ret = SUCCEED;
+out:
+	return ret;
+}
+
+void	zbx_audit_discovery_rule_update_json_add_filter_conditions(zbx_uint64_t itemid, zbx_uint64_t rule_conditionid,
+		zbx_uint64_t op, const char *macro, const char *value)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_operator[AUDIT_DETAILS_KEY_LEN],
+		audit_key_macro[AUDIT_DETAILS_KEY_LEN], audit_key_value[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key),
+			"discoveryrule.filter[" ZBX_FS_UI64 "].conditions", rule_conditionid);
+	zbx_snprintf(audit_key_operator, sizeof(audit_key_operator),
+			"discoveryrule.filter[" ZBX_FS_UI64 "].conditions.operator", rule_conditionid);
+	zbx_snprintf(audit_key_macro, sizeof(audit_key_macro),
+			"discoveryrule.filter[" ZBX_FS_UI64 "].conditions.macro", rule_conditionid);
+	zbx_snprintf(audit_key_value, sizeof(audit_key_value),
+			"discoveryrule.filter[" ZBX_FS_UI64 "].conditions.value", rule_conditionid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_operator, op);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_macro, macro);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+}
+
+void	zbx_audit_discovery_rule_update_json_update_filter_conditions_create_entry(zbx_uint64_t itemid,
+		zbx_uint64_t item_conditionid)
+{
+	char	buf[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(buf, sizeof(buf), "discoveryrule.filter[" ZBX_FS_UI64 "].conditions", item_conditionid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+}
+
+#define PREPARE_AUDIT_DISCOVERY_RULE_UPDATE(resource, type1, type2)						\
+void	zbx_audit_discovery_rule_update_json_update_filter_conditions_##resource(zbx_uint64_t itemid,		\
+		zbx_uint64_t item_conditionid, type1 resource##_old, type1 resource##_new)			\
+{														\
+	char	buf[AUDIT_DETAILS_KEY_LEN];									\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+														\
+	zbx_snprintf(buf, sizeof(buf), "discoveryrule.filter[" ZBX_FS_UI64 "].conditions."#resource,		\
+			item_conditionid);									\
+														\
+	zbx_audit_update_json_update_##type2(itemid, buf, resource##_old, resource##_new);			\
+}
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE(operator, int, int)
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE(macro, const char*, string)
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE(value, const char*, string)
+#undef PREPARE_AUDIT_DISCOVERY_RULE_UPDATE
+
+void	zbx_audit_discovery_rule_update_json_delete_filter_conditions(zbx_uint64_t itemid,
+		zbx_uint64_t item_conditionid)
+{
+	char	buf[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(buf, sizeof(buf), "discoveryrule.filter[" ZBX_FS_UI64 "].conditions", item_conditionid);
+
+	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, buf);
+}
+
+#define ITEM_RESOURCE_KEY_RESOLVE_PREPROC(resource, nested)							\
+	if (AUDIT_RESOURCE_ITEM == resource_type)								\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "item.preprocessing["		\
+				ZBX_FS_UI64 "]"#nested#resource, preprocid);					\
+	}													\
+	else if (AUDIT_RESOURCE_ITEM_PROTOTYPE == resource_type)						\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "itemprototype.preprocessing["	\
+				ZBX_FS_UI64 "]"#nested#resource, preprocid);					\
+	}													\
+	else if (AUDIT_RESOURCE_DISCOVERY_RULE == resource_type)						\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "discoveryrule.preprocessing["	\
+				ZBX_FS_UI64 "]"#nested#resource, preprocid);					\
+	}													\
+	else													\
+	{													\
+		THIS_SHOULD_NEVER_HAPPEN;									\
+		return;												\
+	}
+
+void	zbx_audit_item_update_json_add_item_preproc(zbx_uint64_t itemid, zbx_uint64_t preprocid, int item_flags,
+		int step, int type, const char *params, int error_handler, const char *error_handler_params)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN], audit_key_step[AUDIT_DETAILS_KEY_LEN],
+		audit_key_type[AUDIT_DETAILS_KEY_LEN], audit_key_params[AUDIT_DETAILS_KEY_LEN],
+		audit_key_error_handler[AUDIT_DETAILS_KEY_LEN], audit_key_error_handler_params[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(,)
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(step, .)
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(type, .)
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(params, .)
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(error_handler, .)
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(error_handler_params, .)
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_step, step);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_type, type);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_params, params);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_error_handler, error_handler);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_error_handler_params,
+			error_handler_params);
+}
+
+void	zbx_audit_item_update_json_update_item_preproc_create_entry(zbx_uint64_t itemid, int item_flags,
+		zbx_uint64_t preprocid)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(,)
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+}
+
+#define PREPARE_AUDIT_ITEM_UPDATE_PREPROC(resource, type1, type2)						\
+void	zbx_audit_item_update_json_update_item_preproc_##resource(zbx_uint64_t itemid, int item_flags,		\
+		zbx_uint64_t preprocid, type1 resource##_old, type1 resource##_new)				\
+{														\
+	int	resource_type;											\
+	char	audit_key_##resource[AUDIT_DETAILS_KEY_LEN];							\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+	resource_type = item_flag_to_resource_type(item_flags);							\
+														\
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(resource,.)								\
+														\
+	zbx_audit_update_json_update_##type2(itemid, audit_key_##resource, resource##_old, resource##_new);	\
+}
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC(type, int, int)
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC(params, const char*, string)
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC(error_handler, int, int)
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC(error_handler_params, const char*, string)
+#undef PREPARE_AUDIT_ITEM_UPDATE_PREPROC
+
+void	zbx_audit_item_delete_preproc(zbx_uint64_t itemid, int item_flags, zbx_uint64_t preprocid)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(,)
+
+	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
+}
+
+#define ITEM_RESOURCE_KEY_RESOLVE_TAG(resource, nested)								\
+	if (AUDIT_RESOURCE_ITEM == resource_type)								\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "item.tag[" ZBX_FS_UI64	\
+				"]"#nested#resource, tagid);							\
+	}													\
+	else if (AUDIT_RESOURCE_ITEM_PROTOTYPE == resource_type)						\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "itemprototype.tag["		\
+				ZBX_FS_UI64 "]"#nested#resource, tagid);					\
+	}													\
+	else if (AUDIT_RESOURCE_DISCOVERY_RULE == resource_type)						\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "discoveryrule.tag["		\
+				ZBX_FS_UI64 "]"#resource, tagid);						\
+	}													\
+	else													\
+	{													\
+		THIS_SHOULD_NEVER_HAPPEN;									\
+		return;												\
+	}
+
+void	zbx_audit_item_update_json_add_item_tag(zbx_uint64_t itemid, zbx_uint64_t tagid, int item_flags,
+		const char *tag, const char *value)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN], audit_key_tag[AUDIT_DETAILS_KEY_LEN],
+		audit_key_value[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE_TAG(,)
+	ITEM_RESOURCE_KEY_RESOLVE_TAG(tag, .)
+	ITEM_RESOURCE_KEY_RESOLVE_TAG(value, .)
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+}
+
+void	zbx_audit_item_update_json_update_item_tag_create_entry(zbx_uint64_t itemid, int item_flags,
+		zbx_uint64_t tagid)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE_TAG(,)
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+}
+
+#define PREPARE_AUDIT_ITEM_UPDATE_TAG(resource, type1, type2)							\
+void	zbx_audit_item_update_json_update_item_tag_##resource(zbx_uint64_t itemid, int item_flags,		\
+		zbx_uint64_t tagid, type1 resource##_old, type1 resource##_new)					\
+{														\
+	int	resource_type;											\
+	char	audit_key_##resource[AUDIT_DETAILS_KEY_LEN];							\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+	resource_type = item_flag_to_resource_type(item_flags);							\
+														\
+	ITEM_RESOURCE_KEY_RESOLVE_TAG(resource,.)								\
+														\
+	zbx_audit_update_json_update_##type2(itemid, audit_key_##resource, resource##_old, resource##_new);	\
+}
+PREPARE_AUDIT_ITEM_UPDATE_TAG(tag, const char*, string)
+PREPARE_AUDIT_ITEM_UPDATE_TAG(value, const char*, string)
+#undef PREPARE_AUDIT_ITEM_UPDATE_TAG
+
+void	zbx_audit_item_delete_tag(zbx_uint64_t itemid, int item_flags, zbx_uint64_t tagid)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE_TAG(,)
+
+	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
+}
+
+#define ITEM_RESOURCE_KEY_RESOLVE(resource, nested)								\
+	if (AUDIT_RESOURCE_ITEM == resource_type)								\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "item.parameters[" ZBX_FS_UI64 \
+				"]"#nested#resource, item_parameter_id);					\
+	}													\
+	else if (AUDIT_RESOURCE_ITEM_PROTOTYPE == resource_type)						\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "itemprototype.parameters["	\
+				ZBX_FS_UI64 "]"#nested#resource, item_parameter_id);				\
+	}													\
+	else if (AUDIT_RESOURCE_DISCOVERY_RULE == resource_type)						\
+	{													\
+		zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource), "discoveryrule.parameters["	\
+				ZBX_FS_UI64 "]"#resource, item_parameter_id);					\
+	}													\
+	else													\
+	{													\
+		THIS_SHOULD_NEVER_HAPPEN;									\
+		return;												\
+	}
+
+void	zbx_audit_item_update_json_add_params(zbx_uint64_t itemid, int item_flags, zbx_uint64_t item_parameter_id,
+		const char *name, const char *value)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN], audit_key_name[AUDIT_DETAILS_KEY_LEN],
+		audit_key_value[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE(,)
+	ITEM_RESOURCE_KEY_RESOLVE(name, .)
+	ITEM_RESOURCE_KEY_RESOLVE(value, .)
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+}
+
+void	zbx_audit_item_update_json_update_params_create_entry(zbx_uint64_t itemid, int item_flags,
+		zbx_uint64_t item_parameter_id)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE(,)
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+}
+
+#define PREPARE_AUDIT_ITEM_PARAMS_UPDATE(resource)								\
+void	zbx_audit_item_update_json_update_params_##resource(zbx_uint64_t itemid, int item_flags,		\
+		zbx_uint64_t item_parameter_id, const char *resource##_orig, const char *resource)		\
+{														\
+	int	resource_type;											\
+	char	audit_key_##resource[AUDIT_DETAILS_KEY_LEN];							\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+														\
+	resource_type = item_flag_to_resource_type(item_flags);							\
+	ITEM_RESOURCE_KEY_RESOLVE(resource, .)									\
+														\
+	zbx_audit_update_json_update_string(itemid, audit_key_##resource, resource##_orig, resource);		\
+}
+
+PREPARE_AUDIT_ITEM_PARAMS_UPDATE(name)
+PREPARE_AUDIT_ITEM_PARAMS_UPDATE(value)
+
+void	zbx_audit_item_delete_params(zbx_uint64_t itemid, int item_flags, zbx_uint64_t item_parameter_id)
+{
+	int	resource_type;
+	char	audit_key_[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = item_flag_to_resource_type(item_flags);
+
+	ITEM_RESOURCE_KEY_RESOLVE(,)
+
+	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
+}
+
+void	zbx_audit_discovery_rule_update_json_add_lld_macro_path(zbx_uint64_t itemid,
+		zbx_uint64_t lld_macro_pathid, const char *lld_macro, const char *path)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_lld_macro[AUDIT_DETAILS_KEY_LEN],
+		audit_key_path[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key),
+			"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "]", lld_macro_pathid);
+	zbx_snprintf(audit_key_lld_macro, sizeof(audit_key_lld_macro),
+			"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "].lld_macro", lld_macro_pathid);
+	zbx_snprintf(audit_key_path, sizeof(audit_key_lld_macro),
+			"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "].path", lld_macro_pathid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_lld_macro, lld_macro);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_path, path);
+}
+
+void	zbx_audit_discovery_rule_update_json_lld_macro_path_create_update_entry(zbx_uint64_t itemid,
+		zbx_uint64_t lld_macro_pathid)
+{
+	char	buf[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(buf, sizeof(buf), "discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "]", lld_macro_pathid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+}
+
+#define PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH(resource)						\
+void	zbx_audit_discovery_rule_update_json_update_lld_macro_path_##resource(zbx_uint64_t itemid,		\
+		zbx_uint64_t lld_macro_pathid, const char *resource##_old, const char *resource##_new)		\
+{														\
+	char	audit_key_##resource[AUDIT_DETAILS_KEY_LEN];							\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+														\
+	zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource),					\
+			"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "]."#resource, lld_macro_pathid);		\
+														\
+	zbx_audit_update_json_update_string(itemid, audit_key_##resource, resource##_old, resource##_new);	\
+}
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH(lld_macro)
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH(path)
+#undef PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH
+
+void	zbx_audit_discovery_rule_update_json_delete_lld_macro_path(zbx_uint64_t itemid,
+		zbx_uint64_t lld_macro_pathid)
+{
+	char	buf[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(buf, sizeof(buf),"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "]", lld_macro_pathid);
+
+	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, buf);
+}
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		const char *name, int step, int stop)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_name[AUDIT_DETAILS_KEY_LEN],
+		audit_key_step[AUDIT_DETAILS_KEY_LEN], audit_key_stop[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key), "discoveryrule.overrides[" ZBX_FS_UI64 "]", overrideid);
+	zbx_snprintf(audit_key_name, sizeof(audit_key_name), "discoveryrule.overrides[" ZBX_FS_UI64 "].name",
+			overrideid);
+	zbx_snprintf(audit_key_step, sizeof(audit_key_step), "discoveryrule.overrides[" ZBX_FS_UI64 "].step",
+			overrideid);
+	zbx_snprintf(audit_key_stop, sizeof(audit_key_stop), "discoveryrule.overrides[" ZBX_FS_UI64 "].stop",
+			overrideid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_step, step);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_stop, stop);
+}
+
+void	zbx_audit_discovery_rule_update_json_delete_lld_override(zbx_uint64_t itemid, zbx_uint64_t overrideid)
+{
+	char	buf[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(buf, sizeof(buf), "discoveryrule.overrides[" ZBX_FS_UI64 "]", overrideid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_DELETE, buf);
+}
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_filter(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		int evaltype, const char *formula)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_evaltype[AUDIT_DETAILS_KEY_LEN],
+		audit_key_formula[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key), "discoveryrule.overrides[" ZBX_FS_UI64 "].filter", overrideid);
+
+	zbx_snprintf(audit_key_evaltype, sizeof(audit_key_evaltype), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].filter.evaltype", overrideid);
+
+	zbx_snprintf(audit_key_formula, sizeof(audit_key_formula), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].filter.formula", overrideid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_evaltype, evaltype);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_formula, formula);
+}
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_condition(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t override_conditionid, int condition_operator, const char *macro, const char *value)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_operator[AUDIT_DETAILS_KEY_LEN],
+		audit_key_macro[AUDIT_DETAILS_KEY_LEN], audit_key_value[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].conditions[" ZBX_FS_UI64 "]", overrideid, override_conditionid);
+	zbx_snprintf(audit_key_operator, sizeof(audit_key_operator), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].conditions[" ZBX_FS_UI64 "].operator", overrideid, override_conditionid);
+	zbx_snprintf(audit_key_macro, sizeof(audit_key_macro), "discoveryrule.overrides[" ZBX_FS_UI64 "].conditions["
+			ZBX_FS_UI64 "].macro", overrideid, override_conditionid);
+	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "discoveryrule.overrides[" ZBX_FS_UI64 "].conditions["
+			ZBX_FS_UI64 "].value", overrideid, override_conditionid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_operator, condition_operator);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_macro, macro);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+}
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_operation(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t override_operationid, int condition_operator, const char *value)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_operator[AUDIT_DETAILS_KEY_LEN],
+		audit_key_value[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key), "discoveryrule.overrides[" ZBX_FS_UI64 "].operations[" ZBX_FS_UI64
+			"]", overrideid, override_operationid);
+	zbx_snprintf(audit_key_operator, sizeof(audit_key_operator), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].operations[" ZBX_FS_UI64 "].operator", overrideid, override_operationid);
+	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "discoveryrule.overrides[" ZBX_FS_UI64 "].operations["
+			ZBX_FS_UI64 "].value", overrideid, override_operationid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_operator, condition_operator);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+}
+
+#define PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(resource, type, type2)					\
+void	zbx_audit_discovery_rule_update_json_add_lld_override_##resource(zbx_uint64_t itemid,			\
+		zbx_uint64_t overrideid, zbx_uint64_t resource##_id, type resource)				\
+{														\
+	char	buf[AUDIT_DETAILS_KEY_LEN];									\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+														\
+	zbx_snprintf(buf, sizeof(buf), "discoveryrule.overrides[" ZBX_FS_UI64					\
+			"].operations[" ZBX_FS_UI64 "]."#resource, overrideid, resource##_id);			\
+														\
+	zbx_audit_update_json_append_##type2(itemid, AUDIT_DETAILS_ACTION_ADD, buf, resource);			\
+}
+
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opstatus, int, int)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opdiscover, int, int)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opperiod, const char*, string)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(optrends, const char*, string)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(ophistory, const char*, string)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opseverity, int, int)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opinventory, int, int)
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_optag(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t lld_override_optagid, const char *tag, const char *value)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_tag[AUDIT_DETAILS_KEY_LEN],
+		audit_key_value[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].optag[" ZBX_FS_UI64 "]", overrideid, lld_override_optagid);
+	zbx_snprintf(audit_key_tag, sizeof(audit_key_tag), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].optag[" ZBX_FS_UI64 "].tag", overrideid, lld_override_optagid);
+	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].optag[" ZBX_FS_UI64 "].value", overrideid, lld_override_optagid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
+	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+}
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_optemplate(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t lld_override_optemplateid, zbx_uint64_t templateid)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_templateid[AUDIT_DETAILS_KEY_LEN];
+
+	RETURN_IF_AUDIT_OFF();
+
+	zbx_snprintf(audit_key, sizeof(audit_key), "discoveryrule.overrides[" ZBX_FS_UI64 "].optemplateid[" ZBX_FS_UI64
+			"]", overrideid, lld_override_optemplateid);
+	zbx_snprintf(audit_key_templateid, sizeof(audit_key_templateid), "discoveryrule.overrides[" ZBX_FS_UI64
+			"].optemplateid[" ZBX_FS_UI64 "].templateid", overrideid, lld_override_optemplateid);
+
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_templateid, templateid);
+}
diff --git a/src/libs/zbxaudit/audit_item.h b/src/libs/zbxaudit/audit_item.h
new file mode 100644
index 00000000000..80444ec01dd
--- /dev/null
+++ b/src/libs/zbxaudit/audit_item.h
@@ -0,0 +1,197 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 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.
+**/
+
+#ifndef ZABBIX_AUDIT_ITEM_H
+#define ZABBIX_AUDIT_ITEM_H
+
+#include "common.h"
+#include "audit.h"
+
+#include "../zbxdbhigh/template.h"
+#include "../../zabbix_server/lld/lld.h"
+
+void	zbx_audit_item_create_entry(int audit_action, zbx_uint64_t itemid, const char *name, int flags);
+void	zbx_audit_item_update_json_add_data(zbx_uint64_t itemid, const zbx_template_item_t *item, zbx_uint64_t hostid);
+void	zbx_audit_item_update_json_add_lld_data(zbx_uint64_t itemid, const zbx_lld_item_full_t *item,
+		const zbx_lld_item_prototype_t *item_prototype, zbx_uint64_t hostid);
+
+#define PREPARE_AUDIT_ITEM_UPDATE_H(resource, type1)								\
+void	zbx_audit_item_update_json_update_##resource(zbx_uint64_t itemid, int flags,				\
+		type1 resource##_old, type1 resource##_new);
+
+PREPARE_AUDIT_ITEM_UPDATE_H(interfaceid, zbx_uint64_t)
+PREPARE_AUDIT_ITEM_UPDATE_H(templateid, zbx_uint64_t)
+PREPARE_AUDIT_ITEM_UPDATE_H(name, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(type, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(value_type, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(delay, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(history, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(trends, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(status, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(trapper_hosts, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(units, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(formula, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(logtimefmt, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(valuemapid, zbx_uint64_t)
+PREPARE_AUDIT_ITEM_UPDATE_H(params, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(ipmi_sensor, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(snmp_oid, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(authtype, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(username, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(password, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(publickey, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(privatekey, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(flags, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(description, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(inventory_link, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(lifetime, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(evaltype, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(jmx_endpoint, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(master_itemid, zbx_uint64_t)
+PREPARE_AUDIT_ITEM_UPDATE_H(timeout, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(url, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(query_fields, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(posts, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(status_codes, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(follow_redirects, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(redirects, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(post_type, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(http_proxy, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(headers, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(retrieve_mode, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(request_method, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(output_format, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(ssl_cert_file, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(ssl_key_file, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(ssl_key_password, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_H(verify_peer, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(verify_host, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(allow_traps, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(discover, int)
+PREPARE_AUDIT_ITEM_UPDATE_H(key, const char*)
+
+void	zbx_audit_item_create_entry_for_delete(zbx_uint64_t id, const char *name, int flag);
+int	zbx_audit_DBselect_delete_for_item(const char *sql, zbx_vector_uint64_t *ids);
+
+void	zbx_audit_discovery_rule_update_json_add_filter_conditions(zbx_uint64_t itemid, zbx_uint64_t rule_conditionid,
+		zbx_uint64_t op, const char *macro, const char *value);
+void	zbx_audit_discovery_rule_update_json_update_filter_conditions_create_entry(zbx_uint64_t itemid,
+		zbx_uint64_t item_conditionid);
+
+#define PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_H(resource, type1)							\
+void	zbx_audit_discovery_rule_update_json_update_filter_conditions_##resource(zbx_uint64_t itemid,		\
+		zbx_uint64_t item_conditionid, type1 resource##_old, type1 resource##_new);
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_H(operator, int)
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_H(macro, const char*)
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_H(value, const char*)
+
+void	zbx_audit_discovery_rule_update_json_delete_filter_conditions(zbx_uint64_t itemid,
+		zbx_uint64_t item_conditionid);
+
+void	zbx_audit_item_update_json_add_item_preproc(zbx_uint64_t itemid, zbx_uint64_t preprocid, int item_flags,
+		int step, int type, const char *params, int error_handler, const char *error_handler_params);
+
+void	zbx_audit_item_update_json_update_item_preproc_create_entry(zbx_uint64_t itemid, int item_flags,
+		zbx_uint64_t preprocid);
+
+#define PREPARE_AUDIT_ITEM_UPDATE_PREPROC_H(resource, type1)							\
+void	zbx_audit_item_update_json_update_item_preproc_##resource(zbx_uint64_t itemid, int item_flags,		\
+		zbx_uint64_t preprocid, type1 resource##_old, type1 resource##_new);
+
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC_H(type, int)
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC_H(params, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC_H(error_handler, int)
+PREPARE_AUDIT_ITEM_UPDATE_PREPROC_H(error_handler_params, const char*)
+
+void	zbx_audit_item_delete_preproc(zbx_uint64_t itemid, int item_flags, zbx_uint64_t preprocid);
+
+void	zbx_audit_item_update_json_add_item_tag(zbx_uint64_t itemid, zbx_uint64_t tagid, int item_flags,
+		const char *tag, const char *value);
+
+void	zbx_audit_item_update_json_update_item_tag_create_entry(zbx_uint64_t itemid, int item_flags,
+		zbx_uint64_t tagid);
+
+#define PREPARE_AUDIT_ITEM_UPDATE_TAG_H(resource, type1)							\
+void	zbx_audit_item_update_json_update_item_tag_##resource(zbx_uint64_t itemid, int item_flags,		\
+		zbx_uint64_t tagid, type1 resource##_old, type1 resource##_new);
+
+PREPARE_AUDIT_ITEM_UPDATE_TAG_H(tag, const char*)
+PREPARE_AUDIT_ITEM_UPDATE_TAG_H(value, const char*)
+
+void	zbx_audit_item_delete_tag(zbx_uint64_t itemid, int item_flags, zbx_uint64_t tagid);
+
+void	zbx_audit_item_update_json_add_params(zbx_uint64_t itemid, int item_flags, zbx_uint64_t item_parameter_id,
+		const char *name, const char *value);
+
+void	zbx_audit_item_update_json_update_params_create_entry(zbx_uint64_t itemid, int item_flags, zbx_uint64_t
+		item_parameter_id);
+
+#define PREPARE_AUDIT_ITEM_PARAMS_UPDATE_H(resource)								\
+void	zbx_audit_item_update_json_update_params_##resource(zbx_uint64_t itemid, int item_flags,		\
+		zbx_uint64_t item_parameter_id, const char *resource##_orig, const char *resource);
+
+PREPARE_AUDIT_ITEM_PARAMS_UPDATE_H(name)
+PREPARE_AUDIT_ITEM_PARAMS_UPDATE_H(value)
+
+void	zbx_audit_item_delete_params(zbx_uint64_t itemid, int item_flags, zbx_uint64_t item_parameter_id);
+
+void	zbx_audit_discovery_rule_update_json_add_lld_macro_path(zbx_uint64_t itemid,
+		zbx_uint64_t lld_macro_pathid, const char *lld_macro, const char *path);
+
+void	zbx_audit_discovery_rule_update_json_lld_macro_path_create_update_entry(zbx_uint64_t itemid,
+		zbx_uint64_t lld_macro_pathid);
+
+#define PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH_H(resource)						\
+void	zbx_audit_discovery_rule_update_json_update_lld_macro_path_##resource(zbx_uint64_t itemid,		\
+		zbx_uint64_t lld_macro_pathid, const char *resource##_old, const char *resource##_new);
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH_H(lld_macro)
+PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH_H(path)
+void	zbx_audit_discovery_rule_update_json_delete_lld_macro_path(zbx_uint64_t itemid,
+		zbx_uint64_t lld_macro_pathid);
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		const char *name, int step, int stop);
+void	zbx_audit_discovery_rule_update_json_delete_lld_override(zbx_uint64_t itemid, zbx_uint64_t overrideid);
+void	zbx_audit_discovery_rule_update_json_add_lld_override_filter(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		int evaltype, const char *formula);
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_condition(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t override_conditionid, int condition_operator, const char *macro, const char *value);
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_operation(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t override_operationid,  int condition_operator, const char *value);
+
+#define PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(resource, type)						\
+void	zbx_audit_discovery_rule_update_json_add_lld_override_##resource(zbx_uint64_t itemid,			\
+		zbx_uint64_t overrideid, zbx_uint64_t resource##_id, type resource);
+
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(opstatus, int)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(opdiscover, int)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(opperiod, const char*)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(optrends, const char*)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(ophistory, const char*)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(opseverity, int)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD_H(opinventory, int)
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_optag(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t lld_override_optagid, const char *tag, const char *value);
+
+void	zbx_audit_discovery_rule_update_json_add_lld_override_optemplate(zbx_uint64_t itemid, zbx_uint64_t overrideid,
+		zbx_uint64_t lld_override_optemplateid, zbx_uint64_t templateid);
+#endif	/* ZABBIX_AUDIT_ITEM_H */
diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c
index 4ef73a07c33..eb993d68766 100644
--- a/src/libs/zbxcommon/str.c
+++ b/src/libs/zbxcommon/str.c
@@ -3720,9 +3720,11 @@ static int	token_parse_lld_macro(const char *expression, const char *macro, zbx_
  *                                                                            *
  * Purpose: parses expression macro token                                     *
  *                                                                            *
- * Parameters: expression - [IN] the expression                               *
- *             macro      - [IN] the beginning of the token                   *
- *             token      - [OUT] the token data                              *
+ * Parameters: expression        - [IN] the expression                        *
+ *             macro             - [IN] the beginning of the token            *
+ *             simple_macro_find - [IN] pass simple macro flag to             *
+ *                                      zbx_token_find()                      *
+ *             token             - [OUT] the token data                       *
  *                                                                            *
  * Return value: SUCCEED - the expression macro was parsed successfully       *
  *               FAIL    - macro does not point at valid expression macro     *
@@ -3735,12 +3737,17 @@ static int	token_parse_lld_macro(const char *expression, const char *macro, zbx_
  *           contain user macro contexts and item keys with string arguments. *
  *                                                                            *
  ******************************************************************************/
-static int	token_parse_expression_macro(const char *expression, const char *macro, zbx_token_t *token)
+static int	token_parse_expression_macro(const char *expression, const char *macro, int simple_macro_find,
+		zbx_token_t *token)
 {
 	const char			*ptr;
 	size_t				offset;
 	zbx_token_expression_macro_t	*data;
 	int				quoted = 0;
+	zbx_token_search_t		token_search = ZBX_TOKEN_SEARCH_BASIC;
+
+	if (0 != simple_macro_find)
+		token_search |= ZBX_TOKEN_SEARCH_SIMPLE_MACRO;
 
 	for (ptr = macro + 2; '\0' != *ptr ; ptr++)
 	{
@@ -3767,7 +3774,7 @@ static int	token_parse_expression_macro(const char *expression, const char *macr
 			if ('?' == ptr[1])
 				continue;
 
-			if (SUCCEED == zbx_token_find(ptr, 0, &tmp, ZBX_TOKEN_SEARCH_BASIC))
+			if (SUCCEED == zbx_token_find(ptr, 0, &tmp, token_search))
 			{
 				switch (tmp.type)
 				{
@@ -4257,9 +4264,11 @@ static int	token_parse_simple_macro(const char *expression, const char *macro, z
  *                                                                            *
  * Purpose: parses token with nested macros                                   *
  *                                                                            *
- * Parameters: expression - [IN] the expression                               *
- *             macro      - [IN] the beginning of the token                   *
- *             token      - [OUT] the token data                              *
+ * Parameters: expression        - [IN] the expression                        *
+ *             macro             - [IN] the beginning of the token            *
+ *             simple_macro_find - [IN] pass simple macro flag to             *
+ *                                      zbx_token_find()                      *
+ *             token             - [OUT] the token data                       *
  *                                                                            *
  * Return value: SUCCEED - the token was parsed successfully                  *
  *               FAIL    - macro does not point at valid function or simple   *
@@ -4277,7 +4286,8 @@ static int	token_parse_simple_macro(const char *expression, const char *macro, z
  *           filled with macro specific data.                                 *
  *                                                                            *
  ******************************************************************************/
-static int	token_parse_nested_macro(const char *expression, const char *macro, zbx_token_t *token)
+static int	token_parse_nested_macro(const char *expression, const char *macro, int simple_macro_find,
+		zbx_token_t *token)
 {
 	const char	*ptr;
 
@@ -4299,9 +4309,15 @@ static int	token_parse_nested_macro(const char *expression, const char *macro, z
 	}
 	else if ('?' == macro[2])
 	{
-		zbx_token_t	expr_token;
+		zbx_token_t		expr_token;
+		zbx_token_search_t	token_search;
+
+		token_search = ZBX_TOKEN_SEARCH_EXPRESSION_MACRO;
+
+		if (0 != simple_macro_find)
+			token_search |= ZBX_TOKEN_SEARCH_SIMPLE_MACRO;
 
-		if (SUCCEED != zbx_token_find(macro, 1, &expr_token, ZBX_TOKEN_SEARCH_EXPRESSION_MACRO) ||
+		if (SUCCEED != zbx_token_find(macro, 1, &expr_token, token_search) ||
 				ZBX_TOKEN_EXPRESSION_MACRO != expr_token.type ||
 				1 != expr_token.loc.l)
 		{
@@ -4333,7 +4349,7 @@ static int	token_parse_nested_macro(const char *expression, const char *macro, z
 		return token_parse_func_macro(expression, macro, ptr + 2, token, '#' == macro[2] ?
 				ZBX_TOKEN_LLD_FUNC_MACRO : ZBX_TOKEN_FUNC_MACRO);
 	}
-	else if ('#' != macro[2] && ':' == ptr[1])
+	else if (0 != simple_macro_find && '#' != macro[2] && ':' == ptr[1])
 		return token_parse_simple_macro_key(expression, macro, ptr + 2, token);
 
 	return FAIL;
@@ -4438,10 +4454,13 @@ int	zbx_token_find(const char *expression, int pos, zbx_token_t *token, zbx_toke
 				break;
 			case '?':
 				if (0 != (token_search & ZBX_TOKEN_SEARCH_EXPRESSION_MACRO))
-					ret = token_parse_expression_macro(expression, ptr, token);
+					ret = token_parse_expression_macro(expression, ptr,
+							0 != (token_search & ZBX_TOKEN_SEARCH_SIMPLE_MACRO) ? 1 : 0,
+							token);
 				break;
 			case '{':
-				ret = token_parse_nested_macro(expression, ptr, token);
+				ret = token_parse_nested_macro(expression, ptr,
+						0 != (token_search & ZBX_TOKEN_SEARCH_SIMPLE_MACRO) ? 1 : 0, token);
 				break;
 			case '0':
 			case '1':
@@ -4457,8 +4476,11 @@ int	zbx_token_find(const char *expression, int pos, zbx_token_t *token, zbx_toke
 					break;
 				ZBX_FALLTHROUGH;
 			default:
-				if (SUCCEED != (ret = token_parse_macro(expression, ptr, token)))
+				if (SUCCEED != (ret = token_parse_macro(expression, ptr, token)) &&
+						0 != (token_search & ZBX_TOKEN_SEARCH_SIMPLE_MACRO))
+				{
 					ret = token_parse_simple_macro(expression, ptr, token);
+				}
 		}
 
 		ptr++;
@@ -4522,9 +4544,10 @@ int	zbx_token_parse_lld_macro(const char *expression, const char *macro, zbx_tok
  * Purpose: public wrapper for token_parse_nested_macro() function            *
  *                                                                            *
  ******************************************************************************/
-int	zbx_token_parse_nested_macro(const char *expression, const char *macro, zbx_token_t *token)
+int	zbx_token_parse_nested_macro(const char *expression, const char *macro, int simple_macro_find,
+		zbx_token_t *token)
 {
-	return token_parse_nested_macro(expression, macro, token);
+	return token_parse_nested_macro(expression, macro, simple_macro_find, token);
 }
 
 /******************************************************************************
@@ -4568,7 +4591,7 @@ static size_t	zbx_no_function(const char *expr)
 			ptr += len + 1;	/* skip to the position after user macro */
 		}
 		else if ('{' == *ptr && '{' == *(ptr + 1) && '#' == *(ptr + 2) &&
-				SUCCEED == token_parse_nested_macro(ptr, ptr, &token))
+				SUCCEED == token_parse_nested_macro(ptr, ptr, 0, &token))
 		{
 			ptr += token.loc.r - token.loc.l + 1;
 		}
@@ -5305,7 +5328,7 @@ int	replace_key_params_dyn(char **data, int key_type, replace_key_param_f cb, vo
 				i += len + 1;	/* skip to the position after user macro */
 			}
 			else if ('{' == (*data)[i] && '{' == (*data)[i + 1] && '#' == (*data)[i + 2] &&
-					SUCCEED == token_parse_nested_macro(&(*data)[i], &(*data)[i], &token))
+					SUCCEED == token_parse_nested_macro(&(*data)[i], &(*data)[i], 0, &token))
 			{
 				i += token.loc.r - token.loc.l + 1;
 			}
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c
index 43dda4a10b5..db992cae9b1 100644
--- a/src/libs/zbxdbcache/dbconfig.c
+++ b/src/libs/zbxdbcache/dbconfig.c
@@ -8419,6 +8419,20 @@ void	DCconfig_get_hosts_by_itemids(DC_HOST *hosts, const zbx_uint64_t *itemids,
 	UNLOCK_CACHE;
 }
 
+int	DCconfig_trigger_exists(zbx_uint64_t triggerid)
+{
+	int	ret = SUCCEED;
+
+	RDLOCK_CACHE;
+
+	if (NULL == zbx_hashset_search(&config->triggers, &triggerid))
+		ret = FAIL;
+
+	UNLOCK_CACHE;
+
+	return ret;
+}
+
 void	DCconfig_get_triggers_by_triggerids(DC_TRIGGER *triggers, const zbx_uint64_t *triggerids, int *errcode,
 		size_t num)
 {
@@ -14102,17 +14116,6 @@ char	*dc_expand_user_macros_in_func_params(const char *params, zbx_uint64_t host
 	return buf;
 }
 
-char	*zbx_dc_expand_user_macros_in_func_params(const char *params, zbx_uint64_t hostid)
-{
-	char	*resolved_params;
-
-	RDLOCK_CACHE;
-	resolved_params = dc_expand_user_macros_in_func_params(params, hostid);
-	UNLOCK_CACHE;
-
-	return resolved_params;
-}
-
 /*********************************************************************************
  *                                                                               *
  * Function: zbx_get_host_interfaces_availability                                *
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index 9612ca6aa72..531f528c516 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -27,15 +27,15 @@
 #include "zbxalgo.h"
 #include "cfg.h"
 
-#if defined(HAVE_MYSQL) || defined(HAVE_POSTGRESQL)
-#define ZBX_SUPPORTED_DB_CHARACTER_SET	"utf8"
-#endif
-#if defined(HAVE_ORACLE)
-#define ZBX_ORACLE_UTF8_CHARSET "AL32UTF8"
-#define ZBX_ORACLE_CESU8_CHARSET "UTF8"
-#endif
-#if defined(HAVE_MYSQL)
-#define ZBX_SUPPORTED_DB_COLLATION	"utf8_bin"
+#if defined(HAVE_POSTGRESQL)
+#	define ZBX_SUPPORTED_DB_CHARACTER_SET	"utf8"
+#elif defined(HAVE_ORACLE)
+#	define ZBX_ORACLE_UTF8_CHARSET "AL32UTF8"
+#	define ZBX_ORACLE_CESU8_CHARSET "UTF8"
+#elif defined(HAVE_MYSQL)
+#	define ZBX_DB_STRLIST_DELIM		','
+#	define ZBX_SUPPORTED_DB_CHARACTER_SET	"utf8,utf8mb3"
+#	define ZBX_SUPPORTED_DB_COLLATION	"utf8_bin,utf8mb3_bin"
 #endif
 
 typedef struct
@@ -749,7 +749,12 @@ static zbx_uint64_t	DBget_nextid(const char *tablename, int num)
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() tablename:'%s'", __func__, tablename);
 
-	table = DBget_table(tablename);
+	if (NULL == (table = DBget_table(tablename)))
+	{
+		zabbix_log(LOG_LEVEL_CRIT, "Error getting table: %s", tablename);
+		THIS_SHOULD_NEVER_HAPPEN;
+		exit(EXIT_FAILURE);
+	}
 
 	while (FAIL == found)
 	{
@@ -2386,7 +2391,7 @@ int	DBexecute_multiple_query(const char *query, const char *field_name, zbx_vect
 #if defined(HAVE_MYSQL) || defined(HAVE_POSTGRESQL)
 static void	zbx_warn_char_set(const char *db_name, const char *char_set)
 {
-	zabbix_log(LOG_LEVEL_WARNING, "Zabbix supports only \"" ZBX_SUPPORTED_DB_CHARACTER_SET "\" character set."
+	zabbix_log(LOG_LEVEL_WARNING, "Zabbix supports only \"" ZBX_SUPPORTED_DB_CHARACTER_SET "\" character set(s)."
 			" Database \"%s\" has default character set \"%s\"", db_name, char_set);
 }
 #endif
@@ -2398,10 +2403,29 @@ static void	zbx_warn_no_charset_info(const char *db_name)
 }
 #endif
 
+#if defined(HAVE_MYSQL)
+static char	*db_strlist_quote(const char *strlist, char delimiter)
+{
+	const char	*delim;
+	char		*str = NULL;
+	size_t		str_alloc = 0, str_offset = 0;
+
+	while (NULL != (delim = strchr(strlist, delimiter)))
+	{
+		zbx_snprintf_alloc(&str, &str_alloc, &str_offset, "'%.*s',", (int)(delim - strlist), strlist);
+		strlist = delim + 1;
+	}
+
+	zbx_snprintf_alloc(&str, &str_alloc, &str_offset, "'%s'", strlist);
+
+	return str;
+}
+#endif
+
 void	DBcheck_character_set(void)
 {
 #if defined(HAVE_MYSQL)
-	char		*database_name_esc;
+	char		*database_name_esc, *charset_list, *collation_list;
 	DB_RESULT	result;
 	DB_ROW		row;
 
@@ -2422,12 +2446,12 @@ void	DBcheck_character_set(void)
 		char	*char_set = row[0];
 		char	*collation = row[1];
 
-		if (0 != strcasecmp(char_set, ZBX_SUPPORTED_DB_CHARACTER_SET))
+		if (SUCCEED != str_in_list(ZBX_SUPPORTED_DB_CHARACTER_SET, char_set, ZBX_DB_STRLIST_DELIM))
 			zbx_warn_char_set(CONFIG_DBNAME, char_set);
 
-		if (0 != zbx_strncasecmp(collation, ZBX_SUPPORTED_DB_COLLATION, sizeof(ZBX_SUPPORTED_DB_COLLATION)))
+		if (SUCCEED != str_in_list(ZBX_SUPPORTED_DB_COLLATION, collation, ZBX_DB_STRLIST_DELIM))
 		{
-			zabbix_log(LOG_LEVEL_WARNING, "Zabbix supports only \"%s\" collation."
+			zabbix_log(LOG_LEVEL_WARNING, "Zabbix supports only \"%s\" collation(s)."
 					" Database \"%s\" has default collation \"%s\"", ZBX_SUPPORTED_DB_COLLATION,
 					CONFIG_DBNAME, collation);
 		}
@@ -2435,13 +2459,19 @@ void	DBcheck_character_set(void)
 
 	DBfree_result(result);
 
+	charset_list = db_strlist_quote(ZBX_SUPPORTED_DB_CHARACTER_SET, ZBX_DB_STRLIST_DELIM);
+	collation_list = db_strlist_quote(ZBX_SUPPORTED_DB_COLLATION, ZBX_DB_STRLIST_DELIM);
+
 	result = DBselect(
 			"select count(*)"
 			" from information_schema.`COLUMNS`"
 			" where table_schema='%s'"
 				" and data_type in ('text','varchar','longtext')"
-				" and (character_set_name<>'%s' or collation_name<>'%s')",
-			database_name_esc, ZBX_SUPPORTED_DB_CHARACTER_SET, ZBX_SUPPORTED_DB_COLLATION);
+				" and (character_set_name not in (%s) or collation_name not in (%s))",
+			database_name_esc, charset_list, collation_list);
+
+	zbx_free(collation_list);
+	zbx_free(charset_list);
 
 	if (NULL == result || NULL == (row = DBfetch(result)))
 	{
@@ -2451,8 +2481,9 @@ void	DBcheck_character_set(void)
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "character set name or collation name that is not supported by Zabbix"
 				" found in %s column(s) of database \"%s\"", row[0], CONFIG_DBNAME);
-		zabbix_log(LOG_LEVEL_WARNING, "only character set \"%s\" and collation \"%s\" should be used in "
-				"database", ZBX_SUPPORTED_DB_CHARACTER_SET, ZBX_SUPPORTED_DB_COLLATION);
+		zabbix_log(LOG_LEVEL_WARNING, "only character set(s) \"%s\" and corresponding collation(s) \"%s\""
+				" should be used in database", ZBX_SUPPORTED_DB_CHARACTER_SET,
+				ZBX_SUPPORTED_DB_COLLATION);
 	}
 
 	DBfree_result(result);
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c
index 33a18c6758f..6fb8e151527 100644
--- a/src/libs/zbxdbhigh/host.c
+++ b/src/libs/zbxdbhigh/host.c
@@ -25,6 +25,7 @@
 #include "zbxserver.h"
 #include "template.h"
 #include "../../libs/zbxaudit/audit_host.h"
+#include "../../libs/zbxaudit/audit_item.h"
 #include "trigger_linking.h"
 #include "graph_linking.h"
 #include "../zbxalgo/vectorimpl.h"
@@ -1327,11 +1328,15 @@ void	DBdelete_items(zbx_vector_uint64_t *itemids)
 	{
 		num = itemids->values_num;
 		sql_offset = 0;
-		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "select distinct itemid from item_discovery where");
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
+				"select distinct id.itemid,i.name,i.flags from"
+				" item_discovery id,items i where id.itemid=i.itemid and ");
 		DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "parent_itemid",
 				itemids->values, itemids->values_num);
 
-		DBselect_uint64(sql, itemids);
+		if (FAIL == zbx_audit_DBselect_delete_for_item(sql, itemids))
+			goto clean;
+
 		zbx_vector_uint64_uniq(itemids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 	}
 	while (num != itemids->values_num);
@@ -1387,7 +1392,7 @@ void	DBdelete_items(zbx_vector_uint64_t *itemids)
 	DBend_multiple_update(&sql, &sql_alloc, &sql_offset);
 
 	DBexecute("%s", sql);
-
+clean:
 	zbx_vector_uint64_destroy(&profileids);
 
 	zbx_free(sql);
@@ -1408,7 +1413,7 @@ out:
  * Comments: !!! Don't forget to sync the code with PHP !!!                   *
  *                                                                            *
  ******************************************************************************/
-static void	DBdelete_httptests(zbx_vector_uint64_t *httptestids)
+static void	DBdelete_httptests(const zbx_vector_uint64_t *httptestids)
 {
 	char			*sql = NULL;
 	size_t			sql_alloc = 256, sql_offset = 0;
@@ -1425,21 +1430,22 @@ static void	DBdelete_httptests(zbx_vector_uint64_t *httptestids)
 	/* httpstepitem, httptestitem */
 	sql_offset = 0;
 	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
-			"select hsi.itemid"
-			" from httpstepitem hsi,httpstep hs"
-			" where hsi.httpstepid=hs.httpstepid"
+			"select hsi.itemid,i.name,i.flags"
+			" from httpstepitem hsi,httpstep hs,items i"
+			" where hsi.httpstepid=hs.httpstepid and i.itemid=hsi.itemid"
 				" and");
 	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "hs.httptestid",
 			httptestids->values, httptestids->values_num);
 	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
 			" union all "
-			"select itemid"
-			" from httptestitem"
-			" where");
+			"select i.itemid,i.name,i.flags"
+			" from httptestitem ht,items i"
+			" where ht.itemid=i.itemid and");
 	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "httptestid",
 			httptestids->values, httptestids->values_num);
 
-	DBselect_uint64(sql, &itemids);
+	if (FAIL == zbx_audit_DBselect_delete_for_item(sql, &itemids))
+		goto clean;
 
 	DBdelete_items(&itemids);
 
@@ -1448,7 +1454,7 @@ static void	DBdelete_httptests(zbx_vector_uint64_t *httptestids)
 	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "httptestid",
 			httptestids->values, httptestids->values_num);
 	DBexecute("%s", sql);
-
+clean:
 	zbx_vector_uint64_destroy(&itemids);
 	zbx_free(sql);
 out:
@@ -1463,7 +1469,7 @@ out:
  *                                      will be deleted                       *
  *                                                                            *
  ******************************************************************************/
-static void	DBgroup_prototypes_delete(zbx_vector_uint64_t *del_group_prototypeids)
+static void	DBgroup_prototypes_delete(const zbx_vector_uint64_t *del_group_prototypeids)
 {
 	char			*sql = NULL;
 	size_t			sql_alloc = 0, sql_offset;
@@ -1769,7 +1775,7 @@ static void	DBdelete_template_items(zbx_uint64_t hostid, const zbx_vector_uint64
 	zbx_vector_uint64_create(&itemids);
 
 	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"select distinct i.itemid"
+			"select distinct i.itemid,i.name,i.flags"
 			" from items i,items ti"
 			" where i.templateid=ti.itemid"
 				" and i.hostid=" ZBX_FS_UI64
@@ -1777,10 +1783,11 @@ static void	DBdelete_template_items(zbx_uint64_t hostid, const zbx_vector_uint64
 			hostid);
 	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "ti.hostid", templateids->values, templateids->values_num);
 
-	DBselect_uint64(sql, &itemids);
+	if (FAIL == zbx_audit_DBselect_delete_for_item(sql, &itemids))
+		goto clean;
 
 	DBdelete_items(&itemids);
-
+clean:
 	zbx_vector_uint64_destroy(&itemids);
 	zbx_free(sql);
 
@@ -5255,12 +5262,13 @@ void	DBdelete_hosts(const zbx_vector_uint64_t *hostids, const zbx_vector_str_t *
 
 	sql_offset = 0;
 	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
-			"select itemid"
+			"select itemid,name,flags"
 			" from items"
 			" where");
 	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "hostid", hostids->values, hostids->values_num);
 
-	DBselect_uint64(sql, &itemids);
+	if (FAIL == zbx_audit_DBselect_delete_for_item(sql, &itemids))
+		goto clean;
 
 	DBdelete_items(&itemids);
 
@@ -5292,12 +5300,12 @@ void	DBdelete_hosts(const zbx_vector_uint64_t *hostids, const zbx_vector_str_t *
 
 	DBexecute("%s", sql);
 
+	for (i = 0; i < hostids->values_num; i++)
+		zbx_audit_host_del(hostids->values[i], hostnames->values[i]);
+clean:
 	zbx_free(sql);
 
 	zbx_vector_uint64_destroy(&selementids);
-
-	for (i = 0; i < hostids->values_num; i++)
-		zbx_audit_host_del(hostids->values[i], hostnames->values[i]);
 out:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
diff --git a/src/libs/zbxdbhigh/tag.c b/src/libs/zbxdbhigh/tag.c
index 6e3cecd42f5..393a0aee395 100644
--- a/src/libs/zbxdbhigh/tag.c
+++ b/src/libs/zbxdbhigh/tag.c
@@ -51,8 +51,8 @@ void	zbx_db_tag_free(zbx_db_tag_t *tag)
 
 int	zbx_db_tag_compare_func(const void *d1, const void *d2)
 {
-	const zbx_db_tag_t	*tag1 = *(const zbx_db_tag_t **)d1;
-	const zbx_db_tag_t	*tag2 = *(const zbx_db_tag_t **)d2;
+	const zbx_db_tag_t	* const tag1 = *(const zbx_db_tag_t * const *)d1;
+	const zbx_db_tag_t	* const tag2 = *(const zbx_db_tag_t * const *)d2;
 	int			ret;
 
 	if (0 != (ret = strcmp(tag1->tag, tag2->tag)))
@@ -61,4 +61,14 @@ int	zbx_db_tag_compare_func(const void *d1, const void *d2)
 	return strcmp(tag1->value, tag2->value);
 }
 
+int	zbx_db_tag_compare_func_template(const void *d1, const void *d2)
+{
+	const zbx_db_tag_t	* const it1 = *(const zbx_db_tag_t * const *)d1;
+	const zbx_db_tag_t	* const it2 = *(const zbx_db_tag_t * const *)d2;
+
+	ZBX_RETURN_IF_NOT_EQUAL(it1->tag, it2->tag);
+
+	return 0;
+}
+
 ZBX_PTR_VECTOR_IMPL(db_tag_ptr, zbx_db_tag_t *)
diff --git a/src/libs/zbxdbhigh/template.h b/src/libs/zbxdbhigh/template.h
index 44268194dbc..37dd1659e6e 100644
--- a/src/libs/zbxdbhigh/template.h
+++ b/src/libs/zbxdbhigh/template.h
@@ -17,7 +17,185 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+#ifndef ZABBIX_TEMPLATE_H
+#define ZABBIX_TEMPLATE_H
+
 #include "zbxtypes.h"
 #include "zbxalgo.h"
 
+typedef struct _zbx_template_item_preproc_t zbx_template_item_preproc_t;
+ZBX_PTR_VECTOR_DECL(item_preproc_ptr, zbx_template_item_preproc_t *)
+
+ZBX_PTR_VECTOR_DECL(item_tag_ptr, zbx_db_tag_t *)
+
+typedef struct _zbx_template_item_param_t zbx_template_item_param_t;
+ZBX_PTR_VECTOR_DECL(item_param_ptr, zbx_template_item_param_t *)
+
+typedef struct _zbx_template_lld_macro_t zbx_template_lld_macro_t;
+ZBX_PTR_VECTOR_DECL(lld_macro_ptr, zbx_template_lld_macro_t *)
+
+typedef struct
+{
+	zbx_uint64_t			itemid;
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_RESET_FLAG	__UINT64_C(0x000000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_INTERFACEID	__UINT64_C(0x000000000001)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TEMPLATEID	__UINT64_C(0x000000000002)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_NAME		__UINT64_C(0x000000000004)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TYPE		__UINT64_C(0x000000000008)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VALUE_TYPE	__UINT64_C(0x000000000010)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DELAY		__UINT64_C(0x000000000020)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HISTORY		__UINT64_C(0x000000000040)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TRENDS		__UINT64_C(0x000000000080)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_STATUS		__UINT64_C(0x000000000100)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TRAPPER_HOSTS	__UINT64_C(0x000000000200)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_UNITS		__UINT64_C(0x000000000400)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FORMULA		__UINT64_C(0x000000000800)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_LOGTIMEFMT	__UINT64_C(0x000000001000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VALUEMAPID	__UINT64_C(0x000000002000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PARAMS		__UINT64_C(0x000000004000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_IPMI_SENSOR	__UINT64_C(0x000000008000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SNMP_OID		__UINT64_C(0x000000010000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_AUTHTYPE		__UINT64_C(0x000000020000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_USERNAME		__UINT64_C(0x000000040000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PASSWORD		__UINT64_C(0x000000080000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PUBLICKEY		__UINT64_C(0x000000100000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PRIVATEKEY	__UINT64_C(0x000000200000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FLAGS		__UINT64_C(0x000000400000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DESCRIPTION	__UINT64_C(0x000000800000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_INVENTORY_LINK	__UINT64_C(0x000001000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_LIFETIME		__UINT64_C(0x000002000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_EVALTYPE		__UINT64_C(0x000004000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_JMX_ENDPOINT	__UINT64_C(0x000008000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_MASTER_ITEMID	__UINT64_C(0x000010000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TIMEOUT		__UINT64_C(0x000020000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_URL		__UINT64_C(0x000040000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_QUERY_FIELDS	__UINT64_C(0x000080000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_POSTS		__UINT64_C(0x000100000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_STATUS_CODES	__UINT64_C(0x000200000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FOLLOW_REDIRECTS	__UINT64_C(0x000400000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_POST_TYPE		__UINT64_C(0x000800000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HTTP_PROXY	__UINT64_C(0x001000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HEADERS		__UINT64_C(0x002000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_RETRIEVE_MODE	__UINT64_C(0x004000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_REQUEST_METHOD	__UINT64_C(0x008000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_OUTPUT_FORMAT	__UINT64_C(0x010000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_CERT_FILE	__UINT64_C(0x020000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_KEY_FILE	__UINT64_C(0x040000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_KEY_PASSWORD	__UINT64_C(0x080000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VERIFY_PEER	__UINT64_C(0x100000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VERIFY_HOST	__UINT64_C(0x200000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_ALLOW_TRAPS	__UINT64_C(0x400000000000)
+#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DISCOVER		__UINT64_C(0x800000000000)
+
+	zbx_uint64_t			upd_flags;
+	zbx_uint64_t			valuemapid_orig;
+	zbx_uint64_t			valuemapid;
+	zbx_uint64_t			interfaceid_orig;
+	zbx_uint64_t			interfaceid;
+	zbx_uint64_t			templateid_orig;
+	zbx_uint64_t			templateid;
+	zbx_uint64_t			master_itemid_orig;
+	zbx_uint64_t			master_itemid;
+	char				*name_orig;
+	char				*name;
+	char				*key;
+	char				*delay_orig;
+	char				*delay;
+	char				*history_orig;
+	char				*history;
+	char				*trends_orig;
+	char				*trends;
+	char				*trapper_hosts_orig;
+	char				*trapper_hosts;
+	char				*units_orig;
+	char				*units;
+	char				*formula_orig;
+	char				*formula;
+	char				*logtimefmt_orig;
+	char				*logtimefmt;
+	char				*params_orig;
+	char				*params;
+	char				*ipmi_sensor_orig;
+	char				*ipmi_sensor;
+	char				*snmp_oid_orig;
+	char				*snmp_oid;
+	char				*username_orig;
+	char				*username;
+	char				*password_orig;
+	char				*password;
+	char				*publickey_orig;
+	char				*publickey;
+	char				*privatekey_orig;
+	char				*privatekey;
+	char				*description_orig;
+	char				*description;
+	char				*lifetime_orig;
+	char				*lifetime;
+	char				*jmx_endpoint_orig;
+	char				*jmx_endpoint;
+	char				*timeout_orig;
+	char				*timeout;
+	char				*url_orig;
+	char				*url;
+	char				*query_fields_orig;
+	char				*query_fields;
+	char				*posts_orig;
+	char				*posts;
+	char				*status_codes_orig;
+	char				*status_codes;
+	char				*http_proxy_orig;
+	char				*http_proxy;
+	char				*headers_orig;
+	char				*headers;
+	char				*ssl_cert_file_orig;
+	char				*ssl_cert_file;
+	char				*ssl_key_file_orig;
+	char				*ssl_key_file;
+	char				*ssl_key_password_orig;
+	char				*ssl_key_password;
+	unsigned char			verify_peer_orig;
+	unsigned char			verify_peer;
+	unsigned char			verify_host_orig;
+	unsigned char			verify_host;
+	unsigned char			follow_redirects_orig;
+	unsigned char			follow_redirects;
+	unsigned char			post_type_orig;
+	unsigned char			post_type;
+	unsigned char			retrieve_mode_orig;
+	unsigned char			retrieve_mode;
+	unsigned char			request_method_orig;
+	unsigned char			request_method;
+	unsigned char			output_format_orig;
+	unsigned char			output_format;
+	unsigned char			type_orig;
+	unsigned char			type;
+	unsigned char			value_type_orig;
+	unsigned char			value_type;
+	unsigned char			status_orig;
+	unsigned char			status;
+	unsigned char			authtype_orig;
+	unsigned char			authtype;
+	unsigned char			flags_orig;
+	unsigned char			flags;
+	unsigned char			inventory_link_orig;
+	unsigned char			inventory_link;
+	unsigned char			evaltype_orig;
+	unsigned char			evaltype;
+	unsigned char			allow_traps_orig;
+	unsigned char			allow_traps;
+	unsigned char			discover_orig;
+	unsigned char			discover;
+	zbx_vector_ptr_t		dependent_items;
+	zbx_vector_item_preproc_ptr_t	item_preprocs;
+	zbx_vector_item_preproc_ptr_t	template_preprocs;
+	zbx_vector_item_tag_ptr_t	item_tags;
+	zbx_vector_item_tag_ptr_t	template_tags;
+	zbx_vector_item_param_ptr_t	item_params;
+	zbx_vector_item_param_ptr_t	template_params;
+	zbx_vector_lld_macro_ptr_t	item_lld_macros;
+	zbx_vector_lld_macro_ptr_t	template_lld_macros;
+}
+zbx_template_item_t;
+
 void	DBcopy_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *templateids);
+#endif
diff --git a/src/libs/zbxdbhigh/template_item.c b/src/libs/zbxdbhigh/template_item.c
index 545adfe590a..e268a040f6d 100644
--- a/src/libs/zbxdbhigh/template_item.c
+++ b/src/libs/zbxdbhigh/template_item.c
@@ -26,8 +26,7 @@
 #include "template.h"
 #include "../zbxalgo/vectorimpl.h"
 
-typedef struct _zbx_template_item_preproc_t zbx_template_item_preproc_t;
-ZBX_PTR_VECTOR_DECL(item_preproc_ptr, zbx_template_item_preproc_t *)
+#include "../../libs/zbxaudit/audit_item.h"
 
 struct _zbx_template_item_preproc_t
 {
@@ -48,39 +47,19 @@ struct _zbx_template_item_preproc_t
 
 	zbx_uint64_t	upd_flags;
 	int		step;
+	int		type_orig;
 	int		type;
+	char		*params_orig;
 	char		*params;
+	int		error_handler_orig;
 	int		error_handler;
+	char		*error_handler_params_orig;
 	char		*error_handler_params;
 };
 
 ZBX_PTR_VECTOR_IMPL(item_preproc_ptr, zbx_template_item_preproc_t *)
 
-typedef struct _zbx_template_item_tag_t zbx_template_item_tag_t;
-ZBX_PTR_VECTOR_DECL(item_tag_ptr, zbx_template_item_tag_t *)
-
-struct _zbx_template_item_tag_t
-{
-	zbx_uint64_t	itemtagid;
-#define ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_RESET_FLAG	__UINT64_C(0x000000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_TAG		__UINT64_C(0x000000000001)
-#define ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_VALUE		__UINT64_C(0x000000000002)
-#define ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE			\
-		(ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_TAG |	\
-		ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_VALUE		\
-		)
-
-#define ZBX_FLAG_TEMPLATE_ITEM_TAG_DELETE		__UINT64_C(0x000000010000)
-
-	zbx_uint64_t	upd_flags;
-	char		*tag;
-	char		*value;
-};
-
-ZBX_PTR_VECTOR_IMPL(item_tag_ptr, zbx_template_item_tag_t *)
-
-typedef struct _zbx_template_item_param_t zbx_template_item_param_t;
-ZBX_PTR_VECTOR_DECL(item_param_ptr, zbx_template_item_param_t *)
+ZBX_PTR_VECTOR_IMPL(item_tag_ptr, zbx_db_tag_t *)
 
 struct _zbx_template_item_param_t
 {
@@ -96,15 +75,14 @@ struct _zbx_template_item_param_t
 #define ZBX_FLAG_TEMPLATE_ITEM_PARAM_DELETE		__UINT64_C(0x000000010000)
 
 	zbx_uint64_t	upd_flags;
+	char		*name_orig;
 	char		*name;
+	char		*value_orig;
 	char		*value;
 };
 
 ZBX_PTR_VECTOR_IMPL(item_param_ptr, zbx_template_item_param_t *)
 
-typedef struct _zbx_template_lld_macro_t zbx_template_lld_macro_t;
-ZBX_PTR_VECTOR_DECL(lld_macro_ptr, zbx_template_lld_macro_t *)
-
 struct _zbx_template_lld_macro_t
 {
 	zbx_uint64_t	lld_macro_pathid;
@@ -119,128 +97,14 @@ struct _zbx_template_lld_macro_t
 #define ZBX_FLAG_TEMPLATE_LLD_MACRO_DELETE		__UINT64_C(0x000000010000)
 
 	zbx_uint64_t	upd_flags;
+	char		*lld_macro_orig;
 	char		*lld_macro;
+	char		*path_orig;
 	char		*path;
 };
 
 ZBX_PTR_VECTOR_IMPL(lld_macro_ptr, zbx_template_lld_macro_t *)
 
-typedef struct
-{
-	zbx_uint64_t			itemid;
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_RESET_FLAG	__UINT64_C(0x000000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_INTERFACEID	__UINT64_C(0x000000000001)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TEMPLATEID	__UINT64_C(0x000000000002)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_NAME		__UINT64_C(0x000000000004)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TYPE		__UINT64_C(0x000000000008)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VALUE_TYPE	__UINT64_C(0x000000000010)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DELAY		__UINT64_C(0x000000000020)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HISTORY		__UINT64_C(0x000000000040)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TRENDS		__UINT64_C(0x000000000080)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_STATUS		__UINT64_C(0x000000000100)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TRAPPER_HOSTS	__UINT64_C(0x000000000200)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_UNITS		__UINT64_C(0x000000000400)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FORMULA		__UINT64_C(0x000000000800)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_LOGTIMEFMT	__UINT64_C(0x000000001000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VALUEMAPID	__UINT64_C(0x000000002000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PARAMS		__UINT64_C(0x000000004000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_IPMI_SENSOR	__UINT64_C(0x000000008000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SNMP_OID		__UINT64_C(0x000000010000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_AUTHTYPE		__UINT64_C(0x000000020000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_USERNAME		__UINT64_C(0x000000040000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PASSWORD		__UINT64_C(0x000000080000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PUBLICKEY		__UINT64_C(0x000000100000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PRIVATEKEY	__UINT64_C(0x000000200000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FLAGS		__UINT64_C(0x000000400000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DESCRIPTION	__UINT64_C(0x000000800000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_INVENTORY_LINK	__UINT64_C(0x000001000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_LIFETIME		__UINT64_C(0x000002000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_EVALTYPE		__UINT64_C(0x000004000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_JMX_ENDPOINT	__UINT64_C(0x000008000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_MASTER_ITEMID	__UINT64_C(0x000010000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TIMEOUT		__UINT64_C(0x000020000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_URL		__UINT64_C(0x000040000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_QUERY_FIELDS	__UINT64_C(0x000080000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_POSTS		__UINT64_C(0x000100000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_STATUS_CODES	__UINT64_C(0x000200000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FOLLOW_REDIRECTS	__UINT64_C(0x000400000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_POST_TYPE		__UINT64_C(0x000800000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HTTP_PROXY	__UINT64_C(0x001000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HEADERS		__UINT64_C(0x002000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_RETRIEVE_MODE	__UINT64_C(0x004000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_REQUEST_METHOD	__UINT64_C(0x008000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_OUTPUT_FORMAT	__UINT64_C(0x010000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_CERT_FILE	__UINT64_C(0x020000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_KEY_FILE	__UINT64_C(0x040000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_KEY_PASSWORD	__UINT64_C(0x080000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VERIFY_PEER	__UINT64_C(0x100000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VERIFY_HOST	__UINT64_C(0x200000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_ALLOW_TRAPS	__UINT64_C(0x400000000000)
-#define ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DISCOVER		__UINT64_C(0x800000000000)
-
-	zbx_uint64_t			upd_flags;
-	zbx_uint64_t			valuemapid;
-	zbx_uint64_t			interfaceid;
-	zbx_uint64_t			templateid;
-	zbx_uint64_t			master_itemid;
-	zbx_uint64_t			master_itemid_orig;
-	char				*name;
-	char				*key;
-	char				*delay;
-	char				*history;
-	char				*trends;
-	char				*trapper_hosts;
-	char				*units;
-	char				*formula;
-	char				*logtimefmt;
-	char				*params;
-	char				*ipmi_sensor;
-	char				*snmp_oid;
-	char				*username;
-	char				*password;
-	char				*publickey;
-	char				*privatekey;
-	char				*description;
-	char				*lifetime;
-	char				*jmx_endpoint;
-	char				*timeout;
-	char				*url;
-	char				*query_fields;
-	char				*posts;
-	char				*status_codes;
-	char				*http_proxy;
-	char				*headers;
-	char				*ssl_cert_file;
-	char				*ssl_key_file;
-	char				*ssl_key_password;
-	unsigned char			verify_peer;
-	unsigned char			verify_host;
-	unsigned char			follow_redirects;
-	unsigned char			post_type;
-	unsigned char			retrieve_mode;
-	unsigned char			request_method;
-	unsigned char			output_format;
-	unsigned char			type;
-	unsigned char			value_type;
-	unsigned char			status;
-	unsigned char			authtype;
-	unsigned char			flags;
-	unsigned char			inventory_link;
-	unsigned char			evaltype;
-	unsigned char			allow_traps;
-	unsigned char			discover;
-	zbx_vector_ptr_t		dependent_items;
-	zbx_vector_item_preproc_ptr_t	item_preprocs;
-	zbx_vector_item_preproc_ptr_t	template_preprocs;
-	zbx_vector_item_tag_ptr_t	item_tags;
-	zbx_vector_item_tag_ptr_t	template_tags;
-	zbx_vector_item_param_ptr_t	item_params;
-	zbx_vector_item_param_ptr_t	template_params;
-	zbx_vector_lld_macro_ptr_t	item_lld_macros;
-	zbx_vector_lld_macro_ptr_t	template_lld_macros;
-}
-zbx_template_item_t;
-
 /* lld rule condition */
 typedef struct
 {
@@ -250,8 +114,11 @@ typedef struct
 #define ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_VALUE		__UINT64_C(0x00000002)
 #define ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_OPERATOR	__UINT64_C(0x00000004)
 	zbx_uint64_t	upd_flags;
+	char		*macro_orig;
 	char		*macro;
+	char		*value_orig;
 	char		*value;
+	unsigned char	op_orig;
 	unsigned char	op;
 }
 zbx_lld_rule_condition_t;
@@ -382,16 +249,34 @@ static void	get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t
 	{
 		item = (zbx_template_item_t *)zbx_malloc(NULL, sizeof(zbx_template_item_t));
 
+		item->templateid_orig = 0;
 		ZBX_STR2UINT64(item->templateid, row[0]);
+
+		item->type_orig = 0;
 		ZBX_STR2UCHAR(item->type, row[3]);
+
+		item->value_type_orig = 0;
 		ZBX_STR2UCHAR(item->value_type, row[4]);
+
+		item->status_orig = 0;
 		ZBX_STR2UCHAR(item->status, row[8]);
+
+		item->valuemapid_orig = 0;
 		ZBX_DBROW2UINT64(item->valuemapid, row[13]);
+
+		item->authtype_orig = 0;
 		ZBX_STR2UCHAR(item->authtype, row[17]);
+
+		item->flags_orig = 0;
 		ZBX_STR2UCHAR(item->flags, row[22]);
+
+		item->inventory_link_orig = 0;
 		ZBX_STR2UCHAR(item->inventory_link, row[24]);
+
+		item->evaltype_orig = 0;
 		ZBX_STR2UCHAR(item->evaltype, row[27]);
 
+		item->interfaceid_orig = 0;
 		switch (interface_type = get_interface_type_by_item_type(item->type))
 		{
 			case INTERFACE_TYPE_UNKNOWN:
@@ -409,62 +294,134 @@ static void	get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t
 				item->interfaceid = interfaceids[interface_type - 1];
 		}
 
+		item->name_orig = NULL;
 		item->name = zbx_strdup(NULL, row[1]);
+
+		item->delay_orig = NULL;
 		item->delay = zbx_strdup(NULL, row[5]);
+
+		item->history_orig = NULL;
 		item->history = zbx_strdup(NULL, row[6]);
+
+		item->trends_orig = NULL;
 		item->trends = zbx_strdup(NULL, row[7]);
+
+		item->trapper_hosts_orig = NULL;
 		item->trapper_hosts = zbx_strdup(NULL, row[9]);
+
+		item->units_orig = NULL;
 		item->units = zbx_strdup(NULL, row[10]);
+
+		item->formula_orig = NULL;
 		item->formula = zbx_strdup(NULL, row[11]);
+
+		item->logtimefmt_orig = NULL;
 		item->logtimefmt = zbx_strdup(NULL, row[12]);
+
+		item->params_orig = NULL;
 		item->params = zbx_strdup(NULL, row[14]);
+
+		item->ipmi_sensor_orig = NULL;
 		item->ipmi_sensor = zbx_strdup(NULL, row[15]);
+
+		item->snmp_oid_orig = NULL;
 		item->snmp_oid = zbx_strdup(NULL, row[16]);
+
+		item->username_orig = NULL;
 		item->username = zbx_strdup(NULL, row[18]);
+
+		item->password_orig = NULL;
 		item->password = zbx_strdup(NULL, row[19]);
+
+		item->publickey_orig = NULL;
 		item->publickey = zbx_strdup(NULL, row[20]);
+
+		item->privatekey_orig = NULL;
 		item->privatekey = zbx_strdup(NULL, row[21]);
+
+		item->description_orig = NULL;
 		item->description = zbx_strdup(NULL, row[23]);
+
+		item->lifetime_orig = NULL;
 		item->lifetime = zbx_strdup(NULL, row[25]);
+
+		item->jmx_endpoint_orig = NULL;
 		item->jmx_endpoint = zbx_strdup(NULL, row[28]);
-		ZBX_DBROW2UINT64(item->master_itemid, row[29]);
 
 		ZBX_DBROW2UINT64(item->master_itemid_orig, row[77]);
+		ZBX_DBROW2UINT64(item->master_itemid, row[29]);
 
+		item->timeout_orig = NULL;
 		item->timeout = zbx_strdup(NULL, row[30]);
+
+		item->url_orig = NULL;
 		item->url = zbx_strdup(NULL, row[31]);
+
+		item->query_fields_orig = NULL;
 		item->query_fields = zbx_strdup(NULL, row[32]);
+
+		item->posts_orig = NULL;
 		item->posts = zbx_strdup(NULL, row[33]);
+
+		item->status_codes_orig = NULL;
 		item->status_codes = zbx_strdup(NULL, row[34]);
+
+		item->follow_redirects_orig = 0;
 		ZBX_STR2UCHAR(item->follow_redirects, row[35]);
+
+		item->post_type_orig = 0;
 		ZBX_STR2UCHAR(item->post_type, row[36]);
+
+		item->http_proxy_orig = NULL;
 		item->http_proxy = zbx_strdup(NULL, row[37]);
+
+		item->headers_orig = NULL;
 		item->headers = zbx_strdup(NULL, row[38]);
+
+		item->retrieve_mode_orig = 0;
 		ZBX_STR2UCHAR(item->retrieve_mode, row[39]);
+
+		item->request_method_orig = 0;
 		ZBX_STR2UCHAR(item->request_method, row[40]);
+
+		item->output_format_orig = 0;
 		ZBX_STR2UCHAR(item->output_format, row[41]);
+
+		item->ssl_cert_file_orig = NULL;
 		item->ssl_cert_file = zbx_strdup(NULL, row[42]);
+
+		item->ssl_key_file_orig = NULL;
 		item->ssl_key_file = zbx_strdup(NULL, row[43]);
+
+		item->ssl_key_password_orig = NULL;
 		item->ssl_key_password = zbx_strdup(NULL, row[44]);
+
+		item->verify_peer_orig = 0;
 		ZBX_STR2UCHAR(item->verify_peer, row[45]);
+
+		item->verify_host_orig = 0;
 		ZBX_STR2UCHAR(item->verify_host, row[46]);
+
+		item->allow_traps_orig = 0;
 		ZBX_STR2UCHAR(item->allow_traps, row[47]);
+
+		item->discover_orig = 0;
 		ZBX_STR2UCHAR(item->discover, row[48]);
 
 		item->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_UPDATE_RESET_FLAG;
 
 		if (SUCCEED != DBis_null(row[26]))
 		{
-			char		*str_orig = NULL;
 			unsigned char	uchar_orig;
 			zbx_uint64_t	uint64_orig;
 
 #define SET_FLAG_STR(r, i, f)			\
-						\
 {						\
-	str_orig = zbx_strdup(str_orig, (r));	\
-	if (0 != strcmp(str_orig, (i)))		\
+	if (0 != strcmp(r, (i)))		\
+	{					\
 		item->upd_flags |= f;		\
+		i##_orig = zbx_strdup(NULL, r);	\
+	}					\
 }
 
 #define SET_FLAG_UCHAR(r, i, f)		\
@@ -472,10 +429,12 @@ static void	get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t
 {					\
 	ZBX_STR2UCHAR(uchar_orig, (r));	\
 	if (uchar_orig != (i))		\
+	{				\
 		item->upd_flags |= f;	\
+		i##_orig = uchar_orig;	\
+	}				\
 }
 
-
 #define SET_FLAG_UINT64(r, i, f)			\
 							\
 {							\
@@ -484,7 +443,10 @@ static void	get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t
 	else						\
 		ZBX_STR2UINT64(uint64_orig, (r));	\
 	if (uint64_orig != (i))				\
+	{						\
 		item->upd_flags |= f;			\
+		i##_orig = uint64_orig;			\
+	}						\
 }
 			item->key = NULL;
 			ZBX_STR2UINT64(item->itemid, row[26]);
@@ -536,8 +498,6 @@ static void	get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t
 			SET_FLAG_UCHAR(row[94], item->verify_host, ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VERIFY_HOST);
 			SET_FLAG_UCHAR(row[95], item->allow_traps, ZBX_FLAG_TEMPLATE_ITEM_UPDATE_ALLOW_TRAPS);
 			SET_FLAG_UCHAR(row[96], item->discover, ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DISCOVER);
-
-			zbx_free(str_orig);
 		}
 		else
 		{
@@ -571,7 +531,7 @@ static void	get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t
  *          from database                                                     *
  *                                                                            *
  * Parameters: items - [IN] the host items including lld rules                *
- *             rules - [OUT] the ldd rule mapping                             *
+ *             rules - [OUT] the lld rule mapping                             *
  *                                                                            *
  ******************************************************************************/
 static void	get_template_lld_rule_map(const zbx_vector_ptr_t *items, zbx_vector_ptr_t *rules)
@@ -643,6 +603,9 @@ static void	get_template_lld_rule_map(const zbx_vector_ptr_t *items, zbx_vector_
 				condition->macro = zbx_strdup(NULL, row[3]);
 				condition->value = zbx_strdup(NULL, row[4]);
 				condition->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_RESET_FLAG;
+				condition->macro_orig = NULL;
+				condition->value_orig = NULL;
+				condition->op_orig = 0;
 
 				zbx_vector_ptr_append(&rule->conditions, condition);
 			}
@@ -652,8 +615,6 @@ static void	get_template_lld_rule_map(const zbx_vector_ptr_t *items, zbx_vector_
 
 				for (i = 0; i < rules->values_num; i++)
 				{
-					char		*str_orig;
-					unsigned char	uchar_orig;
 					zbx_uint64_t	flags = ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_RESET_FLAG;
 
 					rule = (zbx_lld_rule_map_t *)rules->values[i];
@@ -665,17 +626,29 @@ static void	get_template_lld_rule_map(const zbx_vector_ptr_t *items, zbx_vector_
 
 					if (rule->conditions.values_num > index)
 					{
+						unsigned char	uchar_orig;
+
 						condition = (zbx_lld_rule_condition_t *)rule->conditions.values[index];
 						ZBX_STR2UCHAR(uchar_orig, row[2]);
-						str_orig = zbx_strdup(NULL, row[3]);
+
 						if (uchar_orig != condition->op)
+						{
 							flags |= ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_OPERATOR;
-						if (0 != strcmp(str_orig, condition->macro))
+							condition->op_orig = uchar_orig;
+						}
+
+						if (0 != strcmp(row[3], condition->macro))
+						{
 							flags |= ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_MACRO;
-						str_orig = zbx_strdup(str_orig, row[4]);
-						if (0 != strcmp(str_orig, condition->value))
+							condition->macro_orig = zbx_strdup(NULL, row[3]);
+						}
+
+						if (0 != strcmp(row[4], condition->value))
+						{
 							flags |= ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_VALUE;
-						zbx_free(str_orig);
+							condition->value_orig = zbx_strdup(NULL, row[4]);
+						}
+
 						condition->upd_flags = flags;
 					}
 
@@ -703,7 +676,7 @@ static void	get_template_lld_rule_map(const zbx_vector_ptr_t *items, zbx_vector_
  *                                                                            *
  * Purpose: calculate identifiers for new item conditions                     *
  *                                                                            *
- * Parameters: rules - [IN] the ldd rule mapping                              *
+ * Parameters: rules - [IN] the lld rule mapping                              *
  *                                                                            *
  * Return value: The number of new item conditions to be inserted.            *
  *                                                                            *
@@ -769,7 +742,7 @@ static void	update_template_lld_formula(char **formula, zbx_uint64_t id_proto, z
  *          identifiers instead.                                              *
  *                                                                            *
  * Parameters:  items  - [IN] the template items                              *
- *              rules  - [IN] the ldd rule mapping                            *
+ *              rules  - [IN] the lld rule mapping                            *
  *                                                                            *
  ******************************************************************************/
 static void	update_template_lld_rule_formulas(zbx_vector_ptr_t *items, zbx_vector_ptr_t *rules)
@@ -803,7 +776,8 @@ static void	update_template_lld_rule_formulas(zbx_vector_ptr_t *items, zbx_vecto
 		for (j = 0; j < rule->conditions.values_num; j++)
 		{
 			zbx_uint64_t			id;
-			zbx_lld_rule_condition_t	*condition = (zbx_lld_rule_condition_t *)rule->conditions.values[j];
+			zbx_lld_rule_condition_t	*condition =
+					(zbx_lld_rule_condition_t *)rule->conditions.values[j];
 
 			if (j < rule->conditionids.values_num)
 				id = rule->conditionids.values[j];
@@ -845,6 +819,8 @@ static void	save_template_item(zbx_uint64_t hostid, zbx_uint64_t *itemid, zbx_te
 	int			i;
 	zbx_template_item_t	*dependent;
 
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
 	if (NULL == item->key) /* existing item */
 	{
 		char		*str_esc;
@@ -854,311 +830,109 @@ static void	save_template_item(zbx_uint64_t hostid, zbx_uint64_t *itemid, zbx_te
 			goto dependent;
 
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "update items set ");
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_INTERFACEID))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sinterfaceid=%s", d,
-					DBsql_id_ins(item->interfaceid));
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TEMPLATEID))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%stemplateid=" ZBX_FS_UI64, d,
-					item->templateid);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_NAME))
-		{
-			str_esc = DBdyn_escape_string(item->name);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sname='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TYPE))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%stype=%d", d, (int)item->type);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VALUE_TYPE))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svalue_type=%d", d, (int)item->value_type);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DELAY))
-		{
-			str_esc = DBdyn_escape_string(item->delay);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdelay='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HISTORY))
-		{
-			str_esc = DBdyn_escape_string(item->history);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%shistory='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TRENDS))
-		{
-			str_esc = DBdyn_escape_string(item->trends);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strends='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_STATUS))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sstatus=%d", d, (int)item->status);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TRAPPER_HOSTS))
-		{
-			str_esc = DBdyn_escape_string(item->trapper_hosts);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strapper_hosts='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_UNITS))
-		{
-			str_esc = DBdyn_escape_string(item->units);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sunits='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FORMULA))
-		{
-			str_esc = DBdyn_escape_string(item->formula);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sformula='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_LOGTIMEFMT))
-		{
-			str_esc = DBdyn_escape_string(item->logtimefmt);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%slogtimefmt='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VALUEMAPID))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svaluemapid=%s", d,
-					DBsql_id_ins(item->valuemapid));
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PARAMS))
-		{
-			str_esc = DBdyn_escape_string(item->params);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sparams='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_IPMI_SENSOR))
-		{
-			str_esc = DBdyn_escape_string(item->ipmi_sensor);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sipmi_sensor='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SNMP_OID))
-		{
-			str_esc = DBdyn_escape_string(item->snmp_oid);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmp_oid='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_AUTHTYPE))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sauthtype=%d", d, (int)item->authtype);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_USERNAME))
-		{
-			str_esc = DBdyn_escape_string(item->username);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%susername='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PASSWORD))
-		{
-			str_esc = DBdyn_escape_string(item->password);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spassword='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PUBLICKEY))
-		{
-			str_esc = DBdyn_escape_string(item->publickey);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spublickey='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_PRIVATEKEY))
-		{
-			str_esc = DBdyn_escape_string(item->privatekey);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sprivatekey='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FLAGS))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sflags=%d", d, (int)item->flags);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DESCRIPTION))
-		{
-			str_esc = DBdyn_escape_string(item->description);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdescription='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_INVENTORY_LINK))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sinventory_link=%d", d,
-					(int)item->inventory_link);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_LIFETIME))
-		{
-			str_esc = DBdyn_escape_string(item->lifetime);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%slifetime='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_EVALTYPE))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sevaltype=%d", d, (int)item->evaltype);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_JMX_ENDPOINT))
-		{
-			str_esc = DBdyn_escape_string(item->jmx_endpoint);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sjmx_endpoint='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_MASTER_ITEMID))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%smaster_itemid=%s", d,
-					DBsql_id_ins(item->master_itemid));
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_TIMEOUT))
-		{
-			str_esc = DBdyn_escape_string(item->timeout);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%stimeout='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_URL))
-		{
-			str_esc = DBdyn_escape_string(item->url);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%surl='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_QUERY_FIELDS))
-		{
-			str_esc = DBdyn_escape_string(item->query_fields);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%squery_fields='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_POSTS))
-		{
-			str_esc = DBdyn_escape_string(item->posts);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sposts='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_STATUS_CODES))
-		{
-			str_esc = DBdyn_escape_string(item->status_codes);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sstatus_codes='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_FOLLOW_REDIRECTS))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sfollow_redirects=%d", d,
-					(int)item->follow_redirects);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_POST_TYPE))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spost_type=%d", d, (int)item->post_type);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HTTP_PROXY))
-		{
-			str_esc = DBdyn_escape_string(item->http_proxy);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%shttp_proxy='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_HEADERS))
-		{
-			str_esc = DBdyn_escape_string(item->headers);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sheaders='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_RETRIEVE_MODE))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sretrieve_mode=%d", d,
-					(int)item->retrieve_mode);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_REQUEST_METHOD))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%srequest_method=%d", d,
-					(int)item->request_method);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_OUTPUT_FORMAT))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%soutput_format=%d", d,
-					(int)item->output_format);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_CERT_FILE))
-		{
-			str_esc = DBdyn_escape_string(item->ssl_cert_file);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sssl_cert_file='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_KEY_FILE))
-		{
-			str_esc = DBdyn_escape_string(item->ssl_key_file);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sssl_key_file='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_SSL_KEY_PASSWORD))
-		{
-			str_esc = DBdyn_escape_string(item->ssl_key_password);
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sssl_key_password='%s'", d, str_esc);
-			d = ",";
-			zbx_free(str_esc);
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VERIFY_PEER))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sverify_peer=%d", d,
-					(int)item->verify_peer);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_VERIFY_HOST))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sverify_host=%d", d,
-					(int)item->verify_host);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_ALLOW_TRAPS))
-		{
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sallow_traps=%d", d,
-					(int)item->allow_traps);
-			d = ",";
-		}
-		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_DISCOVER))
-			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdiscover=%d", d, (int)item->discover);
+
+#define PREPARE_UPDATE_ID(FLAG_POSTFIX, field)									\
+		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_##FLAG_POSTFIX))			\
+		{												\
+			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%s"#field"=%s", d,			\
+					DBsql_id_ins(item->field));						\
+			d = ",";										\
+														\
+			zbx_audit_item_update_json_update_##field(item->itemid, item->flags,			\
+					item->field##_orig, item->field);					\
+		}
+#define PREPARE_UPDATE_STR(FLAG_POSTFIX, field)									\
+		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_##FLAG_POSTFIX))			\
+		{												\
+			str_esc = DBdyn_escape_string(item->field);						\
+			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%s"#field"='%s'", d, str_esc);		\
+			d = ",";										\
+			zbx_free(str_esc);									\
+														\
+			zbx_audit_item_update_json_update_##field(item->itemid, item->flags,			\
+					item->field##_orig, item->field);					\
+		}
+#define PREPARE_UPDATE_STR_SECRET(FLAG_POSTFIX, field)								\
+		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_##FLAG_POSTFIX))			\
+		{												\
+			str_esc = DBdyn_escape_string(item->field);						\
+			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%s"#field"='%s'", d, str_esc);		\
+			d = ",";										\
+			zbx_free(str_esc);									\
+														\
+			zbx_audit_item_update_json_update_##field(item->itemid, item->flags,			\
+					ZBX_MACRO_SECRET_MASK, ZBX_MACRO_SECRET_MASK);				\
+		}
+#define PREPARE_UPDATE_UC(FLAG_POSTFIX, field)									\
+		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_##FLAG_POSTFIX))			\
+		{												\
+			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%s"#field"=%d", d, (int)item->field);	\
+			d = ",";										\
+														\
+			zbx_audit_item_update_json_update_##field(item->itemid, item->flags,			\
+					(int)item->field##_orig, (int)item->field);				\
+		}
+#define PREPARE_UPDATE_UINT64(FLAG_POSTFIX, field)								\
+		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_##FLAG_POSTFIX))			\
+		{												\
+			zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%s"#field"=" ZBX_FS_UI64, d,		\
+					item->field);								\
+			d = ",";										\
+														\
+			zbx_audit_item_update_json_update_##field(item->itemid, item->flags,			\
+					item->field##_orig, item->field);					\
+		}
+
+		zbx_audit_item_create_entry(AUDIT_ACTION_UPDATE, item->itemid, item->name, item->flags);
+		PREPARE_UPDATE_ID(INTERFACEID, interfaceid)
+		PREPARE_UPDATE_STR(NAME, name)
+		PREPARE_UPDATE_UC(TYPE, type)
+		PREPARE_UPDATE_UINT64(TEMPLATEID, templateid)
+		PREPARE_UPDATE_UC(VALUE_TYPE, value_type)
+		PREPARE_UPDATE_STR(DELAY, delay);
+		PREPARE_UPDATE_STR(HISTORY, history)
+		PREPARE_UPDATE_STR(TRENDS, trends)
+		PREPARE_UPDATE_UC(STATUS, status)
+		PREPARE_UPDATE_STR(TRAPPER_HOSTS, trapper_hosts)
+		PREPARE_UPDATE_STR(UNITS, units)
+		PREPARE_UPDATE_STR(FORMULA, formula)
+		PREPARE_UPDATE_STR(LOGTIMEFMT, logtimefmt)
+		PREPARE_UPDATE_ID(VALUEMAPID, valuemapid)
+		PREPARE_UPDATE_STR(PARAMS, params)
+		PREPARE_UPDATE_STR(IPMI_SENSOR, ipmi_sensor)
+		PREPARE_UPDATE_STR(SNMP_OID, snmp_oid)
+		PREPARE_UPDATE_UC(AUTHTYPE, authtype)
+		PREPARE_UPDATE_STR(USERNAME, username)
+		PREPARE_UPDATE_STR_SECRET(PASSWORD, password)
+		PREPARE_UPDATE_STR(PUBLICKEY, publickey)
+		PREPARE_UPDATE_STR(PRIVATEKEY, privatekey)
+		PREPARE_UPDATE_UC(FLAGS, flags)
+		PREPARE_UPDATE_STR(DESCRIPTION, description)
+		PREPARE_UPDATE_UC(INVENTORY_LINK, inventory_link)
+		PREPARE_UPDATE_STR(LIFETIME, lifetime)
+		PREPARE_UPDATE_UC(EVALTYPE, evaltype)
+		PREPARE_UPDATE_STR(JMX_ENDPOINT, jmx_endpoint)
+		PREPARE_UPDATE_ID(MASTER_ITEMID, master_itemid)
+		PREPARE_UPDATE_STR(TIMEOUT, timeout)
+		PREPARE_UPDATE_STR(URL, url)
+		PREPARE_UPDATE_STR(QUERY_FIELDS, query_fields)
+		PREPARE_UPDATE_STR(POSTS, posts)
+		PREPARE_UPDATE_STR(STATUS_CODES, status_codes)
+		PREPARE_UPDATE_UC(FOLLOW_REDIRECTS, follow_redirects)
+		PREPARE_UPDATE_UC(POST_TYPE, post_type)
+		PREPARE_UPDATE_STR(HTTP_PROXY, http_proxy)
+		PREPARE_UPDATE_STR(HEADERS, headers)
+		PREPARE_UPDATE_UC(RETRIEVE_MODE, retrieve_mode)
+		PREPARE_UPDATE_UC(REQUEST_METHOD, request_method)
+		PREPARE_UPDATE_UC(OUTPUT_FORMAT, output_format)
+		PREPARE_UPDATE_STR(SSL_CERT_FILE, ssl_cert_file)
+		PREPARE_UPDATE_STR(SSL_KEY_FILE, ssl_key_file)
+		PREPARE_UPDATE_STR_SECRET(SSL_KEY_PASSWORD, ssl_key_password)
+		PREPARE_UPDATE_UC(VERIFY_PEER, verify_peer)
+		PREPARE_UPDATE_UC(VERIFY_HOST, verify_host)
+		PREPARE_UPDATE_UC(ALLOW_TRAPS, allow_traps)
+		PREPARE_UPDATE_UC(DISCOVER, discover)
+		ZBX_UNUSED(d);
 
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, " where itemid=" ZBX_FS_UI64 ";\n", item->itemid);
 	}
@@ -1179,6 +953,9 @@ static void	save_template_item(zbx_uint64_t hostid, zbx_uint64_t *itemid, zbx_te
 
 		zbx_db_insert_add_values(db_insert_irtdata, *itemid);
 
+		zbx_audit_item_create_entry(AUDIT_ACTION_ADD, *itemid, item->name, item->flags);
+		zbx_audit_item_update_json_add_data(*itemid, item, hostid);
+
 		item->itemid = (*itemid)++;
 	}
 dependent:
@@ -1193,6 +970,8 @@ dependent:
 		save_template_item(hostid, itemid, dependent, db_insert_items, db_insert_irtdata, sql, sql_alloc,
 				sql_offset);
 	}
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
 /******************************************************************************
@@ -1291,7 +1070,7 @@ static void	save_template_items(zbx_uint64_t hostid, zbx_vector_ptr_t *items)
  *          database                                                          *
  *                                                                            *
  * Parameters:  items          - [IN] the template items                      *
- *              rules          - [IN] the ldd rule mapping                    *
+ *              rules          - [IN] the lld rule mapping                    *
  *              new_conditions - [IN] the number of new item conditions to    *
  *                                    be inserted                             *
  *                                                                            *
@@ -1307,6 +1086,8 @@ static void	save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r
 	size_t				sql_alloc = 0, sql_offset = 0;
 	zbx_vector_uint64_t		item_conditionids;
 
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
 	if (0 == rules->values_num)
 		return;
 
@@ -1342,8 +1123,13 @@ static void	save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r
 			{
 				condition = (zbx_lld_rule_condition_t *)rule->conditions.values[j];
 
-				zbx_db_insert_add_values(&db_insert, rule->conditionid++, item->itemid,
+				zbx_db_insert_add_values(&db_insert, rule->conditionid, item->itemid,
 						(int)condition->op, condition->macro, condition->value);
+
+				zbx_audit_discovery_rule_update_json_add_filter_conditions(item->itemid,
+						rule->conditionid, condition->op, condition->macro, condition->value);
+
+				rule->conditionid++;
 			}
 		}
 	}
@@ -1371,12 +1157,18 @@ static void	save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r
 			if (0 == condition->upd_flags)
 				continue;
 
+			zbx_audit_discovery_rule_update_json_update_filter_conditions_create_entry(rule->itemid,
+					rule->conditionids.values[j]);
+
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "update item_condition set ");
 			if (0 != (condition->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_OPERATOR))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%soperator=%d", d,
 						(int)condition->op);
 				d = ",";
+				zbx_audit_discovery_rule_update_json_update_filter_conditions_operator(rule->itemid,
+						rule->conditionids.values[j], (int)condition->op_orig,
+						(int)condition->op);
 			}
 			if (0 != (condition->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_MACRO))
 			{
@@ -1384,12 +1176,20 @@ static void	save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%smacro='%s'", d, macro_esc);
 				d = ",";
 				zbx_free(macro_esc);
+
+				zbx_audit_discovery_rule_update_json_update_filter_conditions_macro(rule->itemid,
+						rule->conditionids.values[j], condition->macro_orig,
+						condition->macro);
 			}
 			if (0 != (condition->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_CONDITION_UPDATE_VALUE))
 			{
 				value_esc = DBdyn_escape_string(condition->value);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%svalue='%s'", d, value_esc);
 				zbx_free(value_esc);
+
+				zbx_audit_discovery_rule_update_json_update_filter_conditions_value(rule->itemid,
+						rule->conditionids.values[j], condition->value_orig,
+						condition->value);
 			}
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " where item_conditionid=" ZBX_FS_UI64 ";\n",
 					rule->conditionids.values[j]);
@@ -1399,15 +1199,24 @@ static void	save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r
 
 		/* delete removed rule conditions */
 		for (j = index; j < rule->conditionids.values_num; j++)
+		{
+			zbx_audit_discovery_rule_update_json_delete_filter_conditions(rule->itemid,
+					rule->conditionids.values[j]);
 			zbx_vector_uint64_append(&item_conditionids, rule->conditionids.values[j]);
+		}
 
 		/* insert new rule conditions */
 		for (j = index; j < rule->conditions.values_num; j++)
 		{
 			condition = (zbx_lld_rule_condition_t *)rule->conditions.values[j];
 
-			zbx_db_insert_add_values(&db_insert, rule->conditionid++, rule->itemid,
+			zbx_db_insert_add_values(&db_insert, rule->conditionid, rule->itemid,
 					(int)condition->op, condition->macro, condition->value);
+
+			zbx_audit_discovery_rule_update_json_add_filter_conditions(rule->itemid, rule->conditionid,
+					condition->op, condition->macro, condition->value);
+
+			rule->conditionid++;
 		}
 	}
 
@@ -1433,6 +1242,8 @@ static void	save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r
 
 	zbx_free(sql);
 	zbx_vector_uint64_destroy(&item_conditionids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
 /******************************************************************************
@@ -1531,31 +1342,64 @@ out:
 	zbx_vector_ptr_destroy(&prototypes);
 }
 
+static zbx_template_item_preproc_t	*zbx_item_preproc_create(const char *item_preprocid, int step, int type,
+		const char *params, int error_handler, const char *error_handler_params)
+{
+	zbx_template_item_preproc_t	*preproc;
+
+	preproc = (zbx_template_item_preproc_t *)zbx_malloc(NULL, sizeof(zbx_template_item_preproc_t));
+
+	preproc->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_PREPROC_RESET_FLAG;
+	ZBX_STR2UINT64(preproc->item_preprocid, item_preprocid);
+	preproc->step = step;
+	preproc->type = type;
+	preproc->params = zbx_strdup(NULL, params);
+	preproc->error_handler = error_handler;
+	preproc->error_handler_params = zbx_strdup(NULL, error_handler_params);
+	preproc->type_orig = 0;
+	preproc->params_orig = NULL;
+	preproc->error_handler_orig = 0;
+	preproc->error_handler_params_orig = NULL;
+
+	return preproc;
+}
+
 static void	zbx_item_preproc_free(zbx_template_item_preproc_t *preproc)
 {
+	if (0 != (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_PARAMS))
+		zbx_free(preproc->params_orig);
 	zbx_free(preproc->params);
+
 	zbx_free(preproc->error_handler_params);
-	zbx_free(preproc);
-}
+	if (0 != (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_ERROR_HANDLER_PARAMS))
+		zbx_free(preproc->error_handler_params_orig);
 
-static void	zbx_item_tags_free(zbx_template_item_tag_t *tag)
-{
-	zbx_free(tag->tag);
-	zbx_free(tag->value);
-	zbx_free(tag);
+	zbx_free(preproc);
 }
 
 static void	zbx_item_params_free(zbx_template_item_param_t *param)
 {
+	if (0 != (param->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PARAM_UPDATE_NAME))
+		zbx_free(param->name_orig);
 	zbx_free(param->name);
+
+	if (0 != (param->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PARAM_UPDATE_VALUE))
+		zbx_free(param->value_orig);
 	zbx_free(param->value);
+
 	zbx_free(param);
 }
 
 static void	zbx_lld_macros_free(zbx_template_lld_macro_t *macro)
 {
+	if (0 != (macro->upd_flags & ZBX_FLAG_TEMPLATE_LLD_MACRO_UPDATE_LLD_MACRO))
+		zbx_free(macro->lld_macro_orig);
 	zbx_free(macro->lld_macro);
+
+	if (0 != (macro->upd_flags & ZBX_FLAG_TEMPLATE_LLD_MACRO_UPDATE_PATH))
+		zbx_free(macro->path_orig);
 	zbx_free(macro->path);
+
 	zbx_free(macro);
 }
 
@@ -1570,41 +1414,11 @@ static void	zbx_lld_macros_free(zbx_template_lld_macro_t *macro)
  ******************************************************************************/
 static void	free_template_item(zbx_template_item_t *item)
 {
-	zbx_free(item->timeout);
-	zbx_free(item->url);
-	zbx_free(item->query_fields);
-	zbx_free(item->posts);
-	zbx_free(item->status_codes);
-	zbx_free(item->http_proxy);
-	zbx_free(item->headers);
-	zbx_free(item->ssl_cert_file);
-	zbx_free(item->ssl_key_file);
-	zbx_free(item->ssl_key_password);
-	zbx_free(item->jmx_endpoint);
-	zbx_free(item->lifetime);
-	zbx_free(item->description);
-	zbx_free(item->privatekey);
-	zbx_free(item->publickey);
-	zbx_free(item->password);
-	zbx_free(item->username);
-	zbx_free(item->snmp_oid);
-	zbx_free(item->ipmi_sensor);
-	zbx_free(item->params);
-	zbx_free(item->logtimefmt);
-	zbx_free(item->formula);
-	zbx_free(item->units);
-	zbx_free(item->trapper_hosts);
-	zbx_free(item->trends);
-	zbx_free(item->history);
-	zbx_free(item->delay);
-	zbx_free(item->name);
-	zbx_free(item->key);
-
 	zbx_vector_ptr_destroy(&item->dependent_items);
 	zbx_vector_item_preproc_ptr_clear_ext(&item->item_preprocs, zbx_item_preproc_free);
 	zbx_vector_item_preproc_ptr_clear_ext(&item->template_preprocs, zbx_item_preproc_free);
-	zbx_vector_item_tag_ptr_clear_ext(&item->item_tags, zbx_item_tags_free);
-	zbx_vector_item_tag_ptr_clear_ext(&item->template_tags, zbx_item_tags_free);
+	zbx_vector_item_tag_ptr_clear_ext(&item->item_tags, zbx_db_tag_free);
+	zbx_vector_item_tag_ptr_clear_ext(&item->template_tags, zbx_db_tag_free);
 	zbx_vector_item_param_ptr_clear_ext(&item->item_params, zbx_item_params_free);
 	zbx_vector_item_param_ptr_clear_ext(&item->template_params, zbx_item_params_free);
 	zbx_vector_lld_macro_ptr_clear_ext(&item->item_lld_macros, zbx_lld_macros_free);
@@ -1618,6 +1432,44 @@ static void	free_template_item(zbx_template_item_t *item)
 	zbx_vector_lld_macro_ptr_destroy(&item->item_lld_macros);
 	zbx_vector_lld_macro_ptr_destroy(&item->template_lld_macros);
 
+#define CLEAN_ORIG(FLAG_POSTFIX, field)							\
+	if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_##FLAG_POSTFIX))	\
+	{										\
+		zbx_free(item->field##_orig);						\
+	}										\
+	zbx_free(item->field);
+
+	CLEAN_ORIG(NAME, name)
+	CLEAN_ORIG(DELAY, delay)
+	CLEAN_ORIG(HISTORY, history)
+	CLEAN_ORIG(TRENDS, trends)
+	CLEAN_ORIG(TRAPPER_HOSTS, trapper_hosts)
+	CLEAN_ORIG(UNITS, units)
+	CLEAN_ORIG(FORMULA, formula)
+	CLEAN_ORIG(LOGTIMEFMT, logtimefmt)
+	CLEAN_ORIG(PARAMS, params)
+	CLEAN_ORIG(IPMI_SENSOR, ipmi_sensor)
+	CLEAN_ORIG(SNMP_OID, snmp_oid)
+	CLEAN_ORIG(USERNAME, username)
+	CLEAN_ORIG(PASSWORD, password)
+	CLEAN_ORIG(PUBLICKEY, publickey)
+	CLEAN_ORIG(PRIVATEKEY, privatekey)
+	CLEAN_ORIG(DESCRIPTION, description)
+	CLEAN_ORIG(LIFETIME, lifetime)
+	CLEAN_ORIG(JMX_ENDPOINT, jmx_endpoint)
+	CLEAN_ORIG(TIMEOUT, timeout)
+	CLEAN_ORIG(URL, url)
+	CLEAN_ORIG(QUERY_FIELDS, query_fields)
+	CLEAN_ORIG(POSTS, posts)
+	CLEAN_ORIG(STATUS_CODES, status_codes)
+	CLEAN_ORIG(HTTP_PROXY, http_proxy)
+	CLEAN_ORIG(HEADERS, headers)
+	CLEAN_ORIG(SSL_CERT_FILE, ssl_cert_file)
+	CLEAN_ORIG(SSL_KEY_FILE, ssl_key_file)
+	CLEAN_ORIG(SSL_KEY_PASSWORD, ssl_key_password)
+#undef CLEAN_ORIG
+	zbx_free(item->key);
+
 	zbx_free(item);
 }
 
@@ -1632,6 +1484,10 @@ static void	free_template_item(zbx_template_item_t *item)
  ******************************************************************************/
 static void	free_lld_rule_condition(zbx_lld_rule_condition_t *condition)
 {
+	/* cannot use update flags to check if orig values were set, because they get reset */
+	zbx_free(condition->macro_orig);
+	zbx_free(condition->value_orig);
+
 	zbx_free(condition->macro);
 	zbx_free(condition->value);
 	zbx_free(condition);
@@ -1690,6 +1546,7 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 	zbx_template_item_preproc_t	*preproc;
 	zbx_vector_uint64_t		deleteids;
 	zbx_db_insert_t			db_insert;
+	zbx_uint64_t			new_preprocid = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -1706,6 +1563,7 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 			if (0 != (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_DELETE))
 			{
 				zbx_vector_uint64_append(&deleteids, preproc->item_preprocid);
+				zbx_audit_item_delete_preproc(item->itemid, item->flags, preproc->item_preprocid);
 				continue;
 			}
 
@@ -1727,6 +1585,8 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 
 	if (0 != new_preproc_num)
 	{
+		new_preprocid = DBget_maxid_num("item_preproc", new_preproc_num);
+
 		zbx_db_insert_prepare(&db_insert, "item_preproc", "item_preprocid", "itemid", "step", "type", "params",
 				"error_handler", "error_handler_params", NULL);
 	}
@@ -1742,21 +1602,34 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 			preproc = (zbx_template_item_preproc_t *)item->item_preprocs.values[j];
 			if (0 == preproc->item_preprocid)
 			{
-				zbx_db_insert_add_values(&db_insert, __UINT64_C(0), item->itemid, preproc->step,
+				zbx_db_insert_add_values(&db_insert, new_preprocid, item->itemid, preproc->step,
 						preproc->type, preproc->params, preproc->error_handler,
 						preproc->error_handler_params);
+
+				zbx_audit_item_update_json_add_item_preproc(item->itemid, new_preprocid, item->flags,
+						preproc->step, preproc->type, preproc->params,
+						preproc->error_handler, preproc->error_handler_params);
+
+				new_preprocid++;
+
 				continue;
 			}
 
 			if (0 == (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE))
 				continue;
 
+			zbx_audit_item_update_json_update_item_preproc_create_entry(item->itemid, item->flags,
+					preproc->item_preprocid);
+
 			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "update item_preproc set ");
 
 			if (0 != (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_TYPE))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%stype=%d", d, preproc->type);
 				d = ",";
+
+				zbx_audit_item_update_json_update_item_preproc_type(item->itemid, item->flags,
+						preproc->item_preprocid, preproc->type_orig, preproc->type);
 			}
 
 			if (0 != (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_PARAMS))
@@ -1768,6 +1641,9 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 
 				zbx_free(params_esc);
 				d = ",";
+
+				zbx_audit_item_update_json_update_item_preproc_params(item->itemid, item->flags,
+						preproc->item_preprocid, preproc->params_orig, preproc->params);
 			}
 
 			if (0 != (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_ERROR_HANDLER))
@@ -1775,6 +1651,10 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%serror_handler=%d", d,
 						preproc->error_handler);
 				d = ",";
+
+				zbx_audit_item_update_json_update_item_preproc_error_handler(item->itemid, item->flags,
+						preproc->item_preprocid, preproc->error_handler_orig,
+						preproc->error_handler);
 			}
 
 			if (0 != (preproc->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_ERROR_HANDLER_PARAMS))
@@ -1786,6 +1666,10 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 						params_esc);
 
 				zbx_free(params_esc);
+
+				zbx_audit_item_update_json_update_item_preproc_error_handler_params(item->itemid,
+						item->flags, preproc->item_preprocid,
+						preproc->error_handler_params_orig, preproc->error_handler_params);
 			}
 
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " where item_preprocid=" ZBX_FS_UI64 ";\n",
@@ -1793,7 +1677,6 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 
 			DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset);
 		}
-
 	}
 
 	if (0 != update_preproc_num)
@@ -1806,7 +1689,6 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 
 	if (0 != new_preproc_num)
 	{
-		zbx_db_insert_autoincrement(&db_insert, "item_preprocid");
 		zbx_db_insert_execute(&db_insert);
 		zbx_db_insert_clean(&db_insert);
 	}
@@ -1843,9 +1725,10 @@ static void	copy_template_item_tags(const zbx_vector_ptr_t *items)
 	char				*sql = NULL;
 	size_t				sql_alloc = 0, sql_offset = 0;
 	zbx_template_item_t		*item;
-	zbx_template_item_tag_t		*tag;
+	zbx_db_tag_t			*tag;
 	zbx_vector_uint64_t		deleteids;
 	zbx_db_insert_t			db_insert;
+	zbx_uint64_t			new_tagid = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -1857,21 +1740,22 @@ static void	copy_template_item_tags(const zbx_vector_ptr_t *items)
 
 		for (j = 0; j < item->item_tags.values_num; j++)
 		{
-			tag = (zbx_template_item_tag_t *)item->item_tags.values[j];
+			tag = (zbx_db_tag_t *)item->item_tags.values[j];
 
-			if (0 != (tag->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_TAG_DELETE))
+			if (0 != (tag->flags & ZBX_FLAG_DB_TAG_REMOVE))
 			{
-				zbx_vector_uint64_append(&deleteids, tag->itemtagid);
+				zbx_vector_uint64_append(&deleteids, tag->tagid);
+				zbx_audit_item_delete_tag(item->itemid, item->flags, tag->tagid);
 				continue;
 			}
 
-			if (0 == tag->itemtagid)
+			if (0 == tag->tagid)
 			{
 				new_tag_num++;
 				continue;
 			}
 
-			if (0 == (tag->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE))
+			if (0 == (tag->flags & ZBX_FLAG_DB_TAG_UPDATE))
 				continue;
 
 			update_tag_num++;
@@ -1882,7 +1766,10 @@ static void	copy_template_item_tags(const zbx_vector_ptr_t *items)
 		DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset);
 
 	if (0 != new_tag_num)
+	{
+		new_tagid = DBget_maxid_num("item_tag", new_tag_num);
 		zbx_db_insert_prepare(&db_insert, "item_tag", "itemtagid", "itemid", "tag", "value", NULL);
+	}
 
 	for (i = 0; i < items->values_num; i++)
 	{
@@ -1892,41 +1779,52 @@ static void	copy_template_item_tags(const zbx_vector_ptr_t *items)
 		{
 			const char	*d = "";
 
-			tag = (zbx_template_item_tag_t *)item->item_tags.values[j];
-			if (0 == tag->itemtagid)
+			tag = (zbx_db_tag_t *)item->item_tags.values[j];
+			if (0 == tag->tagid)
 			{
-				zbx_db_insert_add_values(&db_insert, __UINT64_C(0), item->itemid, tag->tag, tag->value);
+				zbx_db_insert_add_values(&db_insert, new_tagid, item->itemid, tag->tag, tag->value);
+				zbx_audit_item_update_json_add_item_tag(item->itemid, new_tagid, item->flags, tag->tag,
+						tag->value);
+				new_tagid++;
+
 				continue;
 			}
 
-			if (0 == (tag->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE))
+			if (0 == (tag->flags & ZBX_FLAG_DB_TAG_UPDATE))
 				continue;
 
+			zbx_audit_item_update_json_update_item_tag_create_entry(item->itemid, item->flags,
+					tag->tagid);
 			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "update item_tag set ");
 
-			if (0 != (tag->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_TAG))
+			if (0 != (tag->flags & ZBX_FLAG_DB_TAG_UPDATE_TAG))
 			{
 				char	*tag_esc;
 
 				tag_esc = DBdyn_escape_string(tag->tag);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%stag='%s'", d, tag_esc);
 
-				zbx_free(tag_esc);
 				d = ",";
+				zbx_audit_item_update_json_update_item_tag_tag(item->itemid, item->flags,
+						tag->tagid, tag->tag_orig, tag->tag);
+				zbx_free(tag_esc);
+
 			}
 
-			if (0 != (tag->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_VALUE))
+			if (0 != (tag->flags & ZBX_FLAG_DB_TAG_UPDATE_VALUE))
 			{
 				char	*value_esc;
 
 				value_esc = DBdyn_escape_string(tag->value);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%svalue='%s'", d, value_esc);
+				zbx_audit_item_update_json_update_item_tag_value(item->itemid, item->flags,
+						tag->tagid, tag->value_orig, tag->value);
 
 				zbx_free(value_esc);
 			}
 
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " where itemtagid=" ZBX_FS_UI64 ";\n",
-					tag->itemtagid);
+					tag->tagid);
 
 			DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset);
 		}
@@ -1943,7 +1841,6 @@ static void	copy_template_item_tags(const zbx_vector_ptr_t *items)
 
 	if (0 != new_tag_num)
 	{
-		zbx_db_insert_autoincrement(&db_insert, "itemtagid");
 		zbx_db_insert_execute(&db_insert);
 		zbx_db_insert_clean(&db_insert);
 	}
@@ -1979,6 +1876,7 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 	int				i, j, new_param_num = 0, update_param_num = 0, delete_param_num = 0;
 	char				*sql = NULL;
 	size_t				sql_alloc = 0, sql_offset = 0;
+	zbx_uint64_t			item_parameter_id = 0;
 	zbx_template_item_t		*item;
 	zbx_template_item_param_t	*param;
 	zbx_vector_uint64_t		deleteids;
@@ -1999,6 +1897,7 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 			if (0 != (param->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PARAM_DELETE))
 			{
 				zbx_vector_uint64_append(&deleteids, param->item_parameterid);
+				zbx_audit_item_delete_params(item->itemid, item->flags, param->item_parameterid);
 				continue;
 			}
 
@@ -2022,6 +1921,7 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 	{
 		zbx_db_insert_prepare(&db_insert, "item_parameter", "item_parameterid", "itemid", "name", "value",
 				NULL);
+		item_parameter_id = DBget_maxid_num("item_parameter", new_param_num);
 	}
 
 	for (i = 0; i < items->values_num; i++)
@@ -2035,14 +1935,20 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 			param = (zbx_template_item_param_t *)item->item_params.values[j];
 			if (0 == param->item_parameterid)
 			{
-				zbx_db_insert_add_values(&db_insert, __UINT64_C(0), item->itemid, param->name,
+				zbx_db_insert_add_values(&db_insert, item_parameter_id, item->itemid, param->name,
 						param->value);
+				zbx_audit_item_update_json_add_params(item->itemid, item->flags, item_parameter_id,
+						param->name, param->value);
+				item_parameter_id++;
 				continue;
 			}
 
 			if (0 == (param->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PARAM_UPDATE))
 				continue;
 
+			zbx_audit_item_update_json_update_params_create_entry(item->itemid, item->flags,
+					param->item_parameterid);
+
 			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "update item_parameter set ");
 
 			if (0 != (param->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PARAM_UPDATE_NAME))
@@ -2054,6 +1960,9 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 
 				zbx_free(name_esc);
 				d = ",";
+
+				zbx_audit_item_update_json_update_params_name(item->itemid, item->flags,
+						param->item_parameterid, param->name_orig, param->name);
 			}
 
 			if (0 != (param->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_PARAM_UPDATE_VALUE))
@@ -2064,6 +1973,9 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%svalue='%s'", d, value_esc);
 
 				zbx_free(value_esc);
+
+				zbx_audit_item_update_json_update_params_value(item->itemid, item->flags,
+						param->item_parameterid, param->value_orig, param->value);
 			}
 
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " where item_parameterid=" ZBX_FS_UI64 ";\n",
@@ -2084,7 +1996,6 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 
 	if (0 != new_param_num)
 	{
-		zbx_db_insert_autoincrement(&db_insert, "item_parameterid");
 		zbx_db_insert_execute(&db_insert);
 		zbx_db_insert_clean(&db_insert);
 	}
@@ -2120,6 +2031,7 @@ static void	copy_template_lld_macro_paths(const zbx_vector_ptr_t *items)
 	int				i, j, new_lld_macro_num = 0, update_lld_macro_num = 0, delete_lld_macro_num = 0;
 	char				*sql = NULL;
 	size_t				sql_alloc = 0, sql_offset = 0;
+	zbx_uint64_t			new_lld_macro_pathid = 0;
 	zbx_template_item_t		*item;
 	zbx_template_lld_macro_t	*lld_macro;
 	zbx_vector_uint64_t		deleteids;
@@ -2140,6 +2052,8 @@ static void	copy_template_lld_macro_paths(const zbx_vector_ptr_t *items)
 			if (0 != (lld_macro->upd_flags & ZBX_FLAG_TEMPLATE_LLD_MACRO_DELETE))
 			{
 				zbx_vector_uint64_append(&deleteids, lld_macro->lld_macro_pathid);
+				zbx_audit_discovery_rule_update_json_delete_lld_macro_path(item->itemid,
+						lld_macro->lld_macro_pathid);
 				continue;
 			}
 
@@ -2174,6 +2088,8 @@ static void	copy_template_lld_macro_paths(const zbx_vector_ptr_t *items)
 	{
 		zbx_db_insert_prepare(&db_insert, "lld_macro_path", "lld_macro_pathid", "itemid", "lld_macro", "path",
 				NULL);
+
+		new_lld_macro_pathid = DBget_maxid_num("lld_macro_path", new_lld_macro_num);
 	}
 
 	for (i = 0; i < items->values_num; i++)
@@ -2187,14 +2103,22 @@ static void	copy_template_lld_macro_paths(const zbx_vector_ptr_t *items)
 			lld_macro = (zbx_template_lld_macro_t *)item->item_lld_macros.values[j];
 			if (0 == lld_macro->lld_macro_pathid)
 			{
-				zbx_db_insert_add_values(&db_insert, __UINT64_C(0), item->itemid, lld_macro->lld_macro,
-						lld_macro->path);
+				zbx_db_insert_add_values(&db_insert, new_lld_macro_pathid, item->itemid,
+						lld_macro->lld_macro, lld_macro->path);
+
+				zbx_audit_discovery_rule_update_json_add_lld_macro_path(item->itemid,
+						new_lld_macro_pathid, lld_macro->lld_macro, lld_macro->path);
+
+				new_lld_macro_pathid++;
 				continue;
 			}
 
 			if (0 == (lld_macro->upd_flags & ZBX_FLAG_TEMPLATE_LLD_MACRO_UPDATE))
 				continue;
 
+			zbx_audit_discovery_rule_update_json_lld_macro_path_create_update_entry(item->itemid,
+					lld_macro->lld_macro_pathid);
+
 			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "update lld_macro_path set ");
 
 			if (0 != (lld_macro->upd_flags & ZBX_FLAG_TEMPLATE_LLD_MACRO_UPDATE_LLD_MACRO))
@@ -2206,6 +2130,10 @@ static void	copy_template_lld_macro_paths(const zbx_vector_ptr_t *items)
 
 				zbx_free(lld_macro_esc);
 				d = ",";
+
+				zbx_audit_discovery_rule_update_json_update_lld_macro_path_lld_macro(item->itemid,
+						lld_macro->lld_macro_pathid, lld_macro->lld_macro_orig,
+						lld_macro->lld_macro);
 			}
 
 			if (0 != (lld_macro->upd_flags & ZBX_FLAG_TEMPLATE_LLD_MACRO_UPDATE_PATH))
@@ -2216,6 +2144,9 @@ static void	copy_template_lld_macro_paths(const zbx_vector_ptr_t *items)
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%spath='%s'", d, path_esc);
 
 				zbx_free(path_esc);
+
+				zbx_audit_discovery_rule_update_json_update_lld_macro_path_path(item->itemid,
+						lld_macro->lld_macro_pathid, lld_macro->path_orig, lld_macro->path);
 			}
 
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " where lld_macro_pathid=" ZBX_FS_UI64 ";\n",
@@ -2236,7 +2167,6 @@ static void	copy_template_lld_macro_paths(const zbx_vector_ptr_t *items)
 
 	if (0 != new_lld_macro_num)
 	{
-		zbx_db_insert_autoincrement(&db_insert, "lld_macro_pathid");
 		zbx_db_insert_execute(&db_insert);
 		zbx_db_insert_clean(&db_insert);
 	}
@@ -2354,6 +2284,8 @@ static void	save_template_lld_overrides(zbx_vector_ptr_t *overrides, zbx_hashset
 	zbx_lld_override_operation_t	*override_operation;
 	const zbx_template_item_t	**pitem;
 
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
 	if (0 != overrides->values_num)
 		overrideid = DBget_maxid_num("lld_override", overrides->values_num);
 
@@ -2422,6 +2354,10 @@ static void	save_template_lld_overrides(zbx_vector_ptr_t *overrides, zbx_hashset
 					(int)override_condition->operator, override_condition->macro,
 					override_condition->value);
 
+			zbx_audit_discovery_rule_update_json_add_lld_override_condition((*pitem)->itemid, overrideid,
+				override_conditionid, (int)override_condition->operator, override_condition->macro,
+				override_condition->value);
+
 			if (CONDITION_EVAL_TYPE_EXPRESSION == override->evaltype)
 			{
 				update_template_lld_formula(&override->formula,
@@ -2435,6 +2371,12 @@ static void	save_template_lld_overrides(zbx_vector_ptr_t *overrides, zbx_hashset
 		zbx_db_insert_add_values(&db_insert, overrideid, (*pitem)->itemid, override->name, (int)override->step,
 				(int)override->evaltype, override->formula, (int)override->stop);
 
+		zbx_audit_discovery_rule_update_json_add_lld_override((*pitem)->itemid, overrideid, override->name,
+				(int)override->step, (int)override->stop);
+
+		zbx_audit_discovery_rule_update_json_add_lld_override_filter((*pitem)->itemid, overrideid,
+				(int)override->evaltype, override->formula);
+
 		for (j = 0; j < override->override_operations.values_num; j++)
 		{
 			override_operation = (zbx_lld_override_operation_t *)override->override_operations.values[j];
@@ -2443,60 +2385,114 @@ static void	save_template_lld_overrides(zbx_vector_ptr_t *overrides, zbx_hashset
 					(int)override_operation->operationtype, (int)override_operation->operator,
 					override_operation->value);
 
+			zbx_audit_discovery_rule_update_json_add_lld_override_operation((*pitem)->itemid,
+					overrideid, override_operationid, (int)override_operation->operator,
+					override_operation->value);
+
 			if (ZBX_PROTOTYPE_STATUS_COUNT != override_operation->status)
 			{
 				zbx_db_insert_add_values(&db_insert_opstatus, override_operationid,
 						(int)override_operation->status);
+
+				zbx_audit_discovery_rule_update_json_add_lld_override_opstatus((*pitem)->itemid,
+						overrideid, override_operationid, (int)override_operation->status);
 			}
 
 			if (ZBX_PROTOTYPE_DISCOVER_COUNT != override_operation->discover)
 			{
 				zbx_db_insert_add_values(&db_insert_opdiscover, override_operationid,
 						(int)override_operation->discover);
+
+				zbx_audit_discovery_rule_update_json_add_lld_override_opdiscover((*pitem)->itemid,
+						overrideid,override_operationid, (int)override_operation->discover);
 			}
 
 			if (NULL != override_operation->delay)
 			{
 				zbx_db_insert_add_values(&db_insert_opperiod, override_operationid,
 						override_operation->delay);
+
+				zbx_audit_discovery_rule_update_json_add_lld_override_opperiod((*pitem)->itemid,
+						overrideid, override_operationid, override_operation->delay);
 			}
 
 			if (NULL != override_operation->history)
 			{
 				zbx_db_insert_add_values(&db_insert_ophistory, override_operationid,
 						override_operation->history);
+
+				zbx_audit_discovery_rule_update_json_add_lld_override_ophistory((*pitem)->itemid,
+						overrideid, override_operationid, override_operation->history);
 			}
 
 			if (NULL != override_operation->trends)
 			{
 				zbx_db_insert_add_values(&db_insert_optrends, override_operationid,
 						override_operation->trends);
+
+				zbx_audit_discovery_rule_update_json_add_lld_override_optrends((*pitem)->itemid,
+						overrideid, override_operationid, override_operation->trends);
 			}
 
 			if (TRIGGER_SEVERITY_COUNT != override_operation->severity)
 			{
 				zbx_db_insert_add_values(&db_insert_opseverity, override_operationid,
 						(int)override_operation->severity);
+
+				zbx_audit_discovery_rule_update_json_add_lld_override_opseverity((*pitem)->itemid,
+						overrideid, override_operationid, override_operation->severity);
 			}
 
-			for (k = 0; k < override_operation->tags.values_num; k++)
+			if (0 != override_operation->tags.values_num)
 			{
-				zbx_db_tag_t	*tag = override_operation->tags.values[k];
+				zbx_uint64_t	lld_override_optagid;
+
+				lld_override_optagid = DBget_maxid_num("lld_override_optag",
+						override_operation->tags.values_num);
+
+				for (k = 0; k < override_operation->tags.values_num; k++)
+				{
+					zbx_db_tag_t	*tag = override_operation->tags.values[k];
+
+					zbx_db_insert_add_values(&db_insert_optag, lld_override_optagid,
+							override_operationid, tag->tag, tag->value);
 
-				zbx_db_insert_add_values(&db_insert_optag, __UINT64_C(0), override_operationid,
-						tag->tag, tag->value);
+					zbx_audit_discovery_rule_update_json_add_lld_override_optag((*pitem)->itemid,
+							overrideid, lld_override_optagid, tag->tag, tag->value);
+
+					lld_override_optagid++;
+				}
 			}
 
-			for (k = 0; k < override_operation->templateids.values_num; k++)
+			if (0 != override_operation->templateids.values_num)
 			{
-				zbx_db_insert_add_values(&db_insert_optemplate, __UINT64_C(0), override_operationid,
+				zbx_uint64_t	lld_override_optemplateid;
+
+				lld_override_optemplateid = DBget_maxid_num("lld_override_optemplate",
+						override_operation->templateids.values_num);
+
+				for (k = 0; k < override_operation->templateids.values_num; k++)
+				{
+					zbx_db_insert_add_values(&db_insert_optemplate, lld_override_optemplateid,
+							override_operationid,
 						override_operation->templateids.values[k]);
+
+					zbx_audit_discovery_rule_update_json_add_lld_override_optemplate(
+							(*pitem)->itemid, overrideid, lld_override_optemplateid,
+							override_operation->templateids.values[k]);
+
+					lld_override_optemplateid++;
+				}
 			}
 
 			if (HOST_INVENTORY_COUNT != override_operation->inventory_mode)
 			{
 				zbx_db_insert_add_values(&db_insert_opinventory, override_operationid,
 						(int)override_operation->inventory_mode);
+
+				zbx_audit_discovery_rule_update_json_add_lld_override_opinventory((*pitem)->itemid,
+						overrideid, override_operationid,
+						(int)override_operation->inventory_mode);
 			}
 
 			override_operationid++;
@@ -2532,16 +2528,16 @@ static void	save_template_lld_overrides(zbx_vector_ptr_t *overrides, zbx_hashset
 	zbx_db_insert_execute(&db_insert_opseverity);
 	zbx_db_insert_clean(&db_insert_opseverity);
 
-	zbx_db_insert_autoincrement(&db_insert_optag, "lld_override_optagid");
 	zbx_db_insert_execute(&db_insert_optag);
 	zbx_db_insert_clean(&db_insert_optag);
 
-	zbx_db_insert_autoincrement(&db_insert_optemplate, "lld_override_optemplateid");
 	zbx_db_insert_execute(&db_insert_optemplate);
 	zbx_db_insert_clean(&db_insert_optemplate);
 
 	zbx_db_insert_execute(&db_insert_opinventory);
 	zbx_db_insert_clean(&db_insert_opinventory);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
 static void	copy_template_lld_overrides(const zbx_vector_uint64_t *templateids,
@@ -2555,12 +2551,32 @@ static void	copy_template_lld_overrides(const zbx_vector_uint64_t *templateids,
 	zbx_vector_ptr_t	overrides;
 	zbx_vector_uint64_t	overrideids;
 
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
 	zbx_vector_uint64_create(&overrideids);
 	zbx_vector_ptr_create(&overrides);
 
 	/* remove overrides from existing items with same key */
 	if (0 != lld_itemids->values_num)
 	{
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "select lld_overrideid,itemid from lld_override where");
+		DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "itemid", lld_itemids->values,
+				lld_itemids->values_num);
+		result = DBselect("%s", sql);
+
+		while (NULL != (row = DBfetch(result)))
+		{
+			zbx_uint64_t	delete_lld_overrideid, delete_itemid;
+
+			ZBX_STR2UINT64(delete_lld_overrideid, row[0]);
+			ZBX_STR2UINT64(delete_itemid, row[1]);
+			zbx_audit_discovery_rule_update_json_delete_lld_override(delete_itemid,
+					delete_lld_overrideid);
+		}
+
+		sql_offset = 0;
+		DBfree_result(result);
+
 		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "delete from lld_override where");
 		DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "itemid", lld_itemids->values,
 				lld_itemids->values_num);
@@ -2607,6 +2623,8 @@ static void	copy_template_lld_overrides(const zbx_vector_uint64_t *templateids,
 	zbx_vector_uint64_destroy(&overrideids);
 	zbx_vector_ptr_clear_ext(&overrides, (zbx_clean_func_t)lld_override_free);
 	zbx_vector_ptr_destroy(&overrides);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
 /******************************************************************************
@@ -2687,16 +2705,6 @@ static int	template_item_preproc_sort_by_step(const void *d1, const void *d2)
 	return 0;
 }
 
-static int	template_item_tag_sort_by_tag(const void *d1, const void *d2)
-{
-	zbx_template_item_tag_t	*it1 = *(zbx_template_item_tag_t * const *)d1;
-	zbx_template_item_tag_t	*it2 = *(zbx_template_item_tag_t * const *)d2;
-
-	ZBX_RETURN_IF_NOT_EQUAL(it1->tag, it2->tag);
-
-	return 0;
-}
-
 static int	template_item_param_sort_by_name(const void *d1, const void *d2)
 {
 	zbx_template_item_param_t	*ip1 = *(zbx_template_item_param_t * const *)d1;
@@ -2778,15 +2786,8 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 
 			item = (zbx_template_item_t *)items->values[index];
 
-			ppdst = (zbx_template_item_preproc_t *)zbx_malloc(NULL, sizeof(zbx_template_item_preproc_t));
-
-			ppdst->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_PREPROC_RESET_FLAG;
-			ZBX_STR2UINT64(ppdst->item_preprocid, row[0]);
-			ppdst->step = atoi(row[2]);
-			ppdst->type = atoi(row[3]);
-			ppdst->params = zbx_strdup(NULL, row[4]);
-			ppdst->error_handler = atoi(row[5]);
-			ppdst->error_handler_params = zbx_strdup(NULL, row[6]);
+			ppdst = zbx_item_preproc_create(row[0], atoi(row[2]), atoi(row[3]), row[4], atoi(row[5]),
+					row[6]);
 
 			zbx_vector_item_preproc_ptr_append(&((zbx_template_item_t *)item)->item_preprocs, ppdst);
 		}
@@ -2816,15 +2817,8 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 			THIS_SHOULD_NEVER_HAPPEN;
 			continue;
 		}
-		ppdst = (zbx_template_item_preproc_t *)zbx_malloc(NULL, sizeof(zbx_template_item_preproc_t));
 
-		ppdst->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_PREPROC_RESET_FLAG;
-		ZBX_STR2UINT64(ppdst->item_preprocid, row[0]);
-		ppdst->step = atoi(row[2]);
-		ppdst->type = atoi(row[3]);
-		ppdst->params = zbx_strdup(NULL, row[4]);
-		ppdst->error_handler = atoi(row[5]);
-		ppdst->error_handler_params = zbx_strdup(NULL, row[6]);
+		ppdst = zbx_item_preproc_create(row[0], atoi(row[2]), atoi(row[3]), row[4], atoi(row[5]), row[6]);
 
 		zbx_vector_item_preproc_ptr_append(&(*pitem)->template_preprocs, ppdst);
 	}
@@ -2848,15 +2842,10 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 			if (j >= item->item_preprocs.values_num)
 			{
 				ppsrc = (zbx_template_item_preproc_t *)item->template_preprocs.values[j];
-				ppdst = (zbx_template_item_preproc_t *)zbx_malloc(NULL,
-						sizeof(zbx_template_item_preproc_t));
-				ppdst->item_preprocid = 0;
-				ppdst->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_PREPROC_RESET_FLAG;
-				ppdst->step = ppsrc->step;
-				ppdst->type = ppsrc->type;
-				ppdst->params = zbx_strdup(NULL, ppsrc->params);
-				ppdst->error_handler = ppsrc->error_handler;
-				ppdst->error_handler_params = zbx_strdup(NULL, ppsrc->error_handler_params);
+
+				ppdst = zbx_item_preproc_create("0", ppsrc->step, ppsrc->type, ppsrc->params,
+						ppsrc->error_handler, ppsrc->error_handler_params);
+
 				zbx_vector_item_preproc_ptr_append(&item->item_preprocs, ppdst);
 				continue;
 			}
@@ -2873,6 +2862,7 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 
 			if (ppdst->type != ppsrc->type)
 			{
+				ppdst->type_orig = ppdst->type;
 				ppdst->type = ppsrc->type;
 				ppdst->upd_flags |= ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_TYPE;
 			}
@@ -2880,6 +2870,7 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 
 			if (0 != strcmp(ppdst->params, buffer))
 			{
+				ppdst->params_orig = zbx_strdup(NULL, ppdst->params);
 				zbx_free(ppdst->params);
 				ppdst->params = buffer;
 				buffer = NULL;
@@ -2888,6 +2879,7 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 
 			if (ppdst->error_handler != ppsrc->error_handler)
 			{
+				ppdst->error_handler_orig = ppdst->error_handler;
 				ppdst->error_handler = ppsrc->error_handler;
 				ppdst->upd_flags |= ZBX_FLAG_TEMPLATE_ITEM_PREPROC_UPDATE_ERROR_HANDLER;
 			}
@@ -2896,6 +2888,7 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 
 			if (0 != strcmp(ppdst->error_handler_params, buffer))
 			{
+				ppdst->error_handler_params_orig = zbx_strdup(NULL, ppdst->error_handler_params);
 				zbx_free(ppdst->error_handler_params);
 				ppdst->error_handler_params = buffer;
 				buffer = NULL;
@@ -2927,7 +2920,7 @@ static void	link_template_items_tag(const zbx_vector_uint64_t *templateids, zbx_
 	char				*sql = NULL;
 	size_t				sql_alloc = 0, sql_offset = 0;
 	zbx_uint64_t			itemid;
-	zbx_template_item_tag_t		*ptsrc, *ptdst;
+	zbx_db_tag_t			*ptsrc, *ptdst;
 	zbx_template_item_t		*item;
 	zbx_hashset_t			items_t;
 	zbx_vector_uint64_t		itemids;
@@ -2971,16 +2964,11 @@ static void	link_template_items_tag(const zbx_vector_uint64_t *templateids, zbx_
 			}
 
 			item = (zbx_template_item_t *)items->values[index];
-
-			ptdst = (zbx_template_item_tag_t *)zbx_malloc(NULL, sizeof(zbx_template_item_tag_t));
-
-			ptdst->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_RESET_FLAG;
-			ZBX_STR2UINT64(ptdst->itemtagid, row[0]);
-			ptdst->tag = zbx_strdup(NULL, row[2]);
-			ptdst->value = zbx_strdup(NULL, row[3]);
-
+			ptdst = zbx_db_tag_create(row[2], row[3]);
+			ZBX_STR2UINT64(ptdst->tagid, row[0]);
 			zbx_vector_item_tag_ptr_append(&item->item_tags, ptdst);
 		}
+
 		DBfree_result(result);
 		zbx_free(sql);
 		sql_offset = 0;
@@ -3001,18 +2989,15 @@ static void	link_template_items_tag(const zbx_vector_uint64_t *templateids, zbx_
 		zbx_template_item_t		item_local, *pitem_local = &item_local, **pitem;
 
 		ZBX_STR2UINT64(item_local.templateid, row[1]);
+
 		if (NULL == (pitem = (zbx_template_item_t **)zbx_hashset_search(&items_t, &pitem_local)))
 		{
 			THIS_SHOULD_NEVER_HAPPEN;
 			continue;
 		}
-		ptdst = (zbx_template_item_tag_t *)zbx_malloc(NULL, sizeof(zbx_template_item_tag_t));
-
-		ptdst->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_RESET_FLAG;
-		ZBX_STR2UINT64(ptdst->itemtagid, row[0]);
-		ptdst->tag = zbx_strdup(NULL, row[2]);
-		ptdst->value = zbx_strdup(NULL, row[3]);
 
+		ptdst = zbx_db_tag_create(row[2], row[3]);
+		ZBX_STR2UINT64(ptdst->tagid, row[0]);
 		zbx_vector_item_tag_ptr_append(&(*pitem)->template_tags, ptdst);
 	}
 	DBfree_result(result);
@@ -3025,8 +3010,8 @@ static void	link_template_items_tag(const zbx_vector_uint64_t *templateids, zbx_
 
 		item = (zbx_template_item_t *)items->values[i];
 
-		zbx_vector_item_tag_ptr_sort(&item->item_tags, template_item_tag_sort_by_tag);
-		zbx_vector_item_tag_ptr_sort(&item->template_tags, template_item_tag_sort_by_tag);
+		zbx_vector_item_tag_ptr_sort(&item->item_tags, zbx_db_tag_compare_func_template);
+		zbx_vector_item_tag_ptr_sort(&item->template_tags, zbx_db_tag_compare_func_template);
 
 		tag_num = MAX(item->item_tags.values_num, item->template_tags.values_num);
 
@@ -3034,44 +3019,43 @@ static void	link_template_items_tag(const zbx_vector_uint64_t *templateids, zbx_
 		{
 			if (j >= item->item_tags.values_num)
 			{
-				ptsrc = (zbx_template_item_tag_t *)item->template_tags.values[j];
-				ptdst = (zbx_template_item_tag_t *)zbx_malloc(NULL, sizeof(zbx_template_item_tag_t));
-				ptdst->itemtagid = 0;
-				ptdst->upd_flags = ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_RESET_FLAG;
-				ptdst->tag = zbx_strdup(NULL, ptsrc->tag);
-				ptdst->value = zbx_strdup(NULL, ptsrc->value);
+				ptsrc = (zbx_db_tag_t *)item->template_tags.values[j];
+				ptdst = zbx_db_tag_create(ptsrc->tag, ptsrc->value);
+				ptdst->tagid = 0;
 				zbx_vector_item_tag_ptr_append(&item->item_tags, ptdst);
 				continue;
 			}
 
-			ptdst = (zbx_template_item_tag_t *)item->item_tags.values[j];
+			ptdst = (zbx_db_tag_t *)item->item_tags.values[j];
 
 			if (j >= item->template_tags.values_num)
 			{
-				ptdst->upd_flags |= ZBX_FLAG_TEMPLATE_ITEM_TAG_DELETE;
+				ptdst->flags |= ZBX_FLAG_DB_TAG_REMOVE;
 				continue;
 			}
 
-			ptsrc = (zbx_template_item_tag_t *)item->template_tags.values[j];
+			ptsrc = (zbx_db_tag_t *)item->template_tags.values[j];
 
 			buffer = zbx_strdup(buffer, ptsrc->tag);
 
 			if (0 != strcmp(ptdst->tag, buffer))
 			{
+				ptdst->tag_orig = zbx_strdup(NULL, ptdst->tag);
 				zbx_free(ptdst->tag);
 				ptdst->tag = buffer;
 				buffer = NULL;
-				ptdst->upd_flags |= ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_TAG;
+				ptdst->flags |= ZBX_FLAG_DB_TAG_UPDATE_TAG;
 			}
 
 			buffer = zbx_strdup(buffer, ptsrc->value);
 
 			if (0 != strcmp(ptdst->value, buffer))
 			{
+				ptdst->value_orig = zbx_strdup(NULL, ptdst->value);
 				zbx_free(ptdst->value);
 				ptdst->value = buffer;
 				buffer = NULL;
-				ptdst->upd_flags |= ZBX_FLAG_TEMPLATE_ITEM_TAG_UPDATE_VALUE;
+				ptdst->flags |= ZBX_FLAG_DB_TAG_UPDATE_VALUE;
 			}
 			else
 				zbx_free(buffer);
@@ -3187,6 +3171,7 @@ static void	link_template_items_param(const zbx_vector_uint64_t *templateids, zb
 
 		zbx_vector_item_param_ptr_append(&(*pitem)->template_params, ppdst);
 	}
+
 	DBfree_result(result);
 	zbx_free(sql);
 
@@ -3231,7 +3216,9 @@ static void	link_template_items_param(const zbx_vector_uint64_t *templateids, zb
 
 			if (0 != strcmp(ppdst->name, buffer))
 			{
+				ppdst->name_orig = zbx_strdup(NULL, ppdst->name);
 				zbx_free(ppdst->name);
+
 				ppdst->name = buffer;
 				buffer = NULL;
 				ppdst->upd_flags |= ZBX_FLAG_TEMPLATE_ITEM_PARAM_UPDATE_NAME;
@@ -3241,7 +3228,9 @@ static void	link_template_items_param(const zbx_vector_uint64_t *templateids, zb
 
 			if (0 != strcmp(ppdst->value, buffer))
 			{
+				ppdst->value_orig = zbx_strdup(NULL, ppdst->value);
 				zbx_free(ppdst->value);
+
 				ppdst->value = buffer;
 				buffer = NULL;
 				ppdst->upd_flags |= ZBX_FLAG_TEMPLATE_ITEM_PARAM_UPDATE_VALUE;
@@ -3393,7 +3382,9 @@ static void	link_template_lld_macro_paths(const zbx_vector_uint64_t *templateids
 
 			if (0 != strcmp(plmpdst->lld_macro, buffer))
 			{
+				plmpdst->lld_macro_orig = zbx_strdup(NULL, plmpdst->lld_macro);
 				zbx_free(plmpdst->lld_macro);
+
 				plmpdst->lld_macro = buffer;
 				buffer = NULL;
 				plmpdst->upd_flags |= ZBX_FLAG_TEMPLATE_LLD_MACRO_UPDATE_LLD_MACRO;
@@ -3403,7 +3394,9 @@ static void	link_template_lld_macro_paths(const zbx_vector_uint64_t *templateids
 
 			if (0 != strcmp(plmpdst->path, buffer))
 			{
+				plmpdst->path_orig = zbx_strdup(NULL, plmpdst->path);
 				zbx_free(plmpdst->path);
+
 				plmpdst->path = buffer;
 				buffer = NULL;
 				plmpdst->upd_flags |= ZBX_FLAG_TEMPLATE_LLD_MACRO_UPDATE_PATH;
diff --git a/src/libs/zbxdbupgrade/dbupgrade_5030.c b/src/libs/zbxdbupgrade/dbupgrade_5030.c
index 5df13ac9198..5dbd3380b27 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_5030.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_5030.c
@@ -4507,67 +4507,17 @@ static int	DBpatch_5030164(void)
 
 /* trigger function conversion to new syntax */
 
-#define ZBX_DBPATCH_FUNCTION_UPDATE_NAME		0x01
-#define ZBX_DBPATCH_FUNCTION_UPDATE_PARAM		0x02
-#define ZBX_DBPATCH_FUNCTION_UPDATE			(ZBX_DBPATCH_FUNCTION_UPDATE_NAME | \
-							ZBX_DBPATCH_FUNCTION_UPDATE_PARAM)
-
-#define ZBX_DBPATCH_FUNCTION_CREATE			0x40
-#define ZBX_DBPATCH_FUNCTION_DELETE			0x80
-
 #define ZBX_DBPATCH_TRIGGER_UPDATE_EXPRESSION		0x01
 #define ZBX_DBPATCH_TRIGGER_UPDATE_RECOVERY_EXPRESSION	0x02
 
 #define ZBX_DBPATCH_TRIGGER_UPDATE			(ZBX_DBPATCH_TRIGGER_UPDATE_EXPRESSION | \
 							ZBX_DBPATCH_TRIGGER_UPDATE_RECOVERY_EXPRESSION)
 
-/* Function argument descriptors.                                                */
-/* Used in varargs list to describe following parameter mapping to old position. */
-/* Terminated with ZBX_DBPATCH_ARG_NONE.                                         */
-/* For example:                                                                  */
-/* ..., ZBX_DBPATCH_ARG_NUM, 1, ZBX_DBPATCH_ARG_STR, 0, ZBX_DBPATCH_ARG_NONE)    */
-/*  meaning first numeric parameter copied from second parameter                 */
-/*          second string parameter copied from first parameter                  */
-typedef enum
-{
-	ZBX_DBPATCH_ARG_NONE,		/* terminating descriptor, must be put at the end of the list */
-	ZBX_DBPATCH_ARG_HIST,		/* history period followed by sec/num (int) and timeshift (int) indexes */
-	ZBX_DBPATCH_ARG_TIME,		/* time value followed by argument index (int)  */
-	ZBX_DBPATCH_ARG_NUM,		/* number value followed by argument index (int)  */
-	ZBX_DBPATCH_ARG_STR,		/* string value  followed by argument index (int)  */
-	ZBX_DBPATCH_ARG_TREND,		/* trend period, followed by period (int) and timeshift (int) indexes */
-	ZBX_DBPATCH_ARG_CONST_STR,	/* constant,fffffff followed by string (char *) value */
-}
-zbx_dbpatch_arg_t;
-
 ZBX_VECTOR_DECL(loc, zbx_strloc_t)
 ZBX_VECTOR_IMPL(loc, zbx_strloc_t)
 
 typedef struct
 {
-	zbx_uint64_t	functionid;
-	zbx_uint64_t	itemid;
-
-	/* hostid for time based functions to track associated            */
-	/* hosts when replacing with history function with common function */
-	zbx_uint64_t	hostid;
-
-	/* function location - expression|recovery expression */
-	unsigned char	location;
-
-	char		*name;
-	char		*parameter;
-
-	/* the first parameter (host:key) for calculated item */
-	/* formula functions, NULL for trigger functions      */
-	char		*arg0;
-
-	unsigned char	flags;
-}
-zbx_dbpatch_function_t;
-
-typedef struct
-{
 	zbx_uint64_t	triggerid;
 	unsigned char	recovery_mode;
 	unsigned char	flags;
@@ -4576,59 +4526,12 @@ typedef struct
 }
 zbx_dbpatch_trigger_t;
 
-static void	dbpatch_function_free(zbx_dbpatch_function_t *func)
-{
-	zbx_free(func->name);
-	zbx_free(func->parameter);
-	zbx_free(func->arg0);
-	zbx_free(func);
-}
-
 static void	dbpatch_trigger_clear(zbx_dbpatch_trigger_t *trigger)
 {
 	zbx_free(trigger->expression);
 	zbx_free(trigger->recovery_expression);
 }
 
-static zbx_dbpatch_function_t	*dbpatch_new_function(zbx_uint64_t functionid, zbx_uint64_t itemid, const char *name,
-		const char *parameter, unsigned char flags)
-{
-	zbx_dbpatch_function_t	*func;
-
-	func = (zbx_dbpatch_function_t *)zbx_malloc(NULL, sizeof(zbx_dbpatch_function_t));
-	func->functionid = functionid;
-	func->itemid = itemid;
-	func->name = (NULL != name ? zbx_strdup(NULL, name) : NULL);
-	func->parameter = (NULL != parameter ? zbx_strdup(NULL, parameter) : NULL);
-	func->flags = flags;
-	func->arg0 = NULL;
-
-	return func;
-}
-
-static void	dbpatch_add_function(const zbx_dbpatch_function_t *template, zbx_uint64_t functionid, const char *name,
-		const char *parameter, unsigned char flags, zbx_vector_ptr_t *functions)
-{
-	zbx_dbpatch_function_t	*func;
-
-	func = dbpatch_new_function(functionid, template->itemid, name, parameter, flags);
-	func->arg0 = (NULL != template->arg0 ? zbx_strdup(NULL, template->arg0) : NULL);
-
-	zbx_vector_ptr_append(functions, func);
-}
-
-static void	dbpatch_update_function(zbx_dbpatch_function_t *func, const char *name,
-		const char *parameter, unsigned char flags)
-{
-	if (0 != (flags & ZBX_DBPATCH_FUNCTION_UPDATE_NAME))
-		func->name = zbx_strdup(func->name, name);
-
-	if (0 != (flags & ZBX_DBPATCH_FUNCTION_UPDATE_PARAM))
-		func->parameter = zbx_strdup(func->parameter, parameter);
-
-	func->flags = flags;
-}
-
 /******************************************************************************
  *                                                                            *
  * Function: dbpatch_update_expression                                        *
@@ -4648,7 +4551,8 @@ static int	dbpatch_update_expression(char **expression, zbx_uint64_t functionid,
 	size_t		out_alloc = 0, out_offset = 0;
 	zbx_uint64_t	id;
 
-	for (; SUCCEED == zbx_token_find(*expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID); pos++)
+	for (; SUCCEED == zbx_token_find(*expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID |
+			ZBX_TOKEN_SEARCH_SIMPLE_MACRO); pos++)
 	{
 		switch (token.type)
 		{
@@ -4703,609 +4607,6 @@ static void	dbpatch_update_trigger(zbx_dbpatch_trigger_t *trigger, zbx_uint64_t
 	}
 }
 
-static void	dbpatch_update_func_abschange(zbx_dbpatch_function_t *function, char **replace)
-{
-	dbpatch_update_function(function, "change", "", ZBX_DBPATCH_FUNCTION_UPDATE);
-	*replace = zbx_dsprintf(NULL, "abs({" ZBX_FS_UI64 "})", function->functionid);
-}
-
-static void	dbpatch_update_func_delta(zbx_dbpatch_function_t *function, const char *parameter, char **replace,
-		zbx_vector_ptr_t *functions)
-{
-	zbx_uint64_t	functionid2;
-
-	dbpatch_update_function(function, "max", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
-
-	functionid2 = (NULL == function->arg0 ? DBget_maxid("functions") : (zbx_uint64_t)functions->values_num);
-	dbpatch_add_function(function, functionid2, "min", parameter, ZBX_DBPATCH_FUNCTION_CREATE, functions);
-
-	*replace = zbx_dsprintf(NULL, "({" ZBX_FS_UI64 "}-{" ZBX_FS_UI64 "})", function->functionid, functionid2);
-}
-
-static void	dbpatch_update_func_diff(zbx_dbpatch_function_t *function, char **replace, zbx_vector_ptr_t *functions)
-{
-	zbx_uint64_t	functionid2;
-
-	dbpatch_update_function(function, "last", "#1", ZBX_DBPATCH_FUNCTION_UPDATE);
-
-	functionid2 = (NULL == function->arg0 ? DBget_maxid("functions") : (zbx_uint64_t)functions->values_num);
-	dbpatch_add_function(function, functionid2, "last", "#2", ZBX_DBPATCH_FUNCTION_CREATE, functions);
-
-	*replace = zbx_dsprintf(NULL, "({" ZBX_FS_UI64 "}<>{" ZBX_FS_UI64 "})", function->functionid, functionid2);
-}
-
-static void	dbpatch_update_func_trenddelta(zbx_dbpatch_function_t *function, const char *parameter, char **replace,
-		zbx_vector_ptr_t *functions)
-{
-	zbx_uint64_t	functionid2;
-
-	dbpatch_update_function(function, "trendmax", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
-
-	functionid2 = (NULL == function->arg0 ? DBget_maxid("functions") : (zbx_uint64_t)functions->values_num);
-	dbpatch_add_function(function, functionid2, "trendmin", parameter, ZBX_DBPATCH_FUNCTION_CREATE, functions);
-
-	*replace = zbx_dsprintf(NULL, "({" ZBX_FS_UI64 "}-{" ZBX_FS_UI64 "})", function->functionid, functionid2);
-}
-
-static void	dbpatch_update_func_strlen(zbx_dbpatch_function_t *function, const char *parameter, char **replace)
-{
-	dbpatch_update_function(function, "last", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
-
-	*replace = zbx_dsprintf(NULL, "length({" ZBX_FS_UI64 "})", function->functionid);
-}
-
-static void	dbpatch_update_hist2common(zbx_dbpatch_function_t *function, int extended, char **expression)
-{
-	char	*str  = NULL;
-	size_t	str_alloc = 0, str_offset = 0;
-
-	if (ZBX_DBPATCH_FUNCTION_DELETE == function->flags)
-		dbpatch_update_function(function, "last", "$", ZBX_DBPATCH_FUNCTION_UPDATE);
-
-	if (0 == extended)
-		zbx_chrcpy_alloc(&str, &str_alloc, &str_offset, '(');
-	zbx_strcpy_alloc(&str, &str_alloc, &str_offset, *expression);
-	if (0 == extended)
-		zbx_chrcpy_alloc(&str, &str_alloc, &str_offset, ')');
-
-	zbx_snprintf_alloc(&str, &str_alloc, &str_offset, " or ({" ZBX_FS_UI64 "}<>{" ZBX_FS_UI64 "})",
-			function->functionid, function->functionid);
-
-	zbx_free(*expression);
-	*expression = str;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: dbpatch_parse_function_params                                    *
- *                                                                            *
- * Purpose: parse function parameter string into parameter location vector    *
- *                                                                            *
- ******************************************************************************/
-static void	dbpatch_parse_function_params(const char *parameter, zbx_vector_loc_t *params)
-{
-	const char	*ptr;
-	size_t		len, pos, sep = 0, eol;
-	zbx_strloc_t	loc;
-
-	eol = strlen(parameter);
-
-	for (ptr = parameter; ptr < parameter + eol; ptr += sep + 1)
-	{
-		zbx_function_param_parse(ptr, &pos, &len, &sep);
-
-		if (0 < len)
-		{
-			loc.l = ptr - parameter + pos;
-			loc.r = loc.l + len - 1;
-		}
-		else
-		{
-			loc.l = ptr - parameter + eol - (ptr - parameter);
-			loc.r = loc.l;
-		}
-
-		zbx_vector_loc_append_ptr(params, &loc);
-	}
-
-	while (0 < params->values_num && '\0' == parameter[params->values[params->values_num - 1].l])
-		--params->values_num;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: dbpatch_strcpy_alloc_quoted                                      *
- *                                                                            *
- * Purpose: quote and text to a buffer                                        *
- *                                                                            *
- * Parameters: str        - [OUT] the output buffer                           *
- *             str_alloc  - [IN/OUT] an offset in the output buffer           *
- *             str_offset - [IN/OUT] the size of the output buffer            *
- *             source     - [IN] the source text                              *
- *                                                                            *
- * Return value: SUCCEED - the text is a composite constant                   *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- ******************************************************************************/
-static void	dbpatch_strcpy_alloc_quoted(char **str, size_t *str_alloc, size_t *str_offset, const char *source)
-{
-	char	raw[FUNCTION_PARAM_LEN * 5 + 1], quoted[sizeof(raw)];
-
-	zbx_strlcpy(raw, source, sizeof(raw));
-	zbx_escape_string(quoted, sizeof(quoted), raw, "\"\\");
-	zbx_chrcpy_alloc(str, str_alloc, str_offset, '"');
-	zbx_strcpy_alloc(str, str_alloc, str_offset, quoted);
-	zbx_chrcpy_alloc(str, str_alloc, str_offset, '"');
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: dbpatch_is_composite_constant                                    *
- *                                                                            *
- * Purpose: check for composite (consisting of macro(s) + text) constant      *
- *                                                                            *
- * Parameters: str - [IN] the text to check                                   *
- *                                                                            *
- * Return value: SUCCEED - the text is a composite constant                   *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- ******************************************************************************/
-static int	dbpatch_is_composite_constant(const char *str)
-{
-	zbx_token_t	token;
-
-	if (SUCCEED == zbx_token_find(str, 0, &token, ZBX_TOKEN_SEARCH_BASIC))
-	{
-		if (ZBX_TOKEN_USER_MACRO != token.type && ZBX_TOKEN_LLD_MACRO != token.type)
-			return SUCCEED;
-
-		if (0 != token.loc.l || strlen(str) - 1 != token.loc.r)
-			return SUCCEED;
-	}
-
-	return FAIL;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: dbpatch_convert_params                                           *
- *                                                                            *
- * Purpose: convert function parameters into new syntax                       *
- *                                                                            *
- * Parameters: out       - [OUT] the converted parameter string               *
- *             parameter - [IN] the original parameter string                 *
- *             params    - [IN] the parameter locations in original parameter *
- *                              string                                        *
- *             ...       - list of parameter descriptors with parameter data  *
- *                         (see zbx_dbpatch_arg_t enum for parameter list     *
- *                         description)                                       *
- *                                                                            *
- ******************************************************************************/
-static void	dbpatch_convert_params(char **out, const char *parameter, const zbx_vector_loc_t *params, ...)
-{
-	size_t			out_alloc = 0, out_offset = 0;
-	va_list 		args;
-	int			index, type, param_num = 0;
-	const zbx_strloc_t	*loc;
-	const char		*ptr;
-	char			*arg;
-
-	va_start(args, params);
-
-	while (ZBX_DBPATCH_ARG_NONE != (type = va_arg(args, int)))
-	{
-		if (0 != param_num++)
-			zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ',');
-
-		switch (type)
-		{
-			case ZBX_DBPATCH_ARG_HIST:
-				if (-1 != (index = va_arg(args, int)) && index < params->values_num)
-				{
-					loc = &params->values[index];
-					arg = zbx_substr_unquote(parameter, loc->l, loc->r);
-
-					if ('\0' != *arg)
-					{
-						zbx_strcpy_alloc(out, &out_alloc, &out_offset, arg);
-
-						if ('#' != *arg && 0 != isdigit(arg[strlen(arg) - 1]))
-							zbx_chrcpy_alloc(out, &out_alloc, &out_offset, 's');
-					}
-
-					zbx_free(arg);
-				}
-
-				if (-1 != (index = va_arg(args, int)) && index < params->values_num)
-				{
-					loc = &params->values[index];
-					arg = zbx_substr_unquote(parameter, loc->l, loc->r);
-
-					if ('\0' != *arg)
-					{
-						if (0 == out_offset)
-							zbx_strcpy_alloc(out, &out_alloc, &out_offset, "#1");
-
-						zbx_strcpy_alloc(out, &out_alloc, &out_offset, ":now-");
-						zbx_strcpy_alloc(out, &out_alloc, &out_offset, arg);
-						if (0 != isdigit(arg[strlen(arg) - 1]))
-							zbx_chrcpy_alloc(out, &out_alloc, &out_offset, 's');
-					}
-
-					zbx_free(arg);
-				}
-
-				break;
-			case ZBX_DBPATCH_ARG_TIME:
-				if (params->values_num > (index = va_arg(args, int)))
-				{
-					char	*str;
-
-					loc = &params->values[index];
-					str = zbx_substr_unquote(parameter, loc->l, loc->r);
-					if ('\0' != *str)
-					{
-						if (SUCCEED == dbpatch_is_composite_constant(str))
-							dbpatch_strcpy_alloc_quoted(out, &out_alloc, &out_offset, str);
-						else
-							zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
-
-						if (0 != isdigit((*out)[out_offset - 1]))
-							zbx_chrcpy_alloc(out, &out_alloc, &out_offset, 's');
-					}
-					zbx_free(str);
-				}
-				break;
-			case ZBX_DBPATCH_ARG_NUM:
-				if (params->values_num > (index = va_arg(args, int)))
-				{
-					char	*str;
-
-					loc = &params->values[index];
-					str = zbx_substr_unquote(parameter, loc->l, loc->r);
-
-					if (SUCCEED == dbpatch_is_composite_constant(str))
-						dbpatch_strcpy_alloc_quoted(out, &out_alloc, &out_offset, str);
-					else
-						zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
-
-					zbx_free(str);
-				}
-				break;
-			case ZBX_DBPATCH_ARG_STR:
-				if (params->values_num > (index = va_arg(args, int)))
-				{
-					char	*str;
-
-					loc = &params->values[index];
-					str = zbx_substr_unquote(parameter, loc->l, loc->r);
-					dbpatch_strcpy_alloc_quoted(out, &out_alloc, &out_offset, str);
-
-					zbx_free(str);
-				}
-				break;
-			case ZBX_DBPATCH_ARG_TREND:
-				if (params->values_num > (index = va_arg(args, int)))
-				{
-					char	*str;
-
-					loc = &params->values[index];
-					str = zbx_substr_unquote(parameter, loc->l, loc->r);
-					zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
-					zbx_free(str);
-				}
-				if (params->values_num > (index = va_arg(args, int)))
-				{
-					char	*str;
-
-					loc = &params->values[index];
-					str = zbx_substr_unquote(parameter, loc->l, loc->r);
-					zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ':');
-					zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
-					zbx_free(str);
-				}
-				break;
-			case ZBX_DBPATCH_ARG_CONST_STR:
-				if (NULL != (ptr = va_arg(args, char *)))
-				{
-					char	quoted[MAX_STRING_LEN];
-
-					zbx_escape_string(quoted, sizeof(quoted), ptr, "\"\\");
-					zbx_chrcpy_alloc(out, &out_alloc, &out_offset, '"');
-					zbx_strcpy_alloc(out, &out_alloc, &out_offset, quoted);
-					zbx_chrcpy_alloc(out, &out_alloc, &out_offset, '"');
-				}
-				break;
-		}
-	}
-
-	va_end(args);
-
-	if (0 != out_offset)
-	{
-		/* trim trailing empty parameters */
-		while (0 < out_offset && ',' == (*out)[out_offset - 1])
-			(*out)[--out_offset] = '\0';
-	}
-	else
-		*out = zbx_strdup(*out, "");
-}
-
-static void	dbpatch_update_func_bitand(zbx_dbpatch_function_t *function, const zbx_vector_loc_t *params,
-		char **replace)
-{
-	char	*parameter = NULL, *mask = NULL;
-	int	secnum = 0;
-
-	if (2 <= params->values_num && '\0' != function->parameter[params->values[1].l])
-	{
-		mask = zbx_substr_unquote(function->parameter, params->values[1].l, params->values[1].r);
-		*replace = zbx_dsprintf(NULL, "bitand({" ZBX_FS_UI64 "},%s)", function->functionid, mask);
-		zbx_free(mask);
-	}
-	else
-		*replace = zbx_dsprintf(NULL, "bitand({" ZBX_FS_UI64 "})", function->functionid);
-
-	if (0 < params->values_num)
-	{
-		char	*param;
-
-		param = zbx_substr_unquote(function->parameter, params->values[0].l, params->values[0].r);
-
-		if ('#' != *param && '{' != *param)
-			secnum = -1;
-
-		zbx_free(param);
-	}
-
-	dbpatch_convert_params(&parameter, function->parameter, params,
-			ZBX_DBPATCH_ARG_HIST, secnum, 2,
-			ZBX_DBPATCH_ARG_NONE);
-
-	dbpatch_update_function(function, "last", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
-
-	zbx_free(parameter);
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: dbpatch_convert_function                                         *
- *                                                                            *
- * Purpose: convert function to new parameter syntax/order                    *
- *                                                                            *
- * Parameters: function   - [IN/OUT] the function to convert                  *
- *             replace    - [OUT] the replacement for {functionid} in the     *
- *                          expression                                        *
- *             functions  - [IN/OUT] the functions                            *
- *                                                                            *
- * Comments: The function conversion can result in another function being     *
- *           added.                                                           *
- *                                                                            *
- ******************************************************************************/
-static void	dbpatch_convert_function(zbx_dbpatch_function_t *function, char **replace, zbx_vector_ptr_t *functions)
-{
-	zbx_vector_loc_t	params;
-	char			*parameter = NULL;
-
-	zbx_vector_loc_create(&params);
-
-	dbpatch_parse_function_params(function->parameter, &params);
-
-	if (0 == strcmp(function->name, "abschange"))
-	{
-		dbpatch_update_func_abschange(function, replace);
-	}
-	else if (0 == strcmp(function->name, "change"))
-	{
-		dbpatch_update_function(function, NULL, "", ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "avg") || 0 == strcmp(function->name, "max") ||
-			0 == strcmp(function->name, "min") || 0 == strcmp(function->name, "sum"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 0, 1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "delta"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 0, 1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_func_delta(function, parameter, replace, functions);
-	}
-	else if (0 == strcmp(function->name, "diff"))
-	{
-		dbpatch_update_func_diff(function, replace, functions);
-	}
-	else if (0 == strcmp(function->name, "fuzzytime"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_TIME, 0,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "nodata"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_TIME, 0,
-				ZBX_DBPATCH_ARG_STR, 1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "percentile"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 0, 1,
-				ZBX_DBPATCH_ARG_NUM, 2,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "trendavg") || 0 == strcmp(function->name, "trendmin") ||
-			0 == strcmp(function->name, "trendmax") || 0 == strcmp(function->name, "trendsum") ||
-			0 == strcmp(function->name, "trendcount"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_TREND, 0, 1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "trenddelta"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_TREND, 0, 1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_func_trenddelta(function, parameter, replace, functions);
-	}
-	else if (0 == strcmp(function->name, "band"))
-	{
-		dbpatch_update_func_bitand(function, &params, replace);
-	}
-	else if (0 == strcmp(function->name, "forecast"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 0, 1,
-				ZBX_DBPATCH_ARG_TIME, 2,
-				ZBX_DBPATCH_ARG_STR, 3,
-				ZBX_DBPATCH_ARG_STR, 4,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "timeleft"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 0, 1,
-				ZBX_DBPATCH_ARG_NUM, 2,
-				ZBX_DBPATCH_ARG_STR, 3,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "count"))
-	{
-		char	*op = NULL;
-
-		if (2 <= params.values_num)
-		{
-			if (3 <= params.values_num && '\0' != function->parameter[params.values[2].l])
-			{
-				op = zbx_substr_unquote(function->parameter, params.values[2].l, params.values[2].r);
-
-				if (0 == strcmp(op, "band"))
-					op = zbx_strdup(op, "bitand");
-				else if ('\0' == *op && '"' != function->parameter[params.values[2].l])
-					zbx_free(op);
-			}
-		}
-
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 0, 3,
-				ZBX_DBPATCH_ARG_CONST_STR, op,
-				ZBX_DBPATCH_ARG_STR, 1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-
-		zbx_free(op);
-	}
-	else if (0 == strcmp(function->name, "iregexp") || 0 == strcmp(function->name, "regexp"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 1, -1,
-				ZBX_DBPATCH_ARG_CONST_STR, function->name,
-				ZBX_DBPATCH_ARG_STR, 0,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, "find", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
-	}
-	else if (0 == strcmp(function->name, "str"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, 1, -1,
-				ZBX_DBPATCH_ARG_CONST_STR, "like",
-				ZBX_DBPATCH_ARG_STR, 0,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, "find", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
-	}
-	else if (0 == strcmp(function->name, "last"))
-	{
-		int	secnum = 0;
-
-		if (0 < params.values_num)
-		{
-			char	*param;
-
-			param = zbx_substr_unquote(function->parameter, params.values[0].l, params.values[0].r);
-
-			if ('#' != *param && '{' != *param)
-				secnum = -1;
-
-			zbx_free(param);
-		}
-
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, secnum, 1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "prev"))
-	{
-		dbpatch_update_function(function, "last", "#2", ZBX_DBPATCH_FUNCTION_UPDATE);
-	}
-	else if (0 == strcmp(function->name, "strlen"))
-	{
-		int	secnum = 0;
-
-		if (0 < params.values_num)
-		{
-			char	*param;
-
-			param = zbx_substr_unquote(function->parameter, params.values[0].l, params.values[0].r);
-
-			if ('#' != *param && '{' != *param)
-				secnum = -1;
-
-			zbx_free(param);
-		}
-
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, secnum, 1,
-				ZBX_DBPATCH_ARG_NONE);
-
-		dbpatch_update_func_strlen(function, parameter, replace);
-	}
-	else if (0 == strcmp(function->name, "logeventid") || 0 == strcmp(function->name, "logsource"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, -1, -1,
-				ZBX_DBPATCH_ARG_STR, 0,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-	else if (0 == strcmp(function->name, "logseverity"))
-	{
-		dbpatch_convert_params(&parameter, function->parameter, &params,
-				ZBX_DBPATCH_ARG_HIST, -1, -1,
-				ZBX_DBPATCH_ARG_NONE);
-		dbpatch_update_function(function, NULL, "", ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
-	}
-
-	zbx_free(parameter);
-	zbx_vector_loc_destroy(&params);
-}
-
-static int	dbpatch_is_time_function(const char *name, size_t len)
-{
-	const char	*functions[] = {"date", "dayofmonth", "dayofweek", "now", "time", NULL}, **func;
-	size_t		func_len;
-
-	for (func = functions; NULL != *func; func++)
-	{
-		func_len = strlen(*func);
-		if (func_len == len && 0 == memcmp(*func, name, len))
-			return SUCCEED;
-	}
-
-	return FAIL;
-}
-
 #define ZBX_DBPATCH_EXPRESSION			0x01
 #define ZBX_DBPATCH_RECOVERY_EXPRESSION		0x02
 
@@ -5322,7 +4623,8 @@ static int	dbpatch_find_function(const char *expression, zbx_uint64_t functionid
 	zbx_token_t	token;
 	zbx_uint64_t	id;
 
-	for (; SUCCEED == zbx_token_find(expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID); pos++)
+	for (; SUCCEED == zbx_token_find(expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID |
+			ZBX_TOKEN_SEARCH_SIMPLE_MACRO); pos++)
 	{
 		switch (token.type)
 		{
@@ -5694,129 +4996,6 @@ static int	DBpatch_5030166(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_replace_functionids                                      *
- *                                                                            *
- * Purpose: replace functionids {<index in functions vector>} in expression   *
- *          with their string format                                          *
- *                                                                            *
- * Parameters: expression - [IN/OUT] the expression                           *
- *             functions  - [IN] the functions                                *
- *                                                                            *
- ******************************************************************************/
-static void	dbpatch_replace_functionids(char **expression, const zbx_vector_ptr_t *functions)
-{
-	zbx_uint64_t	index;
-	int		pos = 0, last_pos = 0;
-	zbx_token_t	token;
-	char		*out = NULL;
-	size_t		out_alloc = 0, out_offset = 0;
-
-	for (; SUCCEED == zbx_token_find(*expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID); pos++)
-	{
-		switch (token.type)
-		{
-			case ZBX_TOKEN_OBJECTID:
-				if (SUCCEED == is_uint64_n(*expression + token.loc.l + 1,
-						token.loc.r - token.loc.l - 1, &index) &&
-						(int)index < functions->values_num)
-				{
-					zbx_dbpatch_function_t	*func = functions->values[index];
-
-					zbx_strncpy_alloc(&out, &out_alloc, &out_offset,
-							*expression + last_pos, token.loc.l - last_pos);
-
-					zbx_snprintf_alloc(&out, &out_alloc, &out_offset, "%s(%s",
-							func->name, func->arg0);
-					if ('\0' != *func->parameter)
-					{
-						zbx_chrcpy_alloc(&out, &out_alloc, &out_offset, ',');
-						zbx_strcpy_alloc(&out, &out_alloc, &out_offset, func->parameter);
-					}
-					zbx_chrcpy_alloc(&out, &out_alloc, &out_offset, ')');
-					last_pos = token.loc.r + 1;
-				}
-				pos = token.loc.r;
-				break;
-			case ZBX_TOKEN_MACRO:
-			case ZBX_TOKEN_USER_MACRO:
-			case ZBX_TOKEN_LLD_MACRO:
-				pos = token.loc.r;
-				break;
-		}
-	}
-
-	if (0 != out_alloc)
-	{
-		zbx_strcpy_alloc(&out, &out_alloc, &out_offset, *expression + last_pos);
-		zbx_free(*expression);
-		*expression = out;
-	}
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: dbpatch_convert_simple_macro                                     *
- *                                                                            *
- * Purpose: convert simple macro {host.key:func(params)} to the new syntax    *
- *          func(/host/key,params)                                            *
- *                                                                            *
- * Parameters: expression - [IN] the expression with simple macro             *
- *             data       - [IN] the simple macro token data                  *
- *             function   - [OUT] the simple macro replacement function       *
- *                                                                            *
- ******************************************************************************/
-static void	dbpatch_convert_simple_macro(const char *expression, const zbx_token_simple_macro_t *data,
-		char **function)
-{
-	zbx_dbpatch_function_t	*func;
-	zbx_vector_ptr_t	functions;
-	char			*name, *host, *key;
-
-	name = zbx_substr(expression, data->func.l, data->func_param.l - 1);
-
-	if (SUCCEED == dbpatch_is_time_function(name, strlen(name)))
-	{
-		*function = zbx_dsprintf(NULL, "%s()", name);
-		zbx_free(name);
-		return;
-	}
-
-	zbx_vector_ptr_create(&functions);
-
-	func = (zbx_dbpatch_function_t *)zbx_malloc(NULL, sizeof(zbx_dbpatch_function_t));
-	func->functionid = 0;
-	func->itemid = 0;
-	func->flags = 0;
-	func->name = name;
-
-	if (data->func_param.l + 1 == data->func_param.r)
-		func->parameter = zbx_strdup(NULL, "");
-	else
-		func->parameter = zbx_substr(expression, data->func_param.l + 1, data->func_param.r - 1);
-
-	host = zbx_substr(expression, data->host.l, data->host.r);
-	key = zbx_substr(expression, data->key.l, data->key.r);
-
-	if (0 == strcmp(host, "{HOST.HOST}"))
-		func->arg0 = zbx_dsprintf(NULL, "//%s", key);
-	else
-		func->arg0 = zbx_dsprintf(NULL, "/%s/%s", host, key);
-
-	zbx_vector_ptr_append(&functions, func);
-
-	dbpatch_convert_function(func, function, &functions);
-	if (NULL == *function)
-		*function = zbx_strdup(NULL, "{0}");
-	dbpatch_replace_functionids(function, &functions);
-
-	zbx_free(key);
-	zbx_free(host);
-	zbx_vector_ptr_clear_ext(&functions, (zbx_clean_func_t)dbpatch_function_free);
-	zbx_vector_ptr_destroy(&functions);
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: dbpatch_convert_expression_macro                                 *
  *                                                                            *
  * Purpose: convert simple macros in expression macro {? } to function calls  *
@@ -5836,15 +5015,15 @@ static int	dbpatch_convert_expression_macro(const char *expression, const zbx_st
 	char		*out = NULL;
 	size_t		out_alloc = 0, out_offset = 0, pos = loc->l + 2, last_pos = loc->l;
 
-	for (; SUCCEED == zbx_token_find(expression, (int)pos, &token, ZBX_TOKEN_SEARCH_BASIC) && token.loc.r < loc->r;
-			pos++)
+	for (; SUCCEED == zbx_token_find(expression, (int)pos, &token, ZBX_TOKEN_SEARCH_BASIC |
+			ZBX_TOKEN_SEARCH_SIMPLE_MACRO) && token.loc.r < loc->r; pos++)
 	{
 		char	*macro = NULL;
 
 		switch (token.type)
 		{
 			case ZBX_TOKEN_SIMPLE_MACRO:
-				dbpatch_convert_simple_macro(expression, &token.data.simple_macro, &macro);
+				dbpatch_convert_simple_macro(expression, &token.data.simple_macro, 0, &macro);
 				zbx_strncpy_alloc(&out, &out_alloc, &out_offset, expression + last_pos,
 						token.loc.l - last_pos);
 				zbx_strcpy_alloc(&out, &out_alloc, &out_offset, macro);
@@ -5894,7 +5073,8 @@ static int	DBpatch_5030167(void)
 		char		*out = NULL;
 		size_t		out_alloc = 0, out_offset = 0, pos = 0, last_pos = 0;
 
-		for (; SUCCEED == zbx_token_find(row[1], (int)pos, &token, ZBX_TOKEN_SEARCH_EXPRESSION_MACRO); pos++)
+		for (; SUCCEED == zbx_token_find(row[1], (int)pos, &token, ZBX_TOKEN_SEARCH_EXPRESSION_MACRO |
+				ZBX_TOKEN_SEARCH_SIMPLE_MACRO); pos++)
 		{
 			char		*replace = NULL;
 			zbx_strloc_t	*loc = NULL;
@@ -6113,7 +5293,8 @@ static int	DBpatch_5030168(void)
 			}
 		}
 
-		for (; SUCCEED == zbx_token_find(expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID); pos++)
+		for (; SUCCEED == zbx_token_find(expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID |
+				ZBX_TOKEN_SEARCH_SIMPLE_MACRO); pos++)
 		{
 			switch (token.type)
 			{
diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c
index 3f2e68ba7a7..123e1c89099 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_5050.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c
@@ -20,6 +20,8 @@
 #include "common.h"
 #include "db.h"
 #include "dbupgrade.h"
+#include "dbupgrade_macros.h"
+#include "log.h"
 
 extern unsigned char	program_type;
 
@@ -498,26 +500,196 @@ static int	DBpatch_5050050(void)
 	return SUCCEED;
 }
 
+#define DBPATCH_MESSAGE_SUBJECT_LEN		255
+#define DBPATCH_GRAPH_NAME_LEN			128
+#define DBPATCH_SYSMAPS_LABEL_LEN		255
+#define DBPATCH_SYSMAPS_ELEMENTS_LABEL_LEN	2048
+#define DBPATCH_SYSMAPS_LINKS_LABEL_LEN		2048
+
+#if defined(HAVE_ORACLE)
+#	define DBPATCH_SHORTTEXT_LEN		2048
+#else
+#	define DBPATCH_SHORTTEXT_LEN		65535
+#endif
+
+static int	dbpatch_update_simple_macro(const char *table, const char *field, const char *id, size_t field_len,
+		const char *descr)
+{
+	DB_ROW		row;
+	DB_RESULT	result;
+	char		*sql;
+	size_t		sql_alloc = 4096, sql_offset = 0;
+	int		ret = SUCCEED;
+
+	if (0 == (program_type & ZBX_PROGRAM_TYPE_SERVER))
+		return SUCCEED;
+
+	sql = zbx_malloc(NULL, sql_alloc);
+
+	DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset);
+
+	result = DBselect("select %s,%s from %s", id, field, table);
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		zbx_token_t	token;
+		char		*out = NULL;
+		size_t		out_alloc = 0, out_offset = 0, pos = 0, last_pos = 0;
+
+		for (; SUCCEED == zbx_token_find(row[1], (int)pos, &token, ZBX_TOKEN_SEARCH_BASIC |
+				ZBX_TOKEN_SEARCH_SIMPLE_MACRO); pos++)
+		{
+			char	*replace;
+
+			pos = token.loc.r;
+
+			if (ZBX_TOKEN_SIMPLE_MACRO != token.type)
+				continue;
+
+			replace = NULL;
+			dbpatch_convert_simple_macro(row[1], &token.data.simple_macro, 1, &replace);
+			zbx_strncpy_alloc(&out, &out_alloc, &out_offset, row[1] + last_pos, token.loc.l - last_pos);
+			replace = zbx_dsprintf(replace, "{?%s}", replace);
+			zbx_strcpy_alloc(&out, &out_alloc, &out_offset, replace);
+			zbx_free(replace);
+			last_pos = token.loc.r + 1;
+
+			pos = token.loc.r;
+		}
+
+		if (0 == out_alloc)
+			continue;
+
+		zbx_strcpy_alloc(&out, &out_alloc, &out_offset, row[1] + last_pos);
+
+		if (field_len >= zbx_strlen_utf8(out))
+		{
+			char	*esc;
+
+			esc = DBdyn_escape_field(table, field, out);
+			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "update %s set %s='%s'"
+					" where %s=%s;\n", table, field, esc, id, row[0]);
+			zbx_free(esc);
+
+			ret = DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset);
+		}
+		else
+			zabbix_log(LOG_LEVEL_WARNING, "cannot convert %s, too long expression: \"%s\"", descr, row[0]);
+
+		zbx_free(out);
+	}
+	DBfree_result(result);
+
+	DBend_multiple_update(&sql, &sql_alloc, &sql_offset);
+
+	if (SUCCEED == ret && 16 < sql_offset)
+	{
+		if (ZBX_DB_OK > DBexecute("%s", sql))
+			ret = FAIL;
+	}
+
+	zbx_free(sql);
+
+	return ret;
+}
+
 static int	DBpatch_5050051(void)
 {
+	return dbpatch_update_simple_macro("opmessage", "subject", "operationid", DBPATCH_MESSAGE_SUBJECT_LEN,
+			"operation message subject");
+}
+
+static int	DBpatch_5050052(void)
+{
+	return dbpatch_update_simple_macro("opmessage", "message", "operationid", DBPATCH_SHORTTEXT_LEN,
+			"operation message body");
+}
+
+static int	DBpatch_5050053(void)
+{
+	return dbpatch_update_simple_macro("media_type_message", "subject", "mediatype_messageid",
+			DBPATCH_MESSAGE_SUBJECT_LEN, "media message subject");
+}
+
+static int	DBpatch_5050054(void)
+{
+	return dbpatch_update_simple_macro("media_type_message", "message", "mediatype_messageid",
+			DBPATCH_SHORTTEXT_LEN, "media message body");
+}
+
+static int	DBpatch_5050055(void)
+{
+	return dbpatch_update_simple_macro("graphs", "name", "graphid", DBPATCH_GRAPH_NAME_LEN, "graph name");
+}
+
+static int	DBpatch_5050056(void)
+{
+	return dbpatch_update_simple_macro("sysmaps", "label_string_host", "sysmapid", DBPATCH_SYSMAPS_LABEL_LEN,
+			"maps label host");
+}
+
+static int	DBpatch_5050057(void)
+{
+	return dbpatch_update_simple_macro("sysmaps", "label_string_hostgroup", "sysmapid", DBPATCH_SYSMAPS_LABEL_LEN,
+			"maps label hostgroup");
+}
+
+static int	DBpatch_5050058(void)
+{
+	return dbpatch_update_simple_macro("sysmaps", "label_string_trigger", "sysmapid", DBPATCH_SYSMAPS_LABEL_LEN,
+			"maps label trigger");
+}
+
+static int	DBpatch_5050059(void)
+{
+	return dbpatch_update_simple_macro("sysmaps", "label_string_map", "sysmapid", DBPATCH_SYSMAPS_LABEL_LEN,
+			"maps label map");
+}
+
+static int	DBpatch_5050060(void)
+{
+	return dbpatch_update_simple_macro("sysmaps", "label_string_image", "sysmapid", DBPATCH_SYSMAPS_LABEL_LEN,
+			"maps label image");
+}
+
+static int	DBpatch_5050061(void)
+{
+	return dbpatch_update_simple_macro("sysmaps_elements", "label", "selementid",
+			DBPATCH_SYSMAPS_ELEMENTS_LABEL_LEN, "maps element label");
+}
+
+static int	DBpatch_5050062(void)
+{
+	return dbpatch_update_simple_macro("sysmaps_links", "label", "linkid", DBPATCH_SYSMAPS_LINKS_LABEL_LEN,
+			"maps link label");
+}
+
+static int	DBpatch_5050063(void)
+{
+	return dbpatch_update_simple_macro("sysmap_shape", "text", "sysmap_shapeid", DBPATCH_SHORTTEXT_LEN,
+			"maps shape text");
+}
+
+static int	DBpatch_5050064(void)
+{
 	const ZBX_FIELD	field = {"value_serviceid", NULL, "services", "serviceid", 0, ZBX_TYPE_ID, 0, ZBX_FK_CASCADE_DELETE};
 
 	return DBadd_field("role_rule", &field);
 }
 
-static int	DBpatch_5050052(void)
+static int	DBpatch_5050065(void)
 {
 	const ZBX_FIELD	field = {"value_serviceid", NULL, "services", "serviceid", 0, ZBX_TYPE_ID, 0, ZBX_FK_CASCADE_DELETE};
 
 	return DBadd_foreign_key("role_rule", 3, &field);
 }
 
-static int	DBpatch_5050053(void)
+static int	DBpatch_5050066(void)
 {
 	return DBcreate_index("role_rule", "role_rule_3", "value_serviceid", 0);
 }
 
-static int	DBpatch_5050054(void)
+static int	DBpatch_5050067(void)
 {
 	if (ZBX_DB_OK > DBexecute("update role_rule set name='services.write'"
 			" where name='actions.manage_services'"))
@@ -530,7 +702,7 @@ static int	DBpatch_5050054(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_5050055_calc_services_write_value                        *
+ * Function: DBpatch_5050068_calc_services_write_value                        *
  *                                                                            *
  * Purpose: calculate services.write value for the specified role             *
  *                                                                            *
@@ -541,7 +713,7 @@ static int	DBpatch_5050054(void)
  *               FAIL    - the services.write rule already exists             *
  *                                                                            *
  ******************************************************************************/
-static int	DBpatch_5050055_calc_services_write_value(zbx_uint64_t roleid, int *value)
+static int	DBpatch_5050068_calc_services_write_value(zbx_uint64_t roleid, int *value)
 {
 	DB_RESULT	result;
 	DB_ROW		row;
@@ -565,7 +737,7 @@ static int	DBpatch_5050055_calc_services_write_value(zbx_uint64_t roleid, int *v
 	return SUCCEED;
 }
 
-static int	DBpatch_5050055(void)
+static int	DBpatch_5050068(void)
 {
 	DB_RESULT	result;
 	DB_ROW		row;
@@ -588,7 +760,7 @@ static int	DBpatch_5050055(void)
 
 		zbx_db_insert_add_values(&db_insert, __UINT64_C(0), roleid, 0, "service.read", 1);
 
-		if (SUCCEED == DBpatch_5050055_calc_services_write_value(roleid, &services_write))
+		if (SUCCEED == DBpatch_5050068_calc_services_write_value(roleid, &services_write))
 		{
 			int	role_type;
 
@@ -666,5 +838,18 @@ DBPATCH_ADD(5050052, 0, 1)
 DBPATCH_ADD(5050053, 0, 1)
 DBPATCH_ADD(5050054, 0, 1)
 DBPATCH_ADD(5050055, 0, 1)
+DBPATCH_ADD(5050056, 0, 1)
+DBPATCH_ADD(5050057, 0, 1)
+DBPATCH_ADD(5050058, 0, 1)
+DBPATCH_ADD(5050059, 0, 1)
+DBPATCH_ADD(5050060, 0, 1)
+DBPATCH_ADD(5050061, 0, 1)
+DBPATCH_ADD(5050062, 0, 1)
+DBPATCH_ADD(5050063, 0, 1)
+DBPATCH_ADD(5050064, 0, 1)
+DBPATCH_ADD(5050065, 0, 1)
+DBPATCH_ADD(5050066, 0, 1)
+DBPATCH_ADD(5050067, 0, 1)
+DBPATCH_ADD(5050068, 0, 1)
 
 DBPATCH_END()
diff --git a/src/libs/zbxdbupgrade/dbupgrade_macros.c b/src/libs/zbxdbupgrade/dbupgrade_macros.c
index ea60c263ae1..ce9b16c7f3b 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_macros.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_macros.c
@@ -22,6 +22,29 @@
 #include "dbupgrade.h"
 #include "dbupgrade_macros.h"
 #include "log.h"
+#include "zbxalgo.h"
+#include "../zbxalgo/vectorimpl.h"
+
+/* Function argument descriptors.                                                */
+/* Used in varargs list to describe following parameter mapping to old position. */
+/* Terminated with ZBX_DBPATCH_ARG_NONE.                                         */
+/* For example:                                                                  */
+/* ..., ZBX_DBPATCH_ARG_NUM, 1, ZBX_DBPATCH_ARG_STR, 0, ZBX_DBPATCH_ARG_NONE)    */
+/*  meaning first numeric parameter copied from second parameter                 */
+/*          second string parameter copied from first parameter                  */
+typedef enum
+{
+	ZBX_DBPATCH_ARG_NONE,		/* terminating descriptor, must be put at the end of the list */
+	ZBX_DBPATCH_ARG_HIST,		/* history period followed by sec/num (int) and timeshift (int) indexes */
+	ZBX_DBPATCH_ARG_TIME,		/* time value followed by argument index (int)  */
+	ZBX_DBPATCH_ARG_NUM,		/* number value followed by argument index (int)  */
+	ZBX_DBPATCH_ARG_STR,		/* string value  followed by argument index (int)  */
+	ZBX_DBPATCH_ARG_TREND,		/* trend period, followed by period (int) and timeshift (int) indexes */
+	ZBX_DBPATCH_ARG_CONST_STR,	/* constant,fffffff followed by string (char *) value */
+}
+zbx_dbpatch_arg_t;
+
+ZBX_VECTOR_IMPL(strloc, zbx_strloc_t)
 
 /******************************************************************************
  *                                                                            *
@@ -162,3 +185,803 @@ out:
 
 	return ret;
 }
+
+void	dbpatch_function_free(zbx_dbpatch_function_t *func)
+{
+	zbx_free(func->name);
+	zbx_free(func->parameter);
+	zbx_free(func->arg0);
+	zbx_free(func);
+}
+
+zbx_dbpatch_function_t	*dbpatch_new_function(zbx_uint64_t functionid, zbx_uint64_t itemid, const char *name,
+		const char *parameter, unsigned char flags)
+{
+	zbx_dbpatch_function_t	*func;
+
+	func = (zbx_dbpatch_function_t *)zbx_malloc(NULL, sizeof(zbx_dbpatch_function_t));
+	func->functionid = functionid;
+	func->itemid = itemid;
+	func->name = (NULL != name ? zbx_strdup(NULL, name) : NULL);
+	func->parameter = (NULL != parameter ? zbx_strdup(NULL, parameter) : NULL);
+	func->flags = flags;
+	func->arg0 = NULL;
+
+	return func;
+}
+
+static void	dbpatch_add_function(const zbx_dbpatch_function_t *template, zbx_uint64_t functionid, const char *name,
+		const char *parameter, unsigned char flags, zbx_vector_ptr_t *functions)
+{
+	zbx_dbpatch_function_t	*func;
+
+	func = dbpatch_new_function(functionid, template->itemid, name, parameter, flags);
+	func->arg0 = (NULL != template->arg0 ? zbx_strdup(NULL, template->arg0) : NULL);
+
+	zbx_vector_ptr_append(functions, func);
+}
+
+static void	dbpatch_update_function(zbx_dbpatch_function_t *func, const char *name,
+		const char *parameter, unsigned char flags)
+{
+	if (0 != (flags & ZBX_DBPATCH_FUNCTION_UPDATE_NAME))
+		func->name = zbx_strdup(func->name, name);
+
+	if (0 != (flags & ZBX_DBPATCH_FUNCTION_UPDATE_PARAM))
+		func->parameter = zbx_strdup(func->parameter, parameter);
+
+	func->flags = flags;
+}
+
+int	dbpatch_is_time_function(const char *name, size_t len)
+{
+	const char	*functions[] = {"date", "dayofmonth", "dayofweek", "now", "time", NULL}, **func;
+	size_t		func_len;
+
+	for (func = functions; NULL != *func; func++)
+	{
+		func_len = strlen(*func);
+		if (func_len == len && 0 == memcmp(*func, name, len))
+			return SUCCEED;
+	}
+
+	return FAIL;
+}
+
+static void	dbpatch_update_func_abschange(zbx_dbpatch_function_t *function, char **replace)
+{
+	dbpatch_update_function(function, "change", "", ZBX_DBPATCH_FUNCTION_UPDATE);
+	*replace = zbx_dsprintf(NULL, "abs({" ZBX_FS_UI64 "})", function->functionid);
+}
+
+static void	dbpatch_update_func_delta(zbx_dbpatch_function_t *function, const char *parameter, char **replace,
+		zbx_vector_ptr_t *functions)
+{
+	zbx_uint64_t	functionid2;
+
+	dbpatch_update_function(function, "max", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
+
+	functionid2 = (NULL == function->arg0 ? DBget_maxid("functions") : (zbx_uint64_t)functions->values_num);
+	dbpatch_add_function(function, functionid2, "min", parameter, ZBX_DBPATCH_FUNCTION_CREATE, functions);
+
+	*replace = zbx_dsprintf(NULL, "({" ZBX_FS_UI64 "}-{" ZBX_FS_UI64 "})", function->functionid, functionid2);
+}
+
+static void	dbpatch_update_func_diff(zbx_dbpatch_function_t *function, char **replace, zbx_vector_ptr_t *functions)
+{
+	zbx_uint64_t	functionid2;
+
+	dbpatch_update_function(function, "last", "#1", ZBX_DBPATCH_FUNCTION_UPDATE);
+
+	functionid2 = (NULL == function->arg0 ? DBget_maxid("functions") : (zbx_uint64_t)functions->values_num);
+	dbpatch_add_function(function, functionid2, "last", "#2", ZBX_DBPATCH_FUNCTION_CREATE, functions);
+
+	*replace = zbx_dsprintf(NULL, "({" ZBX_FS_UI64 "}<>{" ZBX_FS_UI64 "})", function->functionid, functionid2);
+}
+
+static void	dbpatch_update_func_trenddelta(zbx_dbpatch_function_t *function, const char *parameter, char **replace,
+		zbx_vector_ptr_t *functions)
+{
+	zbx_uint64_t	functionid2;
+
+	dbpatch_update_function(function, "trendmax", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
+
+	functionid2 = (NULL == function->arg0 ? DBget_maxid("functions") : (zbx_uint64_t)functions->values_num);
+	dbpatch_add_function(function, functionid2, "trendmin", parameter, ZBX_DBPATCH_FUNCTION_CREATE, functions);
+
+	*replace = zbx_dsprintf(NULL, "({" ZBX_FS_UI64 "}-{" ZBX_FS_UI64 "})", function->functionid, functionid2);
+}
+
+static void	dbpatch_update_func_strlen(zbx_dbpatch_function_t *function, const char *parameter, char **replace)
+{
+	dbpatch_update_function(function, "last", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
+
+	*replace = zbx_dsprintf(NULL, "length({" ZBX_FS_UI64 "})", function->functionid);
+}
+
+void	dbpatch_update_hist2common(zbx_dbpatch_function_t *function, int extended, char **expression)
+{
+	char	*str  = NULL;
+	size_t	str_alloc = 0, str_offset = 0;
+
+	if (ZBX_DBPATCH_FUNCTION_DELETE == function->flags)
+		dbpatch_update_function(function, "last", "$", ZBX_DBPATCH_FUNCTION_UPDATE);
+
+	if (0 == extended)
+		zbx_chrcpy_alloc(&str, &str_alloc, &str_offset, '(');
+	zbx_strcpy_alloc(&str, &str_alloc, &str_offset, *expression);
+	if (0 == extended)
+		zbx_chrcpy_alloc(&str, &str_alloc, &str_offset, ')');
+
+	zbx_snprintf_alloc(&str, &str_alloc, &str_offset, " or ({" ZBX_FS_UI64 "}<>{" ZBX_FS_UI64 "})",
+			function->functionid, function->functionid);
+
+	zbx_free(*expression);
+	*expression = str;
+}
+
+static void	dbpatch_update_func_bitand(zbx_dbpatch_function_t *function, const zbx_vector_strloc_t *params,
+		char **replace)
+{
+	char	*parameter = NULL, *mask = NULL;
+	int	secnum = 0;
+
+	if (2 <= params->values_num && '\0' != function->parameter[params->values[1].l])
+	{
+		mask = zbx_substr_unquote(function->parameter, params->values[1].l, params->values[1].r);
+		*replace = zbx_dsprintf(NULL, "bitand({" ZBX_FS_UI64 "},%s)", function->functionid, mask);
+		zbx_free(mask);
+	}
+	else
+		*replace = zbx_dsprintf(NULL, "bitand({" ZBX_FS_UI64 "})", function->functionid);
+
+	if (0 < params->values_num)
+	{
+		char	*param;
+
+		param = zbx_substr_unquote(function->parameter, params->values[0].l, params->values[0].r);
+
+		if ('#' != *param && '{' != *param)
+			secnum = -1;
+
+		zbx_free(param);
+	}
+
+	dbpatch_convert_params(&parameter, function->parameter, params,
+			ZBX_DBPATCH_ARG_HIST, secnum, 2,
+			ZBX_DBPATCH_ARG_NONE);
+
+	dbpatch_update_function(function, "last", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
+
+	zbx_free(parameter);
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: dbpatch_strcpy_alloc_quoted                                      *
+ *                                                                            *
+ * Purpose: quote and text to a buffer                                        *
+ *                                                                            *
+ * Parameters: str        - [OUT] the output buffer                           *
+ *             str_alloc  - [IN/OUT] an offset in the output buffer           *
+ *             str_offset - [IN/OUT] the size of the output buffer            *
+ *             source     - [IN] the source text                              *
+ *                                                                            *
+ * Return value: SUCCEED - the text is a composite constant                   *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+void	dbpatch_strcpy_alloc_quoted(char **str, size_t *str_alloc, size_t *str_offset, const char *source)
+{
+	char	raw[FUNCTION_PARAM_LEN * 5 + 1], quoted[sizeof(raw)];
+
+	zbx_strlcpy(raw, source, sizeof(raw));
+	zbx_escape_string(quoted, sizeof(quoted), raw, "\"\\");
+	zbx_chrcpy_alloc(str, str_alloc, str_offset, '"');
+	zbx_strcpy_alloc(str, str_alloc, str_offset, quoted);
+	zbx_chrcpy_alloc(str, str_alloc, str_offset, '"');
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: dbpatch_is_composite_constant                                    *
+ *                                                                            *
+ * Purpose: check for composite (consisting of macro(s) + text) constant      *
+ *                                                                            *
+ * Parameters: str - [IN] the text to check                                   *
+ *                                                                            *
+ * Return value: SUCCEED - the text is a composite constant                   *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+int	dbpatch_is_composite_constant(const char *str)
+{
+	zbx_token_t	token;
+
+	if (SUCCEED == zbx_token_find(str, 0, &token, ZBX_TOKEN_SEARCH_BASIC | ZBX_TOKEN_SEARCH_SIMPLE_MACRO))
+	{
+		if (ZBX_TOKEN_USER_MACRO != token.type && ZBX_TOKEN_LLD_MACRO != token.type)
+			return SUCCEED;
+
+		if (0 != token.loc.l || strlen(str) - 1 != token.loc.r)
+			return SUCCEED;
+	}
+
+	return FAIL;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: dbpatch_convert_params                                           *
+ *                                                                            *
+ * Purpose: convert function parameters into new syntax                       *
+ *                                                                            *
+ * Parameters: out       - [OUT] the converted parameter string               *
+ *             parameter - [IN] the original parameter string                 *
+ *             params    - [IN] the parameter locations in original parameter *
+ *                              string                                        *
+ *             ...       - list of parameter descriptors with parameter data  *
+ *                         (see zbx_dbpatch_arg_t enum for parameter list     *
+ *                         description)                                       *
+ *                                                                            *
+ ******************************************************************************/
+void	dbpatch_convert_params(char **out, const char *parameter, const zbx_vector_strloc_t *params, ...)
+{
+	size_t			out_alloc = 0, out_offset = 0;
+	va_list 		args;
+	int			index, type, param_num = 0;
+	const zbx_strloc_t	*loc;
+	const char		*ptr;
+	char			*arg;
+
+	va_start(args, params);
+
+	while (ZBX_DBPATCH_ARG_NONE != (type = va_arg(args, int)))
+	{
+		if (0 != param_num++)
+			zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ',');
+
+		switch (type)
+		{
+			case ZBX_DBPATCH_ARG_HIST:
+				if (-1 != (index = va_arg(args, int)) && index < params->values_num)
+				{
+					loc = &params->values[index];
+					arg = zbx_substr_unquote(parameter, loc->l, loc->r);
+
+					if ('\0' != *arg)
+					{
+						zbx_strcpy_alloc(out, &out_alloc, &out_offset, arg);
+
+						if ('#' != *arg && 0 != isdigit(arg[strlen(arg) - 1]))
+							zbx_chrcpy_alloc(out, &out_alloc, &out_offset, 's');
+					}
+
+					zbx_free(arg);
+				}
+
+				if (-1 != (index = va_arg(args, int)) && index < params->values_num)
+				{
+					loc = &params->values[index];
+					arg = zbx_substr_unquote(parameter, loc->l, loc->r);
+
+					if ('\0' != *arg)
+					{
+						if (0 == out_offset)
+							zbx_strcpy_alloc(out, &out_alloc, &out_offset, "#1");
+
+						zbx_strcpy_alloc(out, &out_alloc, &out_offset, ":now-");
+						zbx_strcpy_alloc(out, &out_alloc, &out_offset, arg);
+						if (0 != isdigit(arg[strlen(arg) - 1]))
+							zbx_chrcpy_alloc(out, &out_alloc, &out_offset, 's');
+					}
+
+					zbx_free(arg);
+				}
+
+				break;
+			case ZBX_DBPATCH_ARG_TIME:
+				if (params->values_num > (index = va_arg(args, int)))
+				{
+					char	*str;
+
+					loc = &params->values[index];
+					str = zbx_substr_unquote(parameter, loc->l, loc->r);
+					if ('\0' != *str)
+					{
+						if (SUCCEED == dbpatch_is_composite_constant(str))
+							dbpatch_strcpy_alloc_quoted(out, &out_alloc, &out_offset, str);
+						else
+							zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
+
+						if (0 != isdigit((*out)[out_offset - 1]))
+							zbx_chrcpy_alloc(out, &out_alloc, &out_offset, 's');
+					}
+					zbx_free(str);
+				}
+				break;
+			case ZBX_DBPATCH_ARG_NUM:
+				if (params->values_num > (index = va_arg(args, int)))
+				{
+					char	*str;
+
+					loc = &params->values[index];
+					str = zbx_substr_unquote(parameter, loc->l, loc->r);
+
+					if (SUCCEED == dbpatch_is_composite_constant(str))
+						dbpatch_strcpy_alloc_quoted(out, &out_alloc, &out_offset, str);
+					else
+						zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
+
+					zbx_free(str);
+				}
+				break;
+			case ZBX_DBPATCH_ARG_STR:
+				if (params->values_num > (index = va_arg(args, int)))
+				{
+					char	*str;
+
+					loc = &params->values[index];
+					str = zbx_substr_unquote(parameter, loc->l, loc->r);
+					dbpatch_strcpy_alloc_quoted(out, &out_alloc, &out_offset, str);
+
+					zbx_free(str);
+				}
+				break;
+			case ZBX_DBPATCH_ARG_TREND:
+				if (params->values_num > (index = va_arg(args, int)))
+				{
+					char	*str;
+
+					loc = &params->values[index];
+					str = zbx_substr_unquote(parameter, loc->l, loc->r);
+					zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
+					zbx_free(str);
+				}
+				if (params->values_num > (index = va_arg(args, int)))
+				{
+					char	*str;
+
+					loc = &params->values[index];
+					str = zbx_substr_unquote(parameter, loc->l, loc->r);
+					zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ':');
+					zbx_strcpy_alloc(out, &out_alloc, &out_offset, str);
+					zbx_free(str);
+				}
+				break;
+			case ZBX_DBPATCH_ARG_CONST_STR:
+				if (NULL != (ptr = va_arg(args, char *)))
+				{
+					char	quoted[MAX_STRING_LEN];
+
+					zbx_escape_string(quoted, sizeof(quoted), ptr, "\"\\");
+					zbx_chrcpy_alloc(out, &out_alloc, &out_offset, '"');
+					zbx_strcpy_alloc(out, &out_alloc, &out_offset, quoted);
+					zbx_chrcpy_alloc(out, &out_alloc, &out_offset, '"');
+				}
+				break;
+		}
+	}
+
+	va_end(args);
+
+	if (0 != out_offset)
+	{
+		/* trim trailing empty parameters */
+		while (0 < out_offset && ',' == (*out)[out_offset - 1])
+			(*out)[--out_offset] = '\0';
+	}
+	else
+		*out = zbx_strdup(*out, "");
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: dbpatch_parse_function_params                                    *
+ *                                                                            *
+ * Purpose: parse function parameter string into parameter location vector    *
+ *                                                                            *
+ ******************************************************************************/
+static void	dbpatch_parse_function_params(const char *parameter, zbx_vector_strloc_t *params)
+{
+	const char	*ptr;
+	size_t		len, pos, sep = 0, eol;
+	zbx_strloc_t	loc;
+
+	eol = strlen(parameter);
+
+	for (ptr = parameter; ptr < parameter + eol; ptr += sep + 1)
+	{
+		zbx_function_param_parse(ptr, &pos, &len, &sep);
+
+		if (0 < len)
+		{
+			loc.l = ptr - parameter + pos;
+			loc.r = loc.l + len - 1;
+		}
+		else
+		{
+			loc.l = ptr - parameter + eol - (ptr - parameter);
+			loc.r = loc.l;
+		}
+
+		zbx_vector_strloc_append_ptr(params, &loc);
+	}
+
+	while (0 < params->values_num && '\0' == parameter[params->values[params->values_num - 1].l])
+		--params->values_num;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: dbpatch_convert_function                                         *
+ *                                                                            *
+ * Purpose: convert function to new parameter syntax/order                    *
+ *                                                                            *
+ * Parameters: function   - [IN/OUT] the function to convert                  *
+ *             replace    - [OUT] the replacement for {functionid} in the     *
+ *                          expression                                        *
+ *             functions  - [IN/OUT] the functions                            *
+ *                                                                            *
+ * Comments: The function conversion can result in another function being     *
+ *           added.                                                           *
+ *                                                                            *
+ ******************************************************************************/
+void	dbpatch_convert_function(zbx_dbpatch_function_t *function, char **replace, zbx_vector_ptr_t *functions)
+{
+	zbx_vector_strloc_t	params;
+	char			*parameter = NULL;
+
+	zbx_vector_strloc_create(&params);
+
+	dbpatch_parse_function_params(function->parameter, &params);
+
+	if (0 == strcmp(function->name, "abschange"))
+	{
+		dbpatch_update_func_abschange(function, replace);
+	}
+	else if (0 == strcmp(function->name, "change"))
+	{
+		dbpatch_update_function(function, NULL, "", ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "avg") || 0 == strcmp(function->name, "max") ||
+			0 == strcmp(function->name, "min") || 0 == strcmp(function->name, "sum"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 0, 1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "delta"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 0, 1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_func_delta(function, parameter, replace, functions);
+	}
+	else if (0 == strcmp(function->name, "diff"))
+	{
+		dbpatch_update_func_diff(function, replace, functions);
+	}
+	else if (0 == strcmp(function->name, "fuzzytime"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_TIME, 0,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "nodata"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_TIME, 0,
+				ZBX_DBPATCH_ARG_STR, 1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "percentile"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 0, 1,
+				ZBX_DBPATCH_ARG_NUM, 2,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "trendavg") || 0 == strcmp(function->name, "trendmin") ||
+			0 == strcmp(function->name, "trendmax") || 0 == strcmp(function->name, "trendsum") ||
+			0 == strcmp(function->name, "trendcount"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_TREND, 0, 1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "trenddelta"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_TREND, 0, 1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_func_trenddelta(function, parameter, replace, functions);
+	}
+	else if (0 == strcmp(function->name, "band"))
+	{
+		dbpatch_update_func_bitand(function, &params, replace);
+	}
+	else if (0 == strcmp(function->name, "forecast"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 0, 1,
+				ZBX_DBPATCH_ARG_TIME, 2,
+				ZBX_DBPATCH_ARG_STR, 3,
+				ZBX_DBPATCH_ARG_STR, 4,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "timeleft"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 0, 1,
+				ZBX_DBPATCH_ARG_NUM, 2,
+				ZBX_DBPATCH_ARG_STR, 3,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "count"))
+	{
+		char	*op = NULL;
+
+		if (2 <= params.values_num)
+		{
+			if (3 <= params.values_num && '\0' != function->parameter[params.values[2].l])
+			{
+				op = zbx_substr_unquote(function->parameter, params.values[2].l, params.values[2].r);
+
+				if (0 == strcmp(op, "band"))
+					op = zbx_strdup(op, "bitand");
+				else if ('\0' == *op && '"' != function->parameter[params.values[2].l])
+					zbx_free(op);
+			}
+		}
+
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 0, 3,
+				ZBX_DBPATCH_ARG_CONST_STR, op,
+				ZBX_DBPATCH_ARG_STR, 1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+
+		zbx_free(op);
+	}
+	else if (0 == strcmp(function->name, "iregexp") || 0 == strcmp(function->name, "regexp"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 1, -1,
+				ZBX_DBPATCH_ARG_CONST_STR, function->name,
+				ZBX_DBPATCH_ARG_STR, 0,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, "find", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
+	}
+	else if (0 == strcmp(function->name, "str"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, 1, -1,
+				ZBX_DBPATCH_ARG_CONST_STR, "like",
+				ZBX_DBPATCH_ARG_STR, 0,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, "find", parameter, ZBX_DBPATCH_FUNCTION_UPDATE);
+	}
+	else if (0 == strcmp(function->name, "last"))
+	{
+		int	secnum = 0;
+
+		if (0 < params.values_num)
+		{
+			char	*param;
+
+			param = zbx_substr_unquote(function->parameter, params.values[0].l, params.values[0].r);
+
+			if ('#' != *param && '{' != *param)
+				secnum = -1;
+
+			zbx_free(param);
+		}
+
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, secnum, 1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "prev"))
+	{
+		dbpatch_update_function(function, "last", "#2", ZBX_DBPATCH_FUNCTION_UPDATE);
+	}
+	else if (0 == strcmp(function->name, "strlen"))
+	{
+		int	secnum = 0;
+
+		if (0 < params.values_num)
+		{
+			char	*param;
+
+			param = zbx_substr_unquote(function->parameter, params.values[0].l, params.values[0].r);
+
+			if ('#' != *param && '{' != *param)
+				secnum = -1;
+
+			zbx_free(param);
+		}
+
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, secnum, 1,
+				ZBX_DBPATCH_ARG_NONE);
+
+		dbpatch_update_func_strlen(function, parameter, replace);
+	}
+	else if (0 == strcmp(function->name, "logeventid") || 0 == strcmp(function->name, "logsource"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, -1, -1,
+				ZBX_DBPATCH_ARG_STR, 0,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, parameter, ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+	else if (0 == strcmp(function->name, "logseverity"))
+	{
+		dbpatch_convert_params(&parameter, function->parameter, &params,
+				ZBX_DBPATCH_ARG_HIST, -1, -1,
+				ZBX_DBPATCH_ARG_NONE);
+		dbpatch_update_function(function, NULL, "", ZBX_DBPATCH_FUNCTION_UPDATE_PARAM);
+	}
+
+	zbx_free(parameter);
+	zbx_vector_strloc_destroy(&params);
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: dbpatch_replace_functionids                                      *
+ *                                                                            *
+ * Purpose: replace functionids {<index in functions vector>} in expression   *
+ *          with their string format                                          *
+ *                                                                            *
+ * Parameters: expression - [IN/OUT] the expression                           *
+ *             functions  - [IN] the functions                                *
+ *                                                                            *
+ ******************************************************************************/
+static void	dbpatch_replace_functionids(char **expression, const zbx_vector_ptr_t *functions)
+{
+	zbx_uint64_t	index;
+	int		pos = 0, last_pos = 0;
+	zbx_token_t	token;
+	char		*out = NULL;
+	size_t		out_alloc = 0, out_offset = 0;
+
+	for (; SUCCEED == zbx_token_find(*expression, pos, &token, ZBX_TOKEN_SEARCH_FUNCTIONID |
+			ZBX_TOKEN_SEARCH_SIMPLE_MACRO); pos++)
+	{
+		switch (token.type)
+		{
+			case ZBX_TOKEN_OBJECTID:
+				if (SUCCEED == is_uint64_n(*expression + token.loc.l + 1,
+						token.loc.r - token.loc.l - 1, &index) &&
+						(int)index < functions->values_num)
+				{
+					zbx_dbpatch_function_t	*func = functions->values[index];
+
+					zbx_strncpy_alloc(&out, &out_alloc, &out_offset,
+							*expression + last_pos, token.loc.l - last_pos);
+
+					zbx_snprintf_alloc(&out, &out_alloc, &out_offset, "%s(%s",
+							func->name, func->arg0);
+					if ('\0' != *func->parameter)
+					{
+						zbx_chrcpy_alloc(&out, &out_alloc, &out_offset, ',');
+						zbx_strcpy_alloc(&out, &out_alloc, &out_offset, func->parameter);
+					}
+					zbx_chrcpy_alloc(&out, &out_alloc, &out_offset, ')');
+					last_pos = token.loc.r + 1;
+				}
+				pos = token.loc.r;
+				break;
+			case ZBX_TOKEN_MACRO:
+			case ZBX_TOKEN_USER_MACRO:
+			case ZBX_TOKEN_LLD_MACRO:
+				pos = token.loc.r;
+				break;
+		}
+	}
+
+	if (0 != out_alloc)
+	{
+		zbx_strcpy_alloc(&out, &out_alloc, &out_offset, *expression + last_pos);
+		zbx_free(*expression);
+		*expression = out;
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: dbpatch_convert_simple_macro                                     *
+ *                                                                            *
+ * Purpose: convert simple macro {host.key:func(params)} to the new syntax    *
+ *          func(/host/key,params)                                            *
+ *                                                                            *
+ * Parameters: expression - [IN] the expression with simple macro             *
+ *             data       - [IN] the simple macro token data                  *
+ *             more       - [IN] also replace {HOSTNAME*} and {HOST.HOST1}    *
+ *             function   - [OUT] the simple macro replacement function       *
+ *                                                                            *
+ ******************************************************************************/
+void	dbpatch_convert_simple_macro(const char *expression, const zbx_token_simple_macro_t *data, int more,
+		char **function)
+{
+#define HOSTHOST_STR		"{HOST.HOST"
+#define HOSTNAME_STR		"{HOSTNAME"
+#define HOSTHOST_IDX_POS	ZBX_CONST_STRLEN(HOSTHOST_STR)
+#define HOSTNAME_IDX_POS	ZBX_CONST_STRLEN(HOSTNAME_STR)
+
+	zbx_dbpatch_function_t	*func;
+	zbx_vector_ptr_t	functions;
+	char			*name, *host, *key;
+	int			pos;
+
+	name = zbx_substr(expression, data->func.l, data->func_param.l - 1);
+
+	if (SUCCEED == dbpatch_is_time_function(name, strlen(name)))
+	{
+		*function = zbx_dsprintf(NULL, "%s()", name);
+		zbx_free(name);
+		return;
+	}
+
+	zbx_vector_ptr_create(&functions);
+
+	func = (zbx_dbpatch_function_t *)zbx_malloc(NULL, sizeof(zbx_dbpatch_function_t));
+	func->functionid = 0;
+	func->itemid = 0;
+	func->flags = 0;
+	func->name = name;
+
+	if (data->func_param.l + 1 == data->func_param.r)
+		func->parameter = zbx_strdup(NULL, "");
+	else
+		func->parameter = zbx_substr(expression, data->func_param.l + 1, data->func_param.r - 1);
+
+	host = zbx_substr(expression, data->host.l, data->host.r);
+	key = zbx_substr(expression, data->key.l, data->key.r);
+
+	if (0 == strncmp(host, HOSTHOST_STR, HOSTHOST_IDX_POS))
+		pos = HOSTHOST_IDX_POS;
+	else if (0 != more && 0 == strncmp(host, HOSTNAME_STR, HOSTNAME_IDX_POS))
+		pos = HOSTNAME_IDX_POS;
+	else
+		pos = 0;
+
+	if ((0 != pos && (('}' == host[pos] && '\0' == host[pos + 1]) || (0 != more && 0 == strcmp("1}", host + pos)))))
+	{
+		func->arg0 = zbx_dsprintf(NULL, "//%s", key);
+	}
+	else if (HOSTNAME_IDX_POS == pos && isdigit(host[pos]) && '0' != host[pos] && '}' == host[pos + 1] &&
+			'\0' == host[pos + 2])
+	{
+		func->arg0 = zbx_dsprintf(NULL, "/{HOST.HOST%c}/%s", host[pos], key);
+	}
+	else
+		func->arg0 = zbx_dsprintf(NULL, "/%s/%s", host, key);
+
+	zbx_vector_ptr_append(&functions, func);
+
+	dbpatch_convert_function(func, function, &functions);
+	if (NULL == *function)
+		*function = zbx_strdup(NULL, "{0}");
+	dbpatch_replace_functionids(function, &functions);
+
+	zbx_free(key);
+	zbx_free(host);
+	zbx_vector_ptr_clear_ext(&functions, (zbx_clean_func_t)dbpatch_function_free);
+	zbx_vector_ptr_destroy(&functions);
+
+#undef HOSTHOST_IDX_POS
+#undef HOSTNAME_IDX_POS
+#undef HOSTHOST_STR
+#undef HOSTNAME_STR
+}
diff --git a/src/libs/zbxdbupgrade/dbupgrade_macros.h b/src/libs/zbxdbupgrade/dbupgrade_macros.h
index 5096c5d9a23..38e843fc1a1 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_macros.h
+++ b/src/libs/zbxdbupgrade/dbupgrade_macros.h
@@ -20,6 +20,37 @@
 #ifndef ZABBIX_DBUPGRADE_MACROS_H
 #define ZABBIX_DBUPGRADE_MACROS_H
 
+#define ZBX_DBPATCH_FUNCTION_UPDATE_NAME		0x01
+#define ZBX_DBPATCH_FUNCTION_UPDATE_PARAM		0x02
+#define ZBX_DBPATCH_FUNCTION_UPDATE			(ZBX_DBPATCH_FUNCTION_UPDATE_NAME | \
+							ZBX_DBPATCH_FUNCTION_UPDATE_PARAM)
+
+#define ZBX_DBPATCH_FUNCTION_CREATE			0x40
+#define ZBX_DBPATCH_FUNCTION_DELETE			0x80
+
+typedef struct
+{
+	zbx_uint64_t	functionid;
+	zbx_uint64_t	itemid;
+
+	/* hostid for time based functions to track associated            */
+	/* hosts when replacing with history function with common function */
+	zbx_uint64_t	hostid;
+
+	/* function location - expression|recovery expression */
+	unsigned char	location;
+
+	char		*name;
+	char		*parameter;
+
+	/* the first parameter (host:key) for calculated item */
+	/* formula functions, NULL for trigger functions      */
+	char		*arg0;
+
+	unsigned char	flags;
+}
+zbx_dbpatch_function_t;
+
 typedef struct
 {
 	const char	*field_name;
@@ -27,7 +58,21 @@ typedef struct
 }
 zbx_field_len_t;
 
+ZBX_VECTOR_DECL(strloc, zbx_strloc_t)
+
 int	db_rename_macro(DB_RESULT result, const char *table, const char *pkey, zbx_field_len_t *fields, int fields_num,
 		const char *oldmacro, const char *newmacro);
+void	dbpatch_convert_simple_macro(const char *expression, const zbx_token_simple_macro_t *data, int more,
+		char **function);
+int	dbpatch_is_time_function(const char *name, size_t len);
+void	dbpatch_update_hist2common(zbx_dbpatch_function_t *function, int extended, char **expression);
+void	dbpatch_convert_function(zbx_dbpatch_function_t *function, char **replace, zbx_vector_ptr_t *functions);
+void	dbpatch_function_free(zbx_dbpatch_function_t *func);
+int	dbpatch_is_composite_constant(const char *str);
+void	dbpatch_strcpy_alloc_quoted(char **str, size_t *str_alloc, size_t *str_offset, const char *source);
+void	dbpatch_convert_params(char **out, const char *parameter, const zbx_vector_strloc_t *params, ...);
+
+zbx_dbpatch_function_t	*dbpatch_new_function(zbx_uint64_t functionid, zbx_uint64_t itemid, const char *name,
+		const char *parameter, unsigned char flags);
 
 #endif
diff --git a/src/libs/zbxembed/httprequest.c b/src/libs/zbxembed/httprequest.c
index 8ad63a2750a..6e94dbb8e2d 100644
--- a/src/libs/zbxembed/httprequest.c
+++ b/src/libs/zbxembed/httprequest.c
@@ -346,7 +346,7 @@ out:
  *                                                                            *
  * Function: es_httprequest_get                                               *
  *                                                                            *
- * Purpose: CurlHttpRequest.Get method                                        *
+ * Purpose: HttpRequest.Get / CurlHttpRequest.Get method                      *
  *                                                                            *
  ******************************************************************************/
 static duk_ret_t	es_httprequest_get(duk_context *ctx)
@@ -358,7 +358,7 @@ static duk_ret_t	es_httprequest_get(duk_context *ctx)
  *                                                                            *
  * Function: es_httprequest_put                                               *
  *                                                                            *
- * Purpose: CurlHttpRequest.Put method                                        *
+ * Purpose: HttpRequest.Put / CurlHttpRequest.Put method                      *
  *                                                                            *
  ******************************************************************************/
 static duk_ret_t	es_httprequest_put(duk_context *ctx)
@@ -370,7 +370,7 @@ static duk_ret_t	es_httprequest_put(duk_context *ctx)
  *                                                                            *
  * Function: es_httprequest_post                                              *
  *                                                                            *
- * Purpose: CurlHttpRequest.Post method                                       *
+ * Purpose: HttpRequest.Post / CurlHttpRequest.Post method                    *
  *                                                                            *
  ******************************************************************************/
 static duk_ret_t	es_httprequest_post(duk_context *ctx)
@@ -382,7 +382,7 @@ static duk_ret_t	es_httprequest_post(duk_context *ctx)
  *                                                                            *
  * Function: es_httprequest_delete                                            *
  *                                                                            *
- * Purpose: CurlHttpRequest.Delete method                                     *
+ * Purpose: HttpRequest.Delete / CurlHttpRequest.Delete method                *
  *                                                                            *
  ******************************************************************************/
 static duk_ret_t	es_httprequest_delete(duk_context *ctx)
@@ -392,6 +392,87 @@ static duk_ret_t	es_httprequest_delete(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
+ * Function: es_httprequest_head                                              *
+ *                                                                            *
+ * Purpose: HttpRequest.head method                                           *
+ *                                                                            *
+ ******************************************************************************/
+static duk_ret_t	es_httprequest_head(duk_context *ctx)
+{
+	return es_httprequest_query(ctx, "HEAD");
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: es_httprequest_patch                                             *
+ *                                                                            *
+ * Purpose: HttpRequest.patch method                                          *
+ *                                                                            *
+ ******************************************************************************/
+static duk_ret_t	es_httprequest_patch(duk_context *ctx)
+{
+	return es_httprequest_query(ctx, "PATCH");
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: es_httprequest_options                                           *
+ *                                                                            *
+ * Purpose: HttpRequest.options method                                        *
+ *                                                                            *
+ ******************************************************************************/
+static duk_ret_t	es_httprequest_options(duk_context *ctx)
+{
+	return es_httprequest_query(ctx, "OPTIONS");
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: es_httprequest_trace                                             *
+ *                                                                            *
+ * Purpose: HttpRequest.trace method                                          *
+ *                                                                            *
+ ******************************************************************************/
+static duk_ret_t	es_httprequest_trace(duk_context *ctx)
+{
+	return es_httprequest_query(ctx, "TRACE");
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: es_httprequest_connect                                           *
+ *                                                                            *
+ * Purpose: HttpRequest.connect method                                        *
+ *                                                                            *
+ ******************************************************************************/
+static duk_ret_t	es_httprequest_connect(duk_context *ctx)
+{
+	return es_httprequest_query(ctx, "CONNECT");
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: es_httprequest_customrequest                                     *
+ *                                                                            *
+ * Purpose: HttpRequest.customRequest method                                  *
+ *                                                                            *
+ ******************************************************************************/
+static duk_ret_t	es_httprequest_customrequest(duk_context *ctx)
+{
+	const char	*method;
+
+	if (0 != duk_is_null_or_undefined(ctx, 0))
+		return duk_error(ctx, DUK_RET_EVAL_ERROR, "HTTP method cannot be undefined or null");
+
+	method = duk_to_string(ctx, 0);
+	duk_remove(ctx, 0);
+
+	return es_httprequest_query(ctx, method);
+}
+
+
+/******************************************************************************
+ *                                                                            *
  * Function: es_httprequest_set_proxy                                         *
  *                                                                            *
  * Purpose: CurlHttpRequest.SetProxy method                                   *
@@ -470,7 +551,7 @@ static void	es_put_header(duk_context *ctx, int idx, char *header)
  *                                                                            *
  * Function: es_httprequest_get_headers                                       *
  *                                                                            *
- * Purpose: CurlHttpRequest.GetHeaders method                                 *
+ * Purpose: HttpRequest.Get / CurlHttpRequest.GetHeaders method               *
  *                                                                            *
  ******************************************************************************/
 static duk_ret_t	es_httprequest_get_headers(duk_context *ctx)
@@ -575,10 +656,16 @@ static const duk_function_list_entry	httprequest_methods[] = {
 	{"put", es_httprequest_put, 2},
 	{"post", es_httprequest_post, 2},
 	{"delete", es_httprequest_delete, 2},
+	{"head", es_httprequest_head, 2},
+	{"patch", es_httprequest_patch, 2},
+	{"options", es_httprequest_options, 2},
+	{"trace", es_httprequest_trace, 2},
+	{"connect", es_httprequest_connect, 2},
 	{"getStatus", es_httprequest_status, 0},
 	{"setProxy", es_httprequest_set_proxy, 1},
 	{"getHeaders", es_httprequest_get_headers, 0},
 	{"setHttpAuth", es_httprequest_set_httpauth, 3},
+	{"customRequest", es_httprequest_customrequest, 3},
 	{NULL, NULL, 0}
 };
 
diff --git a/src/libs/zbxeval/parse.c b/src/libs/zbxeval/parse.c
index e9f296d1293..70887c3b021 100644
--- a/src/libs/zbxeval/parse.c
+++ b/src/libs/zbxeval/parse.c
@@ -174,7 +174,7 @@ static int	eval_parse_macro(zbx_eval_context_t *ctx, int pos, zbx_token_t *tok)
 		return SUCCEED;
 	}
 	else if ('{' == ctx->expression[pos + 1] && SUCCEED == zbx_token_parse_nested_macro(ctx->expression,
-			ctx->expression + pos, tok))
+			ctx->expression + pos, 0, tok))
 	{
 		return SUCCEED;
 	}
diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c
index d3ebc90ab4b..e5772b8d782 100644
--- a/src/libs/zbxserver/evalfunc.c
+++ b/src/libs/zbxserver/evalfunc.c
@@ -21,26 +21,10 @@
 #include "db.h"
 #include "log.h"
 #include "zbxserver.h"
-#include "valuecache.h"
 #include "evalfunc.h"
 #include "zbxregexp.h"
-#include "zbxtrends.h"
 #include "../zbxalgo/vectorimpl.h"
 
-typedef enum
-{
-	ZBX_PARAM_OPTIONAL,
-	ZBX_PARAM_MANDATORY
-}
-zbx_param_type_t;
-
-typedef enum
-{
-	ZBX_VALUE_SECONDS,
-	ZBX_VALUE_NVALUES
-}
-zbx_value_type_t;
-
 #define ZBX_VALUEMAP_STRING_LEN	64
 
 #define ZBX_VALUEMAP_TYPE_MATCH			0
@@ -61,3095 +45,6 @@ zbx_valuemaps_t;
 ZBX_PTR_VECTOR_DECL(valuemaps_ptr, zbx_valuemaps_t *)
 ZBX_PTR_VECTOR_IMPL(valuemaps_ptr, zbx_valuemaps_t *)
 
-static const char	*zbx_type_string(zbx_value_type_t type)
-{
-	switch (type)
-	{
-		case ZBX_VALUE_SECONDS:
-			return "sec";
-		case ZBX_VALUE_NVALUES:
-			return "num";
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-			return "unknown";
-	}
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: get_function_parameter_int                                       *
- *                                                                            *
- * Purpose: get the value of sec|#num trigger function parameter              *
- *                                                                            *
- * Parameters: parameters     - [IN] trigger function parameters              *
- *             Nparam         - [IN] specifies which parameter to extract     *
- *             parameter_type - [IN] specifies whether parameter is mandatory *
- *                              or optional                                   *
- *             value          - [OUT] parameter value (preserved as is if the *
- *                              parameter is optional and empty)              *
- *             type           - [OUT] parameter value type (number of seconds *
- *                              or number of values)                          *
- *                                                                            *
- * Return value: SUCCEED - parameter is valid                                 *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- ******************************************************************************/
-static int	get_function_parameter_int(const char *parameters, int Nparam, zbx_param_type_t parameter_type,
-		int *value, zbx_value_type_t *type)
-{
-	char	*parameter;
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	if ('\0' == *parameter)
-	{
-		switch (parameter_type)
-		{
-			case ZBX_PARAM_OPTIONAL:
-				ret = SUCCEED;
-				break;
-			case ZBX_PARAM_MANDATORY:
-				break;
-			default:
-				THIS_SHOULD_NEVER_HAPPEN;
-		}
-	}
-	else if ('#' == *parameter)
-	{
-		*type = ZBX_VALUE_NVALUES;
-		if (SUCCEED == is_uint31(parameter + 1, value) && 0 < *value)
-			ret = SUCCEED;
-	}
-	else if ('-' == *parameter)
-	{
-		if (SUCCEED == is_time_suffix(parameter + 1, value, ZBX_LENGTH_UNLIMITED))
-		{
-			*value = -(*value);
-			*type = ZBX_VALUE_SECONDS;
-			ret = SUCCEED;
-		}
-	}
-	else if (SUCCEED == is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED))
-	{
-		*type = ZBX_VALUE_SECONDS;
-		ret = SUCCEED;
-	}
-
-	if (SUCCEED == ret)
-		zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d", __func__, zbx_type_string(*type), *value);
-
-	zbx_free(parameter);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	get_function_parameter_uint64(const char *parameters, int Nparam, zbx_uint64_t *value)
-{
-	char	*parameter;
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	if (SUCCEED == (ret = is_uint64(parameter, value)))
-		zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_UI64, __func__, *value);
-
-	zbx_free(parameter);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	get_function_parameter_float(const char *parameters, int Nparam, unsigned char flags, double *value)
-{
-	char	*parameter;
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	if (SUCCEED == (ret = is_double_suffix(parameter, flags)))
-	{
-		*value = str2double(parameter);
-		zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_DBL, __func__, *value);
-	}
-
-	zbx_free(parameter);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	get_function_parameter_str(const char *parameters, int Nparam, char **value)
-{
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (*value = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() value:'%s'", __func__, *value);
-	ret = SUCCEED;
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LOGEVENTID                                              *
- *                                                                            *
- * Purpose: evaluate function 'logeventid' for the item                       *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - regex string for event id matching                 *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LOGEVENTID(char **value, DC_ITEM *item, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	char			*arg1 = NULL;
-	int			ret = FAIL;
-	zbx_vector_ptr_t	regexps;
-	zbx_history_record_t	vc_value;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_ptr_create(&regexps);
-
-	if (ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 < num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_str(parameters, 1, &arg1))
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if ('@' == *arg1)
-	{
-		DCget_expressions_by_name(&regexps, arg1 + 1);
-
-		if (0 == regexps.values_num)
-		{
-			*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist", arg1 + 1);
-			goto out;
-		}
-	}
-
-	if (SUCCEED == zbx_vc_get_value(item->itemid, item->value_type, ts, &vc_value))
-	{
-		char	logeventid[16];
-		int	regexp_ret;
-
-		zbx_snprintf(logeventid, sizeof(logeventid), "%d", vc_value.value.log->logeventid);
-
-		if (FAIL == (regexp_ret = regexp_match_ex(&regexps, logeventid, arg1, ZBX_CASE_SENSITIVE)))
-		{
-			*error = zbx_dsprintf(*error, "invalid regular expression \"%s\"", arg1);
-		}
-		else
-		{
-			if (ZBX_REGEXP_MATCH == regexp_ret)
-				*value = zbx_strdup(*value, "1");
-			else if (ZBX_REGEXP_NO_MATCH == regexp_ret)
-				*value = zbx_strdup(*value, "0");
-
-			ret = SUCCEED;
-		}
-
-		zbx_history_record_clear(&vc_value, item->value_type);
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGEVENTID is empty");
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-	}
-out:
-	zbx_free(arg1);
-
-	zbx_regexp_clean_expressions(&regexps);
-	zbx_vector_ptr_destroy(&regexps);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LOGSOURCE                                               *
- *                                                                            *
- * Purpose: evaluate function 'logsource' for the item                        *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - ignored                                            *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LOGSOURCE(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char			*arg1 = NULL;
-	int			ret = FAIL;
-	zbx_vector_ptr_t	regexps;
-	zbx_history_record_t	vc_value;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_ptr_create(&regexps);
-
-	if (ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 < num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_str(parameters, 1, &arg1))
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if ('@' == *arg1)
-	{
-		DCget_expressions_by_name(&regexps, arg1 + 1);
-
-		if (0 == regexps.values_num)
-		{
-			*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist", arg1 + 1);
-			goto out;
-		}
-	}
-
-	if (SUCCEED == zbx_vc_get_value(item->itemid, item->value_type, ts, &vc_value))
-	{
-		switch (regexp_match_ex(&regexps, ZBX_NULL2EMPTY_STR(vc_value.value.log->source), arg1, ZBX_CASE_SENSITIVE))
-		{
-			case ZBX_REGEXP_MATCH:
-				*value = zbx_strdup(*value, "1");
-				ret = SUCCEED;
-				break;
-			case ZBX_REGEXP_NO_MATCH:
-				*value = zbx_strdup(*value, "0");
-				ret = SUCCEED;
-				break;
-			case FAIL:
-				*error = zbx_dsprintf(*error, "invalid regular expression");
-		}
-
-		zbx_history_record_clear(&vc_value, item->value_type);
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGSOURCE is empty");
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-	}
-out:
-	zbx_free(arg1);
-
-	zbx_regexp_clean_expressions(&regexps);
-	zbx_vector_ptr_destroy(&regexps);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LOGSEVERITY                                             *
- *                                                                            *
- * Purpose: evaluate function 'logseverity' for the item                      *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LOGSEVERITY(char **value, DC_ITEM *item, const zbx_timespec_t *ts, char **error)
-{
-	int			ret = FAIL;
-	zbx_history_record_t	vc_value;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (SUCCEED == zbx_vc_get_value(item->itemid, item->value_type, ts, &vc_value))
-	{
-		size_t	value_alloc = 0, value_offset = 0;
-
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%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");
-		*error = zbx_strdup(*error, "cannot get value from value cache");
-	}
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-#define OP_UNKNOWN	-1
-#define OP_EQ		0
-#define OP_NE		1
-#define OP_GT		2
-#define OP_GE		3
-#define OP_LT		4
-#define OP_LE		5
-#define OP_LIKE		6
-#define OP_REGEXP	7
-#define OP_IREGEXP	8
-#define OP_BITAND		9
-#define OP_MAX		10
-
-static void	count_one_ui64(int *count, int op, zbx_uint64_t value, zbx_uint64_t pattern, zbx_uint64_t mask)
-{
-	switch (op)
-	{
-		case OP_EQ:
-			if (value == pattern)
-				(*count)++;
-			break;
-		case OP_NE:
-			if (value != pattern)
-				(*count)++;
-			break;
-		case OP_GT:
-			if (value > pattern)
-				(*count)++;
-			break;
-		case OP_GE:
-			if (value >= pattern)
-				(*count)++;
-			break;
-		case OP_LT:
-			if (value < pattern)
-				(*count)++;
-			break;
-		case OP_LE:
-			if (value <= pattern)
-				(*count)++;
-			break;
-		case OP_BITAND:
-			if ((value & mask) == pattern)
-				(*count)++;
-	}
-}
-
-static void	count_one_dbl(int *count, int op, double value, double pattern)
-{
-	switch (op)
-	{
-		case OP_EQ:
-			if (value > pattern - ZBX_DOUBLE_EPSILON && value < pattern + ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_NE:
-			if (!(value > pattern - ZBX_DOUBLE_EPSILON && value < pattern + ZBX_DOUBLE_EPSILON))
-				(*count)++;
-			break;
-		case OP_GT:
-			if (value >= pattern + ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_GE:
-			if (value > pattern - ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_LT:
-			if (value <= pattern - ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_LE:
-			if (value < pattern + ZBX_DOUBLE_EPSILON)
-				(*count)++;
-	}
-}
-
-static void	count_one_str(int *count, int op, const char *value, const char *pattern, zbx_vector_ptr_t *regexps)
-{
-	int	res;
-
-	switch (op)
-	{
-		case OP_EQ:
-			if (0 == strcmp(value, pattern))
-				(*count)++;
-			break;
-		case OP_NE:
-			if (0 != strcmp(value, pattern))
-				(*count)++;
-			break;
-		case OP_LIKE:
-			if (NULL != strstr(value, pattern))
-				(*count)++;
-			break;
-		case OP_REGEXP:
-			if (ZBX_REGEXP_MATCH == (res = regexp_match_ex(regexps, value, pattern, ZBX_CASE_SENSITIVE)))
-				(*count)++;
-			else if (FAIL == res)
-				*count = FAIL;
-			break;
-		case OP_IREGEXP:
-			if (ZBX_REGEXP_MATCH == (res = regexp_match_ex(regexps, value, pattern, ZBX_IGNORE_CASE)))
-				(*count)++;
-			else if (FAIL == res)
-				*count = FAIL;
-	}
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_COUNT                                                   *
- *                                                                            *
- * Purpose: evaluate function 'count' for the item                            *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - up to four comma-separated fields:                *
- *                            (1) number of seconds/values                    *
- *                            (2) value to compare with (optional)            *
- *                                Becomes mandatory for numeric items if 3rd  *
- *                                parameter is specified and is not "regexp"  *
- *                                or "iregexp". With "band" can take one of   *
- *                                2 forms:                                    *
- *                                  - value_to_compare_with/mask              *
- *                                  - mask                                    *
- *                            (3) comparison operator (optional)              *
- *                            (4) time shift (optional)                       *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_COUNT(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int				arg1, op = OP_UNKNOWN, numeric_search, nparams, count = 0, i, ret = FAIL;
-	int				seconds = 0, nvalues = 0;
-	char				*arg2 = NULL, *arg2_2 = NULL, *arg3 = NULL, buf[ZBX_MAX_UINT64_LEN];
-	double				arg2_dbl;
-	zbx_uint64_t			arg2_ui64, arg2_2_ui64;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_ptr_t		regexps;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-	size_t				value_alloc = 0, value_offset = 0;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_ptr_create(&regexps);
-	zbx_history_record_vector_create(&values);
-
-	numeric_search = (ITEM_VALUE_TYPE_UINT64 == item->value_type || ITEM_VALUE_TYPE_FLOAT == item->value_type);
-
-	if (4 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (2 <= nparams && SUCCEED != get_function_parameter_str(parameters, 2, &arg2))
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (3 <= nparams && SUCCEED != get_function_parameter_str(parameters, 3, &arg3))
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (4 <= nparams)
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 4, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid fourth parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	if (NULL == arg3 || '\0' == *arg3)
-		op = (0 != numeric_search ? OP_EQ : OP_LIKE);
-	else if (0 == strcmp(arg3, "eq"))
-		op = OP_EQ;
-	else if (0 == strcmp(arg3, "ne"))
-		op = OP_NE;
-	else if (0 == strcmp(arg3, "gt"))
-		op = OP_GT;
-	else if (0 == strcmp(arg3, "ge"))
-		op = OP_GE;
-	else if (0 == strcmp(arg3, "lt"))
-		op = OP_LT;
-	else if (0 == strcmp(arg3, "le"))
-		op = OP_LE;
-	else if (0 == strcmp(arg3, "like"))
-		op = OP_LIKE;
-	else if (0 == strcmp(arg3, "regexp"))
-		op = OP_REGEXP;
-	else if (0 == strcmp(arg3, "iregexp"))
-		op = OP_IREGEXP;
-	else if (0 == strcmp(arg3, "band"))
-		op = OP_BITAND;
-
-	if (OP_UNKNOWN == op)
-	{
-		*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for function COUNT", arg3);
-		goto out;
-	}
-
-	numeric_search = (0 != numeric_search && OP_REGEXP != op && OP_IREGEXP != op);
-
-	if (0 != numeric_search)
-	{
-		if (NULL != arg3 && '\0' != *arg3 && '\0' == *arg2)
-		{
-			*error = zbx_strdup(*error, "pattern must be provided along with operator for numeric values");
-			goto out;
-		}
-
-		if (OP_LIKE == op)
-		{
-			*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting numeric values",
-					arg3);
-			goto out;
-		}
-
-		if (OP_BITAND == op && ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting float values",
-					arg3);
-			goto out;
-		}
-
-		if (OP_BITAND == op && NULL != (arg2_2 = strchr(arg2, '/')))
-		{
-			*arg2_2 = '\0';	/* end of the 1st part of the 2nd parameter (number to compare with) */
-			arg2_2++;	/* start of the 2nd part of the 2nd parameter (mask) */
-		}
-
-		if (NULL != arg2 && '\0' != *arg2)
-		{
-			if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-			{
-				if (OP_BITAND != op)
-				{
-					if (SUCCEED != str2uint64(arg2, ZBX_UNIT_SYMBOLS, &arg2_ui64))
-					{
-						*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric unsigned"
-								" value", arg2);
-						goto out;
-					}
-				}
-				else
-				{
-					if (SUCCEED != is_uint64(arg2, &arg2_ui64))
-					{
-						*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric unsigned"
-								" value", arg2);
-						goto out;
-					}
-
-					if (NULL != arg2_2)
-					{
-						if (SUCCEED != is_uint64(arg2_2, &arg2_2_ui64))
-						{
-							*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric"
-									" unsigned value", arg2_2);
-							goto out;
-						}
-					}
-					else
-						arg2_2_ui64 = arg2_ui64;
-				}
-			}
-			else
-			{
-				if (SUCCEED != is_double_suffix(arg2, ZBX_FLAG_DOUBLE_SUFFIX))
-				{
-					*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric float value",
-							arg2);
-					goto out;
-				}
-
-				arg2_dbl = str2double(arg2);
-			}
-		}
-	}
-	else if (OP_LIKE != op && OP_REGEXP != op && OP_IREGEXP != op && OP_EQ != op && OP_NE != op)
-	{
-		*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting textual values", arg3);
-		goto out;
-	}
-
-	if ((OP_REGEXP == op || OP_IREGEXP == op) && '@' == *arg2)
-	{
-		DCget_expressions_by_name(&regexps, arg2 + 1);
-
-		if (0 == regexps.values_num)
-		{
-			*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist", arg2 + 1);
-			goto out;
-		}
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	/* skip counting values one by one if both pattern and operator are empty or "" is searched in text values */
-	if ((NULL != arg2 && '\0' != *arg2) || (NULL != arg3 && '\0' != *arg3 &&
-			OP_LIKE != op && OP_REGEXP != op && OP_IREGEXP != op))
-	{
-		switch (item->value_type)
-		{
-			case ITEM_VALUE_TYPE_UINT64:
-				if (0 != numeric_search)
-				{
-					for (i = 0; i < values.values_num; i++)
-					{
-						count_one_ui64(&count, op, values.values[i].value.ui64, arg2_ui64,
-								arg2_2_ui64);
-					}
-				}
-				else
-				{
-					for (i = 0; i < values.values_num && FAIL != count; i++)
-					{
-						zbx_snprintf(buf, sizeof(buf), ZBX_FS_UI64,
-								values.values[i].value.ui64);
-						count_one_str(&count, op, buf, arg2, &regexps);
-					}
-				}
-				break;
-			case ITEM_VALUE_TYPE_FLOAT:
-				if (0 != numeric_search)
-				{
-					for (i = 0; i < values.values_num; i++)
-						count_one_dbl(&count, op, values.values[i].value.dbl, arg2_dbl);
-				}
-				else
-				{
-					for (i = 0; i < values.values_num && FAIL != count; i++)
-					{
-						zbx_snprintf(buf, sizeof(buf), ZBX_FS_DBL_EXT(4),
-								values.values[i].value.dbl);
-						count_one_str(&count, op, buf, arg2, &regexps);
-					}
-				}
-				break;
-			case ITEM_VALUE_TYPE_LOG:
-				for (i = 0; i < values.values_num && FAIL != count; i++)
-					count_one_str(&count, op, values.values[i].value.log->value, arg2, &regexps);
-				break;
-			default:
-				for (i = 0; i < values.values_num && FAIL != count; i++)
-					count_one_str(&count, op, values.values[i].value.str, arg2, &regexps);
-		}
-
-		if (FAIL == count)
-		{
-			*error = zbx_strdup(*error, "invalid regular expression");
-			goto out;
-		}
-	}
-	else
-		count = values.values_num;
-
-	zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%d", count);
-
-	ret = SUCCEED;
-out:
-	zbx_free(arg2);
-	zbx_free(arg3);
-
-	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", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-#undef OP_UNKNOWN
-#undef OP_EQ
-#undef OP_NE
-#undef OP_GT
-#undef OP_GE
-#undef OP_LT
-#undef OP_LE
-#undef OP_LIKE
-#undef OP_REGEXP
-#undef OP_IREGEXP
-#undef OP_BITAND
-#undef OP_MAX
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_SUM                                                     *
- *                                                                            *
- * Purpose: evaluate function 'sum' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_SUM(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				nparams, arg1, i, ret = FAIL, seconds = 0, nvalues = 0;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	history_value_t			result;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-	{
-		result.dbl = 0;
-
-		for (i = 0; i < values.values_num; i++)
-			result.dbl += values.values[i].value.dbl;
-	}
-	else
-	{
-		result.ui64 = 0;
-
-		for (i = 0; i < values.values_num; i++)
-			result.ui64 += values.values[i].value.ui64;
-	}
-
-	*value = zbx_history_value2str_dyn(&result, item->value_type);
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_AVG                                                     *
- *                                                                            *
- * Purpose: evaluate function 'avg' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_AVG(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				nparams, arg1, ret = FAIL, i, seconds = 0, nvalues = 0;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		double	avg = 0;
-		size_t	value_alloc = 0, value_offset = 0;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			for (i = 0; i < values.values_num; i++)
-				avg += values.values[i].value.dbl / (i + 1) - avg / (i + 1);
-		}
-		else
-		{
-			for (i = 0; i < values.values_num; i++)
-				avg += values.values[i].value.ui64;
-
-			avg = avg / values.values_num;
-		}
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_DBL64, avg);
-
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for AVG is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LAST                                                    *
- *                                                                            *
- * Purpose: evaluate functions 'last' and 'prev' for the item                 *
- *                                                                            *
- * Parameters: value - dynamic buffer                                         *
- *             item - item (performance metric)                               *
- *             parameters - Nth last value and time shift (optional)          *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LAST(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int				arg1 = 1, ret = FAIL;
-	zbx_value_type_t		arg1_type = ZBX_VALUE_NVALUES;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_OPTIONAL, &arg1, &arg1_type))
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (ZBX_VALUE_NVALUES != arg1_type)
-		arg1 = 1;	/* non-# first parameter is ignored to support older syntax "last(0)" */
-
-	if (2 == num_param(parameters))
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	if (SUCCEED == zbx_vc_get_values(item->itemid, item->value_type, &values, 0, arg1, &ts_end))
-	{
-		if (arg1 <= values.values_num)
-		{
-			char	*tmp;
-
-			tmp = zbx_history_value2str_dyn(&values.values[arg1 - 1].value, item->value_type);
-
-			if (ITEM_VALUE_TYPE_STR == item->value_type ||
-					ITEM_VALUE_TYPE_TEXT == item->value_type ||
-					ITEM_VALUE_TYPE_LOG == item->value_type)
-			{
-				size_t	len;
-				char	*ptr;
-
-				len = zbx_get_escape_string_len(tmp, "\"\\");
-				ptr = *value = zbx_malloc(NULL, len + 3);
-				*ptr++ = '"';
-				zbx_escape_string(ptr, len + 1, tmp, "\"\\");
-				ptr += len;
-				*ptr++ = '"';
-				*ptr = '\0';
-				zbx_free(tmp);
-			}
-			else
-				*value = tmp;
-
-			ret = SUCCEED;
-		}
-		else
-		{
-			*error = zbx_strdup(*error, "not enough data");
-			goto out;
-		}
-	}
-	else
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_MIN                                                     *
- *                                                                            *
- * Purpose: evaluate function 'min' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_MIN(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				nparams, arg1, i, ret = FAIL, seconds = 0, nvalues = 0;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		int	index = 0;
-
-		if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.ui64 < values.values[index].value.ui64)
-					index = i;
-			}
-		}
-		else
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.dbl < values.values[index].value.dbl)
-					index = i;
-			}
-		}
-
-		*value = zbx_history_value2str_dyn(&values.values[index].value, item->value_type);
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for MIN is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_MAX                                                     *
- *                                                                            *
- * Purpose: evaluate function 'max' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_MAX(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				nparams, arg1, ret = FAIL, i, seconds = 0, nvalues = 0;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		int	index = 0;
-
-		if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.ui64 > values.values[index].value.ui64)
-					index = i;
-			}
-		}
-		else
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.dbl > values.values[index].value.dbl)
-					index = i;
-			}
-		}
-
-		*value = zbx_history_value2str_dyn(&values.values[index].value, item->value_type);
-
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for MAX is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	__history_record_float_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
-{
-	ZBX_RETURN_IF_NOT_EQUAL(d1->value.dbl, d2->value.dbl);
-
-	return 0;
-}
-
-static int	__history_record_uint64_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
-{
-	ZBX_RETURN_IF_NOT_EQUAL(d1->value.ui64, d2->value.ui64);
-
-	return 0;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_PERCENTILE                                              *
- *                                                                            *
- * Purpose: evaluate function 'percentile' for the item                       *
- *                                                                            *
- * Parameters: item       - [IN] item (performance metric)                    *
- *             parameters - [IN] seconds/values, time shift (optional),       *
- *                               percentage                                   *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in        *
- *                         'value'                                            *
- *               FAIL    - failed to evaluate function                        *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_PERCENTILE(char **value, DC_ITEM *item, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	int				nparams, arg1, time_shift = 0, ret = FAIL, seconds = 0, nvalues = 0;
-	zbx_value_type_t		arg1_type, time_shift_type = ZBX_VALUE_SECONDS;
-	double				percentage;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (3 != (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift, &time_shift_type) ||
-			ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	ts_end.sec -= time_shift;
-
-	if (SUCCEED != get_function_parameter_float(parameters, 3, ZBX_FLAG_DOUBLE_PLAIN, &percentage) ||
-			0.0 > percentage || 100.0 < percentage)
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		int	index;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-			zbx_vector_history_record_sort(&values, (zbx_compare_func_t)__history_record_float_compare);
-		else
-			zbx_vector_history_record_sort(&values, (zbx_compare_func_t)__history_record_uint64_compare);
-
-		if (0 == percentage)
-			index = 1;
-		else
-			index = (int)ceil(values.values_num * (percentage / 100));
-
-		*value = zbx_history_value2str_dyn(&values.values[index - 1].value, item->value_type);
-
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for PERCENTILE is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_DELTA                                                   *
- *                                                                            *
- * Purpose: evaluate function 'delta' for the item                            *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_DELTA(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int				nparams, arg1, ret = FAIL, i, seconds = 0, nvalues = 0;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		history_value_t		result;
-		int			index_min = 0, index_max = 0;
-
-		if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.ui64 > values.values[index_max].value.ui64)
-					index_max = i;
-
-				if (values.values[i].value.ui64 < values.values[index_min].value.ui64)
-					index_min = i;
-			}
-
-			result.ui64 = values.values[index_max].value.ui64 - values.values[index_min].value.ui64;
-		}
-		else
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.dbl > values.values[index_max].value.dbl)
-					index_max = i;
-
-				if (values.values[i].value.dbl < values.values[index_min].value.dbl)
-					index_min = i;
-			}
-
-			result.dbl = values.values[index_max].value.dbl - values.values[index_min].value.dbl;
-		}
-
-		*value = zbx_history_value2str_dyn(&result, item->value_type);
-
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for DELTA is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_NODATA                                                  *
- *                                                                            *
- * Purpose: evaluate function 'nodata' for the item                           *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_NODATA(char **value, DC_ITEM *item, const char *parameters, char **error)
-{
-	int				arg1, num, period, lazy = 1, ret = FAIL;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts;
-	char				*arg2 = NULL;
-	zbx_proxy_suppress_t		nodata_win;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (2 < (num = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) ||
-			ZBX_VALUE_SECONDS != arg1_type || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (1 < num && (SUCCEED != get_function_parameter_str(parameters, 2, &arg2) ||
-			('\0' != *arg2 && 0 != (lazy = strcmp("strict", arg2)))))
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	zbx_timespec(&ts);
-	nodata_win.flags = ZBX_PROXY_SUPPRESS_DISABLE;
-
-	if (0 != item->host.proxy_hostid && 0 != lazy)
-	{
-		int			lastaccess;
-
-		if (SUCCEED != DCget_proxy_nodata_win(item->host.proxy_hostid, &nodata_win, &lastaccess))
-		{
-			*error = zbx_strdup(*error, "cannot retrieve proxy last access");
-			goto out;
-		}
-
-		period = arg1 + (ts.sec - lastaccess);
-	}
-	else
-		period = arg1;
-
-	if (SUCCEED == zbx_vc_get_values(item->itemid, item->value_type, &values, period, 1, &ts) &&
-			1 == values.values_num)
-	{
-		*value = zbx_strdup(*value, "0");
-	}
-	else
-	{
-		int	seconds;
-
-		if (SUCCEED != DCget_data_expected_from(item->itemid, &seconds))
-		{
-			*error = zbx_strdup(*error, "item does not exist, is disabled or belongs to a disabled host");
-			goto out;
-		}
-
-		if (seconds + arg1 > ts.sec)
-		{
-			*error = zbx_strdup(*error,
-					"item does not have enough data after server start or item creation");
-			goto out;
-		}
-
-		if (0 != (nodata_win.flags & ZBX_PROXY_SUPPRESS_ACTIVE))
-		{
-			*error = zbx_strdup(*error, "historical data transfer from proxy is still in progress");
-			goto out;
-		}
-
-		*value = zbx_strdup(*value, "1");
-
-		if (0 != item->host.proxy_hostid && 0 != lazy)
-		{
-			zabbix_log(LOG_LEVEL_TRACE, "Nodata in %s() flag:%d values_num:%d start_time:%d period:%d",
-					__func__, nodata_win.flags, nodata_win.values_num, ts.sec - period, period);
-		}
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-	zbx_free(arg2);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_ABSCHANGE                                               *
- *                                                                            *
- * Purpose: evaluate function 'abschange' for the item                        *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_ABSCHANGE(char **value, DC_ITEM *item, const zbx_timespec_t *ts, char **error)
-{
-	int				ret = FAIL;
-	size_t				value_alloc = 0, value_offset = 0;
-	zbx_vector_history_record_t	values;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (SUCCEED != zbx_vc_get_values(item->itemid, item->value_type, &values, 0, 2, ts) ||
-			2 > values.values_num)
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	switch (item->value_type)
-	{
-		case ITEM_VALUE_TYPE_FLOAT:
-			zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_DBL64,
-					fabs(values.values[0].value.dbl - values.values[1].value.dbl));
-			break;
-		case ITEM_VALUE_TYPE_UINT64:
-			/* to avoid overflow */
-			if (values.values[0].value.ui64 >= values.values[1].value.ui64)
-			{
-				zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_UI64,
-						values.values[0].value.ui64 - values.values[1].value.ui64);
-			}
-			else
-			{
-				zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_UI64,
-						values.values[1].value.ui64 - values.values[0].value.ui64);
-			}
-			break;
-		case ITEM_VALUE_TYPE_LOG:
-			if (0 == strcmp(values.values[0].value.log->value, values.values[1].value.log->value))
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-
-		case ITEM_VALUE_TYPE_STR:
-		case ITEM_VALUE_TYPE_TEXT:
-			if (0 == strcmp(values.values[0].value.str, values.values[1].value.str))
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-		default:
-			*error = zbx_strdup(*error, "invalid value type");
-			goto out;
-	}
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_CHANGE                                                  *
- *                                                                            *
- * Purpose: evaluate function 'change' for the item                           *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_CHANGE(char **value, DC_ITEM *item, const zbx_timespec_t *ts, char **error)
-{
-	int				ret = FAIL;
-	size_t				value_alloc = 0, value_offset = 0;
-	zbx_vector_history_record_t	values;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (SUCCEED != zbx_vc_get_values(item->itemid, item->value_type, &values, 0, 2, ts) ||
-			2 > values.values_num)
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	switch (item->value_type)
-	{
-		case ITEM_VALUE_TYPE_FLOAT:
-			zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_DBL64,
-					values.values[0].value.dbl - values.values[1].value.dbl);
-			break;
-		case ITEM_VALUE_TYPE_UINT64:
-			/* to avoid overflow */
-			if (values.values[0].value.ui64 >= values.values[1].value.ui64)
-				zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_UI64,
-						values.values[0].value.ui64 - values.values[1].value.ui64);
-			else
-				zbx_snprintf_alloc(value, &value_alloc, &value_offset, "-" ZBX_FS_UI64,
-						values.values[1].value.ui64 - values.values[0].value.ui64);
-			break;
-		case ITEM_VALUE_TYPE_LOG:
-			if (0 == strcmp(values.values[0].value.log->value, values.values[1].value.log->value))
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-
-		case ITEM_VALUE_TYPE_STR:
-		case ITEM_VALUE_TYPE_TEXT:
-			if (0 == strcmp(values.values[0].value.str, values.values[1].value.str))
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-		default:
-			*error = zbx_strdup(*error, "invalid value type");
-			goto out;
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_DIFF                                                    *
- *                                                                            *
- * Purpose: evaluate function 'diff' for the item                             *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_DIFF(char **value, DC_ITEM *item, const zbx_timespec_t *ts, char **error)
-{
-	int				ret = FAIL;
-	zbx_vector_history_record_t	values;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (SUCCEED != zbx_vc_get_values(item->itemid, item->value_type, &values, 0, 2, ts) || 2 > values.values_num)
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	switch (item->value_type)
-	{
-		case ITEM_VALUE_TYPE_FLOAT:
-			if (SUCCEED == zbx_double_compare(values.values[0].value.dbl, values.values[1].value.dbl))
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-		case ITEM_VALUE_TYPE_UINT64:
-			if (values.values[0].value.ui64 == values.values[1].value.ui64)
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-		case ITEM_VALUE_TYPE_LOG:
-			if (0 == strcmp(values.values[0].value.log->value, values.values[1].value.log->value))
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-		case ITEM_VALUE_TYPE_STR:
-		case ITEM_VALUE_TYPE_TEXT:
-			if (0 == strcmp(values.values[0].value.str, values.values[1].value.str))
-				*value = zbx_strdup(*value, "0");
-			else
-				*value = zbx_strdup(*value, "1");
-			break;
-		default:
-			*error = zbx_strdup(*error, "invalid value type");
-			goto out;
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_STR                                                     *
- *                                                                            *
- * Purpose: evaluate function 'str' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - <string>[,seconds]                                *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result stored in 'value'   *
- *               FAIL - failed to match the regular expression                *
- *               NOTSUPPORTED - invalid regular expression                    *
- *                                                                            *
- ******************************************************************************/
-
-#define ZBX_FUNC_STR		1
-#define ZBX_FUNC_REGEXP		2
-#define ZBX_FUNC_IREGEXP	3
-
-static int	evaluate_STR_one(int func, zbx_vector_ptr_t *regexps, const char *value, const char *arg1)
-{
-	switch (func)
-	{
-		case ZBX_FUNC_STR:
-			if (NULL != strstr(value, arg1))
-				return SUCCEED;
-			break;
-		case ZBX_FUNC_REGEXP:
-			switch (regexp_match_ex(regexps, value, arg1, ZBX_CASE_SENSITIVE))
-			{
-				case ZBX_REGEXP_MATCH:
-					return SUCCEED;
-				case FAIL:
-					return NOTSUPPORTED;
-			}
-			break;
-		case ZBX_FUNC_IREGEXP:
-			switch (regexp_match_ex(regexps, value, arg1, ZBX_IGNORE_CASE))
-			{
-				case ZBX_REGEXP_MATCH:
-					return SUCCEED;
-				case FAIL:
-					return NOTSUPPORTED;
-			}
-			break;
-	}
-
-	return FAIL;
-}
-
-static int	evaluate_STR(char **value, DC_ITEM *item, const char *function, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	char				*arg1 = NULL;
-	int				arg2 = 1, func, found = 0, i, ret = FAIL, seconds = 0, nvalues = 0, nparams;
-	int				str_one_ret;
-	zbx_value_type_t		arg2_type = ZBX_VALUE_NVALUES;
-	zbx_vector_ptr_t		regexps;
-	zbx_vector_history_record_t	values;
-	size_t				value_alloc = 0, value_offset = 0;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_ptr_create(&regexps);
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_STR != item->value_type && ITEM_VALUE_TYPE_TEXT != item->value_type &&
-			ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (0 == strcmp(function, "str"))
-		func = ZBX_FUNC_STR;
-	else if (0 == strcmp(function, "regexp"))
-		func = ZBX_FUNC_REGEXP;
-	else if (0 == strcmp(function, "iregexp"))
-		func = ZBX_FUNC_IREGEXP;
-	else
-		goto out;
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_str(parameters, 1, &arg1))
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &arg2, &arg2_type) ||
-				0 >= arg2)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-	}
-
-	if ((ZBX_FUNC_REGEXP == func || ZBX_FUNC_IREGEXP == func) && '@' == *arg1)
-	{
-		DCget_expressions_by_name(&regexps, arg1 + 1);
-
-		if (0 == regexps.values_num)
-		{
-			*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist", arg1 + 1);
-			goto out;
-		}
-	}
-
-	switch (arg2_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg2;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg2;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, ts))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 != values.values_num)
-	{
-		/* at this point the value type can be only str, text or log */
-		if (ITEM_VALUE_TYPE_LOG == item->value_type)
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				if (SUCCEED == (str_one_ret = evaluate_STR_one(func, &regexps,
-						values.values[i].value.log->value, arg1)))
-				{
-					found = 1;
-					break;
-				}
-
-				if (NOTSUPPORTED == str_one_ret)
-				{
-					*error = zbx_dsprintf(*error, "invalid regular expression \"%s\"", arg1);
-					goto out;
-				}
-			}
-		}
-		else
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				if (SUCCEED == (str_one_ret = evaluate_STR_one(func, &regexps,
-						values.values[i].value.str, arg1)))
-				{
-					found = 1;
-					break;
-				}
-
-				if (NOTSUPPORTED == str_one_ret)
-				{
-					*error = zbx_dsprintf(*error, "invalid regular expression \"%s\"", arg1);
-					goto out;
-				}
-			}
-		}
-	}
-
-	zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%d", found);
-	ret = SUCCEED;
-out:
-	zbx_regexp_clean_expressions(&regexps);
-	zbx_vector_ptr_destroy(&regexps);
-
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zbx_free(arg1);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-#undef ZBX_FUNC_STR
-#undef ZBX_FUNC_REGEXP
-#undef ZBX_FUNC_IREGEXP
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_STRLEN                                                  *
- *                                                                            *
- * Purpose: evaluate function 'strlen' for the item                           *
- *                                                                            *
- * Parameters: value - dynamic buffer                                         *
- *             item - item (performance metric)                               *
- *             parameters - Nth last value and time shift (optional)          *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_STRLEN(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int				arg1 = 1, ret = FAIL;
-	zbx_value_type_t		arg1_type = ZBX_VALUE_NVALUES;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_STR != item->value_type && ITEM_VALUE_TYPE_TEXT != item->value_type &&
-			ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_OPTIONAL, &arg1, &arg1_type))
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (ZBX_VALUE_NVALUES != arg1_type)
-		arg1 = 1;	/* non-# first parameter is ignored to support older syntax "strlen(0)" */
-
-	if (2 == num_param(parameters))
-	{
-		int			time_shift = 0;
-		zbx_value_type_t	time_shift_type = ZBX_VALUE_SECONDS;
-
-		if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift,
-				&time_shift_type) || ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-		{
-			*error = zbx_strdup(*error, "invalid second parameter");
-			goto out;
-		}
-
-		ts_end.sec -= time_shift;
-	}
-
-	if (SUCCEED == zbx_vc_get_values(item->itemid, item->value_type, &values, 0, arg1, &ts_end))
-	{
-		if (arg1 <= values.values_num)
-		{
-			size_t	sz, value_alloc = 0, value_offset = 0;
-			char	*hist_val;
-
-			hist_val = zbx_history_value2str_dyn(&values.values[arg1 - 1].value, item->value_type);
-			sz = zbx_strlen_utf8(hist_val);
-			zbx_free(hist_val);
-
-			zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_SIZE_T, sz);
-			ret = SUCCEED;
-		}
-		else
-		{
-			*error = zbx_strdup(*error, "not enough data");
-			goto out;
-		}
-	}
-	else
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-	}
-
-	zbx_history_record_vector_destroy(&values, item->value_type);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_FUZZYTIME                                               *
- *                                                                            *
- * Purpose: evaluate function 'fuzzytime' for the item                        *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_FUZZYTIME(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int			arg1, ret = FAIL;
-	zbx_value_type_t	arg1_type;
-	zbx_history_record_t	vc_value;
-	zbx_uint64_t		fuzlow, fuzhig;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 < num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (ZBX_VALUE_SECONDS != arg1_type || ts->sec <= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid argument type or value");
-		goto out;
-	}
-
-	if (SUCCEED != zbx_vc_get_value(item->itemid, item->value_type, ts, &vc_value))
-	{
-		*error = zbx_strdup(*error, "cannot get value from value cache");
-		goto out;
-	}
-
-	fuzlow = (int)(ts->sec - arg1);
-	fuzhig = (int)(ts->sec + arg1);
-
-	if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-	{
-		if (vc_value.value.ui64 >= fuzlow && vc_value.value.ui64 <= fuzhig)
-			*value = zbx_strdup(*value, "1");
-		else
-			*value = zbx_strdup(*value, "0");
-	}
-	else
-	{
-		if (vc_value.value.dbl >= fuzlow && vc_value.value.dbl <= fuzhig)
-			*value = zbx_strdup(*value, "1");
-		else
-			*value = zbx_strdup(*value, "0");
-	}
-
-	zbx_history_record_clear(&vc_value, item->value_type);
-
-	ret = SUCCEED;
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_BAND                                                    *
- *                                                                            *
- * Purpose: evaluate logical bitwise function 'and' for the item              *
- *                                                                            *
- * Parameters: value - dynamic buffer                                         *
- *             item - item (performance metric)                               *
- *             parameters - up to 3 comma-separated fields:                   *
- *                            (1) same as the 1st parameter for function      *
- *                                evaluate_LAST() (see documentation of       *
- *                                trigger function last()),                   *
- *                            (2) mask to bitwise AND with (mandatory),       *
- *                            (3) same as the 2nd parameter for function      *
- *                                evaluate_LAST() (see documentation of       *
- *                                trigger function last()).                   *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_BAND(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char		*last_parameters = NULL;
-	int		nparams, ret = FAIL;
-	zbx_uint64_t	last_uint64, mask;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto clean;
-	}
-
-	if (3 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto clean;
-	}
-
-	if (SUCCEED != get_function_parameter_uint64(parameters, 2, &mask))
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto clean;
-	}
-
-	/* prepare the 1st and the 3rd parameter for passing to evaluate_LAST() */
-	last_parameters = zbx_strdup(NULL, parameters);
-	remove_param(last_parameters, 2);
-
-	if (SUCCEED == evaluate_LAST(value, item, last_parameters, ts, error))
-	{
-		ZBX_STR2UINT64(last_uint64, *value);
-		/* 'and' bit operation cannot be larger than the source value, */
-		/* so the result can just be copied in value buffer            */
-		zbx_snprintf(*value, strlen(*value) + 1, ZBX_FS_UI64, last_uint64 & (zbx_uint64_t)mask);
-		ret = SUCCEED;
-	}
-
-	zbx_free(last_parameters);
-clean:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_FORECAST                                                *
- *                                                                            *
- * Purpose: evaluate function 'forecast' for the item                         *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_FORECAST(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char				*fit_str = NULL, *mode_str = NULL;
-	double				*t = NULL, *x = NULL;
-	int				nparams, time, arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift = 0;
-	zbx_value_type_t		time_type, time_shift_type = ZBX_VALUE_SECONDS, arg1_type;
-	unsigned int			k = 0;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			zero_time;
-	zbx_fit_t			fit;
-	zbx_mode_t			mode;
-	zbx_timespec_t			ts_end = *ts;
-	size_t				value_alloc = 0, value_offset = 0;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (3 > (nparams = num_param(parameters)) || nparams > 5)
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift, &time_shift_type) ||
-			ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 3, ZBX_PARAM_MANDATORY, &time, &time_type) ||
-			ZBX_VALUE_SECONDS != time_type)
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (4 <= nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 4, &fit_str) ||
-				SUCCEED != zbx_fit_code(fit_str, &fit, &k, error))
-		{
-			*error = zbx_strdup(*error, "invalid fourth parameter");
-			goto out;
-		}
-	}
-	else
-	{
-		fit = FIT_LINEAR;
-	}
-
-	if (5 == nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 5, &mode_str) ||
-				SUCCEED != zbx_mode_code(mode_str, &mode, error))
-		{
-			*error = zbx_strdup(*error, "invalid fifth parameter");
-			goto out;
-		}
-	}
-	else
-	{
-		mode = MODE_VALUE;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	ts_end.sec -= time_shift;
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
-		x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
-
-		zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
-		zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.dbl;
-			}
-		}
-		else
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.ui64;
-			}
-		}
-
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_DBL64, zbx_forecast(t, x,
-				values.values_num, ts->sec - zero_time.sec - 1.0e-9 * (zero_time.ns + 1), time, fit, k,
-				mode));
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "no data available");
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_DBL64, ZBX_MATH_ERROR);
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zbx_free(fit_str);
-	zbx_free(mode_str);
-
-	zbx_free(t);
-	zbx_free(x);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_TIMELEFT                                                *
- *                                                                            *
- * Purpose: evaluate function 'timeleft' for the item                         *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_TIMELEFT(char **value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char				*fit_str = NULL;
-	double				*t = NULL, *x = NULL, threshold;
-	int				nparams, arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift = 0;
-	zbx_value_type_t		arg1_type, time_shift_type = ZBX_VALUE_SECONDS;
-	unsigned			k = 0;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			zero_time;
-	zbx_fit_t			fit;
-	zbx_timespec_t			ts_end = *ts;
-	size_t				value_alloc = 0, value_offset = 0;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (3 > (nparams = num_param(parameters)) || nparams > 4)
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_OPTIONAL, &time_shift, &time_shift_type) ||
-			ZBX_VALUE_SECONDS != time_shift_type || 0 > time_shift)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_float( parameters, 3, ZBX_FLAG_DOUBLE_SUFFIX, &threshold))
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (4 == nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 4, &fit_str) ||
-				SUCCEED != zbx_fit_code(fit_str, &fit, &k, error))
-		{
-			*error = zbx_strdup(*error, "invalid fourth parameter");
-			goto out;
-		}
-	}
-	else
-	{
-		fit = FIT_LINEAR;
-	}
-
-	if ((FIT_EXPONENTIAL == fit || FIT_POWER == fit) && 0.0 >= threshold)
-	{
-		*error = zbx_strdup(*error, "exponential and power functions are always positive");
-		goto out;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	ts_end.sec -= time_shift;
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
-		x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
-
-		zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
-		zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.dbl;
-			}
-		}
-		else
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.ui64;
-			}
-		}
-
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_DBL64, zbx_timeleft(t, x,
-				values.values_num, ts->sec - zero_time.sec - 1.0e-9 * (zero_time.ns + 1), threshold,
-				fit, k));
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "no data available");
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, ZBX_FS_DBL64, ZBX_MATH_ERROR);
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zbx_free(fit_str);
-
-	zbx_free(t);
-	zbx_free(x);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: trends_parse_range                                               *
- *                                                                            *
- * Purpose: parse trend function period arguments into time range using old   *
- *          parameter format                                                  *
- *                                                                            *
- * Parameters: from         - [IN] the time the period shift is calculated    *
- *                                 from                                       *
- *             period       - [IN] the history period                         *
- *             period_shift - [IN] the history period shift                   *
- *             start        - [OUT] the period start time in seconds since    *
- *                                  Epoch                                     *
- *             end          - [OUT] the period end time in seconds since      *
- *                                  Epoch                                     *
- *             error        - [OUT] the error message if parsing failed       *
- *                                                                            *
- * Return value: SUCCEED - period was parsed successfully                     *
- *               FAIL    - invalid time period was specified                  *
- *                                                                            *
- * Comments: Daylight saving changes are applied when parsing ranges with     *
- *           day+ used as period base (now/?).                                *
- *                                                                            *
- *           Example period_shift values:                                     *
- *             now/d                                                          *
- *             now/d-1h                                                       *
- *             now/d+1h                                                       *
- *             now/d+1h/w                                                     *
- *             now/d/w/h+1h+2h                                                *
- *             now-1d/h                                                       *
- *                                                                            *
- *  Comments: This is temporary solution to keep calculated checks working    *
- *            until they are updated.                                         *
- *                                                                            *
- ******************************************************************************/
-static int	trends_parse_range(time_t from, const char *period, const char *period_shift, int *start, int *end,
-		char **error)
-{
-	int		period_num, period_hours[ZBX_TIME_UNIT_COUNT] = {0, 1, 24, 24 * 7, 24 * 30, 24 * 365};
-	zbx_time_unit_t	period_unit;
-	size_t		len;
-	struct tm	tm_end, tm_start;
-	const char	*p;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() period:%s shift:%s", __func__, period, period_shift);
-
-	/* parse period */
-
-	if (SUCCEED != zbx_tm_parse_period(period, &len, &period_num, &period_unit, error))
-		return FAIL;
-
-	if ('\0' != period[len])
-	{
-		*error = zbx_dsprintf(*error, "unexpected character[s] in period \"%s\"", period + len);
-		return FAIL;
-	}
-
-	if (period_hours[period_unit] * period_num > 24 * 366)
-	{
-		*error = zbx_strdup(*error, "period is too large");
-		return FAIL;
-	}
-
-	/* parse period shift */
-
-	p = period_shift;
-
-	if (0 != strncmp(p, "now", ZBX_CONST_STRLEN("now")))
-	{
-		*error = zbx_strdup(*error, "period shift must begin with \"now\"");
-		return FAIL;
-	}
-
-	p += ZBX_CONST_STRLEN("now");
-
-	localtime_r(&from, &tm_end);
-
-	while ('\0' != *p)
-	{
-		zbx_time_unit_t	unit;
-
-		if ('/' == *p)
-		{
-			if (ZBX_TIME_UNIT_UNKNOWN == (unit = zbx_tm_str_to_unit(++p)))
-			{
-				*error = zbx_dsprintf(*error, "unexpected character starting with \"%s\"", p);
-				return FAIL;
-			}
-
-			if (unit < period_unit)
-			{
-				*error = zbx_dsprintf(*error, "time units in period shift must be greater or equal"
-						" to period time unit");
-				return FAIL;
-			}
-
-			zbx_tm_round_down(&tm_end, unit);
-
-			/* unit is single character */
-			p++;
-		}
-		else if ('+' == *p || '-' == *p)
-		{
-			int	num;
-			char	op = *(p++);
-
-			if (FAIL == zbx_tm_parse_period(p, &len, &num, &unit, error))
-				return FAIL;
-
-			if (unit < period_unit)
-			{
-				*error = zbx_dsprintf(*error, "time units in period shift must be greater or equal"
-						" to period time unit");
-				return FAIL;
-			}
-
-			if ('+' == op)
-				zbx_tm_add(&tm_end, num, unit);
-			else
-				zbx_tm_sub(&tm_end, num, unit);
-
-			p += len;
-		}
-		else
-		{
-			*error = zbx_dsprintf(*error, "unexpected character starting with \"%s\"", p);
-			return FAIL;
-		}
-	}
-
-	tm_start = tm_end;
-
-	/* trends clock refers to the beginning of the hourly interval - subtract */
-	/* one hour to get the trends clock for the last hourly interval          */
-	zbx_tm_sub(&tm_end, 1, ZBX_TIME_UNIT_HOUR);
-
-	if (-1 == (*end = mktime(&tm_end)))
-	{
-		*error = zbx_dsprintf(*error, "cannot calculate the period end time: %s", zbx_strerror(errno));
-		return FAIL;
-	}
-
-	if (abs((int)from - *end) > SEC_PER_YEAR * 26)
-	{
-		*error = zbx_strdup(*error, "period shift is too large");
-		return FAIL;
-	}
-
-	zbx_tm_sub(&tm_start, period_num, period_unit);
-	if (-1 == (*start = mktime(&tm_start)))
-	{
-		*error = zbx_dsprintf(*error, "cannot calculate the period start time: %s", zbx_strerror(errno));
-		return FAIL;
-	}
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() start:%d end:%d", __func__, *start, *end);
-
-	return SUCCEED;
-}
-
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_TREND                                                   *
- *                                                                            *
- * Purpose: evaluate trend* functions for the item                            *
- *                                                                            *
- * Parameters: value      - [OUT] the function result                         *
- *             item       - [IN] item (performance metric)                    *
- *             func       - [IN] the trend function to evaluate               *
- *                               (avg, sum, count, delta, max, min)           *
- *             parameters - [IN] function parameters                          *
- *             ts         - [IN] the historical time when function must be    *
- *                               evaluated                                    *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_TREND(char **value, DC_ITEM *item, const char *func, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	int		ret = FAIL, start, end;
-	char		*period = NULL, *period_shift = NULL;
-	const char	*table;
-	double		value_dbl;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (SUCCEED != get_function_parameter_str(parameters, 1, &period))
-	{
-		*error = zbx_strdup(*error, "invalid first parameter");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_str(parameters, 2, &period_shift))
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (SUCCEED != trends_parse_range(ts->sec, period, period_shift, &start, &end, error))
-		goto out;
-
-	switch (item->value_type)
-	{
-		case ITEM_VALUE_TYPE_FLOAT:
-			table = "trends";
-			break;
-		case ITEM_VALUE_TYPE_UINT64:
-			table = "trends_uint";
-			break;
-		default:
-			*error = zbx_strdup(*error, "unsupported value type");
-			goto out;
-	}
-
-	if (0 == strcmp(func, "avg"))
-	{
-		ret = zbx_trends_eval_avg(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "count"))
-	{
-		ret = zbx_trends_eval_count(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "delta"))
-	{
-		ret = zbx_trends_eval_delta(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "max"))
-	{
-		ret = zbx_trends_eval_max(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "min"))
-	{
-		ret = zbx_trends_eval_min(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "sum"))
-	{
-		ret = zbx_trends_eval_sum(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else
-	{
-		*error = zbx_strdup(*error, "unknown trend function");
-		goto out;
-	}
-
-	if (SUCCEED == ret)
-		*value = zbx_dsprintf(*value, ZBX_FS_DBL64, value_dbl);
-out:
-	zbx_free(period);
-	zbx_free(period_shift);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_function                                                *
- *                                                                            *
- * Purpose: evaluate function                                                 *
- *                                                                            *
- * Parameters: item      - item to calculate function for                     *
- *             function  - function (for example, 'max')                      *
- *             parameter - parameter of the function                          *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, value contains its value   *
- *               FAIL - evaluation failed                                     *
- *                                                                            *
- ******************************************************************************/
-int	evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter,
-		const zbx_timespec_t *ts, char **error)
-{
-	int		ret;
-	struct tm	*tm = NULL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s:%s.%s(%s)' ts:'%s\'", __func__,
-			item->host.host, item->key_orig, function, parameter, zbx_timespec_str(ts));
-
-	if (0 == strcmp(function, "last"))
-	{
-		ret = evaluate_LAST(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "prev"))
-	{
-		ret = evaluate_LAST(value, item, "#2", ts, error);
-	}
-	else if (0 == strcmp(function, "min"))
-	{
-		ret = evaluate_MIN(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "max"))
-	{
-		ret = evaluate_MAX(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "avg"))
-	{
-		ret = evaluate_AVG(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "sum"))
-	{
-		ret = evaluate_SUM(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "percentile"))
-	{
-		ret = evaluate_PERCENTILE(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "count"))
-	{
-		ret = evaluate_COUNT(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "delta"))
-	{
-		ret = evaluate_DELTA(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "nodata"))
-	{
-		ret = evaluate_NODATA(value, item, parameter, error);
-	}
-	else if (0 == strcmp(function, "date"))
-	{
-		size_t	value_alloc = 0, value_offset = 0;
-		time_t	now = ts->sec;
-
-		tm = localtime(&now);
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%.4d%.2d%.2d",
-				tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
-		ret = SUCCEED;
-	}
-	else if (0 == strcmp(function, "dayofweek"))
-	{
-		size_t	value_alloc = 0, value_offset = 0;
-		time_t	now = ts->sec;
-
-		tm = localtime(&now);
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%d", 0 == tm->tm_wday ? 7 : tm->tm_wday);
-		ret = SUCCEED;
-	}
-	else if (0 == strcmp(function, "dayofmonth"))
-	{
-		size_t	value_alloc = 0, value_offset = 0;
-		time_t	now = ts->sec;
-
-		tm = localtime(&now);
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%d", tm->tm_mday);
-		ret = SUCCEED;
-	}
-	else if (0 == strcmp(function, "time"))
-	{
-		size_t	value_alloc = 0, value_offset = 0;
-		time_t	now = ts->sec;
-
-		tm = localtime(&now);
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%.2d%.2d%.2d", tm->tm_hour, tm->tm_min,
-				tm->tm_sec);
-		ret = SUCCEED;
-	}
-	else if (0 == strcmp(function, "abschange"))
-	{
-		ret = evaluate_ABSCHANGE(value, item, ts, error);
-	}
-	else if (0 == strcmp(function, "change"))
-	{
-		ret = evaluate_CHANGE(value, item, ts, error);
-	}
-	else if (0 == strcmp(function, "diff"))
-	{
-		ret = evaluate_DIFF(value, item, ts, error);
-	}
-	else if (0 == strcmp(function, "str") || 0 == strcmp(function, "regexp") || 0 == strcmp(function, "iregexp"))
-	{
-		ret = evaluate_STR(value, item, function, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "strlen"))
-	{
-		ret = evaluate_STRLEN(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "now"))
-	{
-		size_t	value_alloc = 0, value_offset = 0;
-
-		zbx_snprintf_alloc(value, &value_alloc, &value_offset, "%d", ts->sec);
-		ret = SUCCEED;
-	}
-	else if (0 == strcmp(function, "fuzzytime"))
-	{
-		ret = evaluate_FUZZYTIME(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "logeventid"))
-	{
-		ret = evaluate_LOGEVENTID(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "logseverity"))
-	{
-		ret = evaluate_LOGSEVERITY(value, item, ts, error);
-	}
-	else if (0 == strcmp(function, "logsource"))
-	{
-		ret = evaluate_LOGSOURCE(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "band"))
-	{
-		ret = evaluate_BAND(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "forecast"))
-	{
-		ret = evaluate_FORECAST(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "timeleft"))
-	{
-		ret = evaluate_TIMELEFT(value, item, parameter, ts, error);
-	}
-	else if (0 == strncmp(function, "trend", 5))
-	{
-		ret = evaluate_TREND(value, item, function + 5, parameter, ts, error);
-	}
-	else
-	{
-		*value = zbx_malloc(*value, 1);
-		(*value)[0] = '\0';
-		*error = zbx_strdup(*error, "function is not supported");
-		ret = FAIL;
-	}
-
-	if (SUCCEED == ret)
-		del_zeros(*value);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s value:'%s'", __func__, zbx_result_string(ret), ZBX_NULL2STR(*value));
-
-	return ret;
-}
-
 /******************************************************************************
  *                                                                            *
  * Function: add_value_suffix_uptime                                          *
@@ -3720,117 +615,6 @@ void	zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid,
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_macro_function                                          *
- *                                                                            *
- * Purpose: evaluate function used in simple macro                            *
- *                                                                            *
- * Parameters: result    - [OUT] evaluation result (if it's successful)       *
- *             host      - [IN] host the key belongs to                       *
- *             key       - [IN] item's key                                    *
- *                              (for example, 'system.cpu.load[,avg1]')       *
- *             function  - [IN] function name (for example, 'max')            *
- *             parameter - [IN] function parameter list                       *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, value contains its value   *
- *               FAIL - evaluation failed                                     *
- *                                                                            *
- * Comments: used for evaluation of notification macros                       *
- *                                                                            *
- ******************************************************************************/
-int	evaluate_macro_function(char **result, const char *host, const char *key, const char *function,
-		const char *parameter, zbx_output_format_t format)
-{
-	zbx_host_key_t	host_key = {(char *)host, (char *)key};
-	DC_ITEM		item;
-	char		*value = NULL, *error = NULL, *resolved_params = NULL;
-	int		ret, errcode;
-	zbx_timespec_t	ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s:%s.%s(%s)'", __func__, host, key, function, parameter);
-
-	DCconfig_get_items_by_keys(&item, &host_key, &errcode, 1);
-
-	zbx_timespec(&ts);
-
-	/* User macros in trigger and calculated function parameters are resolved during configuration sync. */
-	/* However simple macro user parameters are not expanded, do it now.                                 */
-
-	if (SUCCEED != errcode || SUCCEED != evaluate_function(&value, &item, function,
-			(resolved_params = zbx_dc_expand_user_macros_in_func_params(parameter, item.host.hostid)),
-			&ts, &error))
-	{
-		char	*msg;
-
-		msg = zbx_eval_format_function_error(function, host, key, parameter,
-				(NULL == error ? "item does not exist" : error));
-		zabbix_log(LOG_LEVEL_DEBUG, "%s", msg);
-		zbx_free(msg);
-		ret = FAIL;
-	}
-	else
-	{
-		if (ZBX_FORMAT_HUMAN == format)
-		{
-			size_t	len;
-
-			len = strlen(value) + 1 + MAX_BUFFER_LEN;
-			value = (char *)zbx_realloc(value, len);
-
-			if (SUCCEED == str_in_list("last,prev", function, ','))
-			{
-				/* last, prev functions can return quoted and escaped string values */
-				/* which must be unquoted and unescaped before further processing   */
-				if ('"' == *value)
-				{
-					char	*src, *dst;
-
-					for (dst = value, src = dst + 1; '"' != *src; )
-					{
-						if ('\\' == *src)
-							src++;
-						if ('\0' == *src)
-							break;
-						*dst++ = *src++;
-					}
-					*dst = '\0';
-				}
-				zbx_format_value(value, len, item.valuemapid, item.units, item.value_type);
-			}
-			else if (SUCCEED == str_in_list("abschange,avg,change,delta,max,min,percentile,sum,forecast", function,
-					','))
-			{
-				switch (item.value_type)
-				{
-					case ITEM_VALUE_TYPE_FLOAT:
-					case ITEM_VALUE_TYPE_UINT64:
-						add_value_suffix(value, len, item.units, item.value_type);
-						break;
-					default:
-						;
-				}
-			}
-			else if (SUCCEED == str_in_list("timeleft", function, ','))
-			{
-				add_value_suffix(value, len, "s", ITEM_VALUE_TYPE_FLOAT);
-			}
-		}
-
-		*result = zbx_strdup(NULL, value);
-		ret = SUCCEED;
-	}
-
-	DCconfig_clean_items(&item, &errcode, 1);
-	zbx_free(error);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s value:'%s'", __func__, zbx_result_string(ret), value);
-	zbx_free(value);
-	zbx_free(resolved_params);
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: evaluatable_for_notsupported                                     *
  *                                                                            *
  * Purpose: check is function to be evaluated for NOTSUPPORTED items          *
diff --git a/src/libs/zbxserver/evalfunc.h b/src/libs/zbxserver/evalfunc.h
index 919da491f19..4bbe243c1d8 100644
--- a/src/libs/zbxserver/evalfunc.h
+++ b/src/libs/zbxserver/evalfunc.h
@@ -20,15 +20,6 @@
 #ifndef ZABBIX_EVALFUNC_H
 #define ZABBIX_EVALFUNC_H
 
-typedef enum
-{
-	ZBX_FORMAT_RAW,
-	ZBX_FORMAT_HUMAN
-}
-zbx_output_format_t;
-
-int	evaluate_macro_function(char **result, const char *host, const char *key, const char *function,
-		const char *parameter, zbx_output_format_t format);
 int	zbx_evaluatable_for_notsupported(const char *fn);
 
 #endif
diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c
index 54e3a1f2b3c..7712b223d16 100644
--- a/src/libs/zbxserver/expression.c
+++ b/src/libs/zbxserver/expression.c
@@ -1788,9 +1788,8 @@ static const char	*ex_macros[] =
 	NULL
 };
 
-/* macros that are supported as simple macro host and item key */
-static const char	*simple_host_macros[] = {MVAR_HOST_HOST, MVAR_HOSTNAME, NULL};
-static const char	*simple_key_macros[] = {MVAR_ITEM_KEY, MVAR_TRIGGER_KEY, NULL};
+/* macros that are supported as host macro */
+static const char	*host_macros[] = {MVAR_HOST_HOST, MVAR_HOSTNAME, NULL};
 
 typedef struct
 {
@@ -2596,68 +2595,6 @@ static const char	*func_macro_in_list(const char *str, zbx_token_func_macro_t *f
 
 /******************************************************************************
  *                                                                            *
- * Function: get_trigger_function_value                                       *
- *                                                                            *
- * Purpose: trying to evaluate a trigger function                             *
- *                                                                            *
- * Parameters: expression - [IN] trigger expression, source of hostnames and  *
- *                            item keys for {HOST.HOST} and {ITEM.KEY} macros *
- *             replace_to - [OUT] evaluation result                           *
- *             data       - [IN] string containing simple macro               *
- *             macro      - [IN] simple macro token location in string        *
- *                                                                            *
- * Return value: SUCCEED - successfully evaluated or invalid macro(s) in host *
- *                           and/or item key positions (in the latter case    *
- *                           replace_to remains unchanged and simple macro    *
- *                           shouldn't be replaced with anything)             *
- *               FAIL    - evaluation failed and macro has to be replaced     *
- *                           with STR_UNKNOWN_VARIABLE ("*UNKNOWN*")          *
- *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
- * Comments: example: " {Zabbix server:{ITEM.KEY1}.last(0)} " to " 1.34 "     *
- *                                                                            *
- ******************************************************************************/
-static int	get_trigger_function_value(const DB_TRIGGER *trigger, char **replace_to, char *data,
-		const zbx_token_simple_macro_t *simple_macro, zbx_output_format_t format)
-{
-	char	*host = NULL, *key = NULL;
-	int	N_functionid, ret = FAIL;
-
-	if (NULL != macro_in_list(data, simple_macro->host, simple_host_macros, &N_functionid))
-	{
-		if (SUCCEED != DBget_trigger_value(trigger, &host, N_functionid, ZBX_REQUEST_HOST_HOST))
-			goto out;
-	}
-
-	if (NULL != macro_in_list(data, simple_macro->key, simple_key_macros, &N_functionid))
-	{
-		if (SUCCEED != DBget_trigger_value(trigger, &key, N_functionid, ZBX_REQUEST_ITEM_KEY_ORIG))
-			goto out;
-	}
-
-	data[simple_macro->host.r + 1] = '\0';
-	data[simple_macro->key.r + 1] = '\0';
-	data[simple_macro->func_param.l] = '\0';
-	data[simple_macro->func_param.r] = '\0';
-
-	ret = evaluate_macro_function(replace_to, (NULL == host ? data + simple_macro->host.l : host),
-			(NULL == key ? data + simple_macro->key.l : key), data + simple_macro->func.l,
-			data + simple_macro->func_param.l + 1, format);
-
-	data[simple_macro->host.r + 1] = ':';
-	data[simple_macro->key.r + 1] = '.';
-	data[simple_macro->func_param.l] = '(';
-	data[simple_macro->func_param.r] = ')';
-out:
-	zbx_free(host);
-	zbx_free(key);
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: get_expression_macro_result                                      *
  *                                                                            *
  * Purpose: calculate result of expression macro                              *
@@ -2666,19 +2603,21 @@ out:
  *               otherwise FAIL                                               *
  *                                                                            *
  ******************************************************************************/
-static int	get_expression_macro_result(const DB_EVENT *event, const DB_EVENT *r_event, const char *expression,
-		char **replace_to, char **error)
+static int	get_expression_macro_result(const DB_EVENT *event, char *data, zbx_strloc_t *loc,
+		zbx_timespec_t *ts, char **replace_to, char **error)
 {
 	int				ret = FAIL;
 	zbx_eval_context_t		ctx;
 	const zbx_vector_uint64_t	*hostids;
-	zbx_timespec_t			ts;
 	zbx_variant_t			value;
 	zbx_expression_eval_t		eval;
+	char				*expression = NULL;
+	size_t				exp_alloc = 0, exp_offset = 0;
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() expression:'%s'", __func__, expression);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
-	ZBX_UNUSED(r_event);
+	zbx_strncpy_alloc(&expression, &exp_alloc, &exp_offset, data + loc->l, loc->r - loc->l + 1);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() expression: '%s'", __func__, expression);
 
 	if (SUCCEED != zbx_eval_parse_expression(&ctx, expression, ZBX_EVAL_PARSE_EXPRESSION_MACRO, error))
 		goto out;
@@ -2695,13 +2634,10 @@ static int	get_expression_macro_result(const DB_EVENT *event, const DB_EVENT *r_
 		goto out;
 	}
 
-	ts.sec = event->clock;
-	ts.ns = event->ns;
-
 	zbx_expression_eval_init(&eval, ZBX_EXPRESSION_NORMAL, &ctx);
 	zbx_expression_eval_resolve_trigger_hosts(&eval, &event->trigger);
 
-	if (SUCCEED == (ret = zbx_expression_eval_execute(&eval, &ts, &value, error)))
+	if (SUCCEED == (ret = zbx_expression_eval_execute(&eval, ts, &value, error)))
 	{
 		*replace_to = zbx_strdup(NULL, zbx_variant_value_desc(&value));
 		zbx_variant_clear(&value);
@@ -2710,6 +2646,7 @@ static int	get_expression_macro_result(const DB_EVENT *event, const DB_EVENT *r_
 	zbx_expression_eval_clear(&eval);
 out:
 	zbx_eval_clear(&ctx);
+	zbx_free(expression);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
 
@@ -2928,8 +2865,11 @@ static int	substitute_simple_macros_impl(const zbx_uint64_t *actionid, const DB_
 	if (0 != (macro_type & (MACRO_TYPE_TRIGGER_DESCRIPTION | MACRO_TYPE_EVENT_NAME)))
 		token_search |= ZBX_TOKEN_SEARCH_REFERENCES;
 
-	if (0 != (macro_type & (MACRO_TYPE_EVENT_NAME)))
+	if (0 != (macro_type & (MACRO_TYPE_MESSAGE_NORMAL | MACRO_TYPE_MESSAGE_RECOVERY | MACRO_TYPE_MESSAGE_UPDATE |
+			MACRO_TYPE_EVENT_NAME)))
+	{
 		token_search |= ZBX_TOKEN_SEARCH_EXPRESSION_MACRO;
+	}
 
 	if (SUCCEED != zbx_token_find(*data, pos, &token, token_search))
 		return res;
@@ -2989,19 +2929,6 @@ static int	substitute_simple_macros_impl(const zbx_uint64_t *actionid, const DB_
 				c = (*data)[token.loc.r + 1];
 				(*data)[token.loc.r + 1] = '\0';
 				break;
-			case ZBX_TOKEN_SIMPLE_MACRO:
-				if (0 == (macro_type & (MACRO_TYPE_MESSAGE_NORMAL | MACRO_TYPE_MESSAGE_RECOVERY |
-							MACRO_TYPE_MESSAGE_UPDATE | MACRO_TYPE_SCRIPT_NORMAL |
-							MACRO_TYPE_SCRIPT_RECOVERY)) ||
-						EVENT_SOURCE_TRIGGERS != ((NULL != r_event) ? r_event : event)->source)
-				{
-					pos++;
-					continue;
-				}
-				/* These macros (and probably all other in the future) must be resolved using only */
-				/* information stored in token.data union. For now, force crash if they rely on m. */
-				m = NULL;
-				break;
 			case ZBX_TOKEN_REFERENCE:
 			case ZBX_TOKEN_EXPRESSION_MACRO:
 				/* These macros (and probably all other in the future) must be resolved using only */
@@ -3045,10 +2972,23 @@ static int	substitute_simple_macros_impl(const zbx_uint64_t *actionid, const DB_
 
 					pos = token.loc.r;
 				}
-				else if (ZBX_TOKEN_SIMPLE_MACRO == token.type)
+				else if (ZBX_TOKEN_EXPRESSION_MACRO == token.type)
 				{
-					ret = get_trigger_function_value(&c_event->trigger, &replace_to,
-							*data, &token.data.simple_macro, ZBX_FORMAT_HUMAN);
+					zbx_timespec_t	ts;
+					char		*errmsg = NULL;
+
+					zbx_timespec(&ts);
+
+					if (SUCCEED != (ret = get_expression_macro_result(event, *data,
+							&inner_token.data.expression_macro.expression, &ts, &replace_to,
+							&errmsg)))
+					{
+						*errmsg = tolower(*errmsg);
+						zabbix_log(LOG_LEVEL_DEBUG, "%s() cannot evaluate"
+								" expression macro: %s", __func__, errmsg);
+						zbx_strlcpy(error, errmsg, maxerrlen);
+						zbx_free(errmsg);
+					}
 				}
 				else if (NULL != actionid &&
 						0 == strncmp(m, MVAR_ACTION, ZBX_CONST_STRLEN(MVAR_ACTION)))
@@ -4249,18 +4189,15 @@ static int	substitute_simple_macros_impl(const zbx_uint64_t *actionid, const DB_
 				{
 					if (0 != (macro_type & MACRO_TYPE_EVENT_NAME))
 					{
-						char		*exp = NULL, *errmsg = NULL;
-						size_t		exp_alloc = 0, exp_offset = 0;
-						zbx_strloc_t	*loc = &inner_token.data.expression_macro.expression;
-
-						zbx_strncpy_alloc(&exp, &exp_alloc, &exp_offset, *data + loc->l,
-								loc->r - loc->l + 1);
+						zbx_timespec_t	ts;
+						char		*errmsg = NULL;
 
-						ret = get_expression_macro_result(event, r_event, exp, &replace_to,
-								&errmsg);
-						zbx_free(exp);
+						ts.sec = event->clock;
+						ts.ns = event->ns;
 
-						if (SUCCEED != ret)
+						if (SUCCEED != (ret = get_expression_macro_result(event, *data,
+								&inner_token.data.expression_macro.expression, &ts,
+								&replace_to, &errmsg)))
 						{
 							*errmsg = tolower(*errmsg);
 							zabbix_log(LOG_LEVEL_DEBUG, "%s() cannot evaluate"
@@ -5671,62 +5608,6 @@ void	evaluate_expressions(zbx_vector_ptr_t *triggers, const zbx_vector_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: process_simple_macro_token                                       *
- *                                                                            *
- * Purpose: trying to resolve the discovery macros in item key parameters     *
- *          in simple macros like {host:key[].func()}                         *
- *                                                                            *
- ******************************************************************************/
-static int	process_simple_macro_token(char **data, zbx_token_t *token, const struct zbx_json_parse *jp_row,
-		const zbx_vector_ptr_t *lld_macro_paths, char *error, size_t max_error_len)
-{
-	char	*key = NULL, *replace_to = NULL, *dot, *params;
-	size_t	replace_to_offset = 0, replace_to_alloc = 128, lld_start, lld_end;
-	int	ret = FAIL;
-
-	if ('{' == (*data)[token->data.simple_macro.host.l] &&
-			NULL == macro_in_list(*data, token->data.simple_macro.host, simple_host_macros, NULL))
-	{
-		goto out;
-	}
-
-	replace_to = (char *)zbx_malloc(NULL, replace_to_alloc);
-
-	lld_start = token->data.simple_macro.key.l;
-	lld_end = token->data.simple_macro.func_param.r - 1;
-	dot = *data + token->data.simple_macro.key.r + 1;
-	params = *data + token->data.simple_macro.func_param.l + 1;
-
-	/* extract key and substitute macros */
-	*dot = '\0';
-	key = zbx_strdup(key, *data + token->data.simple_macro.key.l);
-	substitute_key_macros_impl(&key, NULL, NULL, jp_row, lld_macro_paths, MACRO_TYPE_ITEM_KEY, NULL, 0);
-	*dot = '.';
-
-	zbx_strcpy_alloc(&replace_to, &replace_to_alloc, &replace_to_offset, key);
-	zbx_strncpy_alloc(&replace_to, &replace_to_alloc, &replace_to_offset, dot, params - dot);
-
-	/* substitute macros in function parameters */
-	if (SUCCEED != substitute_function_lld_param(params, *data + lld_end - params + 1, 0, &replace_to,
-			&replace_to_alloc, &replace_to_offset, jp_row, lld_macro_paths, error, max_error_len))
-	{
-		goto out;
-	}
-
-	/* replace LLD part in original string and adjust token boundary */
-	zbx_replace_string(data, lld_start, &lld_end, replace_to);
-	token->loc.r += lld_end - (token->data.simple_macro.func_param.r - 1);
-
-	ret = SUCCEED;
-out:
-	zbx_free(replace_to);
-	zbx_free(key);
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: process_lld_macro_token                                          *
  *                                                                            *
  * Purpose: expand discovery macro in expression                              *
@@ -6225,11 +6106,6 @@ static int	substitute_func_macro(char **data, zbx_token_t *token, const struct z
  *                            without validation of the value type            *
  *                           ZBX_MACRO_NUMERIC - values for LLD macros should *
  *                            be numeric                                      *
- *                           ZBX_MACRO_SIMPLE - LLD macros, located in the    *
- *                            item key parameters in simple macros will be    *
- *                            resolved considering quotes.                    *
- *                            Flag ZBX_MACRO_NUMERIC doesn't affect these     *
- *                            macros.                                         *
  *                           ZBX_MACRO_FUNC - function macros will be         *
  *                            skipped (lld macros inside function macros will *
  *                            be ignored) for macros specified in func_macros *
@@ -6285,11 +6161,6 @@ int	substitute_lld_macros(char **data, const struct zbx_json_parse *jp_row, cons
 							max_error_len);
 					pos = token.loc.r;
 					break;
-				case ZBX_TOKEN_SIMPLE_MACRO:
-					process_simple_macro_token(data, &token, jp_row, lld_macro_paths, error,
-							max_error_len);
-					pos = token.loc.r;
-					break;
 				case ZBX_TOKEN_FUNC_MACRO:
 					if (NULL != func_macro_in_list(*data, &token.data.func_macro, NULL))
 					{
@@ -6989,7 +6860,7 @@ int	zbx_host_macro_index(const char *macro)
 	loc.l = 0;
 	loc.r = strlen(macro) - 1;
 
-	if (NULL != macro_in_list(macro, loc, simple_host_macros, &func_num))
+	if (NULL != macro_in_list(macro, loc, host_macros, &func_num))
 		return func_num;
 
 	return -1;
diff --git a/src/libs/zbxservice/service_protocol.c b/src/libs/zbxservice/service_protocol.c
index 91a9f52c0e7..d7a2bd36900 100644
--- a/src/libs/zbxservice/service_protocol.c
+++ b/src/libs/zbxservice/service_protocol.c
@@ -298,7 +298,7 @@ void	zbx_service_deserialize_rootcause(const unsigned char *data, zbx_uint32_t s
 			continue;
 
 		if (NULL != service)
-			zbx_vector_uint64_reserve(&service->eventids, values_num);
+			zbx_vector_uint64_reserve(&service->eventids, (size_t)values_num);
 
 		for (i = 0; i < values_num; i++)
 		{
@@ -353,3 +353,43 @@ void	zbx_service_deserialize_parentids(const unsigned char *data, zbx_vector_uin
 		zbx_vector_uint64_append(ids, id);
 	}
 }
+
+zbx_uint32_t	zbx_service_serialize_event_severities(unsigned char **data, const zbx_vector_ptr_t *event_severities)
+{
+	zbx_uint32_t		size;
+	unsigned char		*ptr;
+	int			i;
+	zbx_event_severity_t	*es;
+
+	size = sizeof(event_severities->values_num);
+	size += (zbx_uint32_t)event_severities->values_num * (sizeof(es->eventid) + sizeof(es->severity));
+	ptr = *data = (unsigned char *)zbx_malloc(NULL, size);
+
+	ptr += zbx_serialize_value(ptr, event_severities->values_num);
+	for (i = 0; i < event_severities->values_num; i++)
+	{
+		es = (zbx_event_severity_t *)event_severities->values[i];
+
+		ptr += zbx_serialize_value(ptr, es->eventid);
+		ptr += zbx_serialize_value(ptr, es->severity);
+	}
+
+	return size;
+}
+
+void	zbx_service_deserialize_event_severities(const unsigned char *data, zbx_vector_ptr_t *event_severities)
+{
+	int			i, es_num;
+	zbx_event_severity_t	*es;
+
+	data += zbx_deserialize_value(data, &es_num);
+	zbx_vector_ptr_reserve(event_severities, (size_t)es_num);
+
+	for (i = 0; i < es_num; i++)
+	{
+		es = (zbx_event_severity_t *)zbx_malloc(NULL, sizeof(zbx_event_severity_t));
+		data += zbx_deserialize_value(data, &es->eventid);
+		data += zbx_deserialize_value(data, &es->severity);
+		zbx_vector_ptr_append(event_severities, es);
+	}
+}
diff --git a/src/libs/zbxsysinfo/win32/net.c b/src/libs/zbxsysinfo/win32/net.c
index 31059d9e707..94533292e9f 100644
--- a/src/libs/zbxsysinfo/win32/net.c
+++ b/src/libs/zbxsysinfo/win32/net.c
@@ -22,6 +22,8 @@
 #include "log.h"
 #include "zbxjson.h"
 
+#define ZBX_GUID_LEN	38
+
 /* __stdcall calling convention is used for GetIfEntry2(). In order to declare a */
 /* pointer to GetIfEntry2() we have to expand NETIOPAPI_API macro manually since */
 /* part of it must be together with the pointer name in the parentheses.         */
@@ -269,7 +271,7 @@ static ULONG64	zbx_ifrow_get_out_discards(const zbx_ifrow_t *pIfRow)
  * Parameters:                                                                *
  *     pIfRow      - [IN] pointer to initialized zbx_ifrow_t variable         *
  *                                                                            *
- * Comments: returns pointer do dynamically-allocated memory, caller must     *
+ * Comments: returns pointer to dynamically-allocated memory, caller must     *
  *           free it                                                          *
  *                                                                            *
  ******************************************************************************/
@@ -302,6 +304,40 @@ static char	*zbx_ifrow_get_utf8_description(const zbx_ifrow_t *pIfRow)
 	}
 }
 
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_ifrow_get_guid_str                                           *
+ *                                                                            *
+ * Purpose: returns interface GUID in string format                           *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     pIfRow      - [IN] pointer to initialized zbx_ifrow_t variable         *
+ *                                                                            *
+ * Comments: returns pointer to dynamically-allocated memory, caller must     *
+ *           free it                                                          *
+ *                                                                            *
+ ******************************************************************************/
+static char	*zbx_ifrow_get_guid_str(const zbx_ifrow_t *pIfRow)
+{
+	char	*guid_cstr = NULL;
+	size_t	guid_alloc = 0, guid_offset = 0;
+
+	if (NULL != pIfRow->ifRow2)
+	{
+		GUID	*guid;
+
+		guid = &pIfRow->ifRow2->InterfaceGuid;
+
+		zbx_snprintf_alloc(&guid_cstr, &guid_alloc, &guid_offset,
+				"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+				guid->Data1, guid->Data2, guid->Data3,
+				guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
+				guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
+	}
+
+	return guid_cstr;
+}
+
 /*
  * returns interface statistics by IP address or interface name
  */
@@ -362,8 +398,12 @@ static int	get_if_stats(const char *if_name, zbx_ifrow_t *ifrow)
 			continue;
 		}
 
-		utf8_descr = zbx_ifrow_get_utf8_description(ifrow);
-		if (0 == strcmp(if_name, utf8_descr))
+		if (ZBX_GUID_LEN == strlen(if_name) && '{' == if_name[0] && '}' == if_name[ZBX_GUID_LEN - 1])
+			utf8_descr = zbx_ifrow_get_guid_str(ifrow);
+		else
+			utf8_descr = zbx_ifrow_get_utf8_description(ifrow);
+
+		if (NULL != utf8_descr && 0 == strcmp(if_name, utf8_descr))
 			ret = SUCCEED;
 		zbx_free(utf8_descr);
 
@@ -556,7 +596,7 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_ifrow_t	ifrow = {NULL, NULL};
 
 	struct zbx_json	j;
-	char 		*utf8_descr;
+	char 		*utf8_descr, *guid;
 
 	/* Allocate memory for our pointers. */
 	dwSize = sizeof(MIB_IFTABLE);
@@ -597,6 +637,10 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 		zbx_json_addstring(&j, "{#IFNAME}", utf8_descr, ZBX_JSON_TYPE_STRING);
 		zbx_free(utf8_descr);
 
+		guid = zbx_ifrow_get_guid_str(&ifrow);
+		zbx_json_addstring(&j, "{#IFGUID}", ZBX_NULL2EMPTY_STR(guid), ZBX_JSON_TYPE_STRING);
+		zbx_free(guid);
+
 		zbx_json_close(&j);
 	}
 
diff --git a/src/libs/zbxtrends/trends.c b/src/libs/zbxtrends/trends.c
index b0fdd9e26ec..56962f5b8c1 100644
--- a/src/libs/zbxtrends/trends.c
+++ b/src/libs/zbxtrends/trends.c
@@ -622,26 +622,6 @@ int	zbx_trends_eval_count(const char *table, zbx_uint64_t itemid, int start, int
 	return SUCCEED;
 }
 
-int	zbx_trends_eval_delta(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error)
-{
-	zbx_trend_state_t	state;
-
-	if (FAIL == zbx_tfc_get_value(itemid, start, end, ZBX_TREND_FUNCTION_DELTA, value, &state))
-	{
-		state = trends_eval(table, itemid, start, end, "value_max-value_min", "max(value_max)-min(value_min)",
-				value);
-		zbx_tfc_put_value(itemid, start, end, ZBX_TREND_FUNCTION_DELTA, *value, state);
-	}
-
-	if (ZBX_TREND_STATE_NORMAL == state)
-		return SUCCEED;
-
-	if (NULL != error)
-		*error = zbx_strdup(*error, trends_errors[state]);
-
-	return FAIL;
-}
-
 int	zbx_trends_eval_max(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error)
 {
 	zbx_trend_state_t	state;
diff --git a/src/zabbix_agent/eventlog.c b/src/zabbix_agent/eventlog.c
index 552b4fe92a9..1208c18e8ab 100644
--- a/src/zabbix_agent/eventlog.c
+++ b/src/zabbix_agent/eventlog.c
@@ -335,45 +335,78 @@ static void	zbx_translate_message_params(char **message, HINSTANCE hLib)
 	}
 }
 
-/* open eventlog using API 6 and return the number of records */
-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, char **error)
+static int get_eventlog6_id(EVT_HANDLE *event_query, EVT_HANDLE *render_context, zbx_uint64_t *id, char **error)
 {
-	EVT_HANDLE	log = NULL;
-	EVT_VARIANT	var;
-	EVT_HANDLE	tmp_all_event_query = NULL;
-	EVT_HANDLE	event_bookmark = NULL;
-	EVT_VARIANT*	renderedContent = NULL;
-	DWORD		status = 0;
+	int		ret = FAIL;
 	DWORD		size_required = 0;
 	DWORD		size = DEFAULT_EVENT_CONTENT_SIZE;
+	DWORD		status = 0;
 	DWORD		bookmarkedCount = 0;
-	zbx_uint64_t	numIDs = 0;
-	char		*tmp_str = NULL;
-	int		ret = FAIL;
-
-	*FirstID = 0;
-	*LastID = 0;
+	EVT_VARIANT*	renderedContent = NULL;
+	EVT_HANDLE	event_bookmark = NULL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
-	/* try to open the desired log */
-	if (NULL == (log = EvtOpenLog(NULL, wsource, EvtOpenChannelPath)))
+	/* get the entries and allocate the required space */
+	renderedContent = zbx_malloc(renderedContent, size);
+
+	if (TRUE != EvtNext(*event_query, 1, &event_bookmark, INFINITE, 0, &size_required))
 	{
-		status = GetLastError();
-		tmp_str = zbx_unicode_to_utf8(wsource);
-		*error = zbx_dsprintf(*error, "cannot open eventlog '%s':%s", tmp_str, strerror_from_system(status));
+		/* no data in eventlog */
+		zabbix_log(LOG_LEVEL_DEBUG, "%s() EvtNext failed:%s", __func__, strerror_from_system(GetLastError()));
+		*id = 0;
+		ret = SUCCEED;
 		goto out;
 	}
 
-	/* obtain the number of records in the log */
-	if (TRUE != EvtGetLogInfo(log, EvtLogNumberOfLogRecords, sizeof(var), &var, &size_required))
+	/* obtain the information from selected events */
+	if (TRUE != EvtRender(*render_context, event_bookmark, EvtRenderEventValues, size, renderedContent,
+			&size_required, &bookmarkedCount))
 	{
-		*error = zbx_dsprintf(*error, "EvtGetLogInfo failed:%s", strerror_from_system(GetLastError()));
-		goto out;
+		/* information exceeds the allocated space */
+		if (ERROR_INSUFFICIENT_BUFFER != (status = GetLastError()))
+		{
+			*error = zbx_dsprintf(*error, "EvtRender failed:%s", strerror_from_system(status));
+			goto out;
+		}
+
+		renderedContent = (EVT_VARIANT*)zbx_realloc((void *)renderedContent, size_required);
+		size = size_required;
+
+		if (TRUE != EvtRender(*render_context, event_bookmark, EvtRenderEventValues, size, renderedContent,
+				&size_required, &bookmarkedCount))
+		{
+			*error = zbx_dsprintf(*error, "EvtRender failed:%s", strerror_from_system(GetLastError()));
+			goto out;
+		}
 	}
 
-	numIDs = var.UInt64Val;
+	*id = VAR_RECORD_NUMBER(renderedContent);
+	ret = SUCCEED;
+out:
+	if (NULL != event_bookmark)
+		EvtClose(event_bookmark);
+
+	zbx_free(renderedContent);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s id:" ZBX_FS_UI64, __func__, zbx_result_string(ret), id);
+
+	return ret;
+}
+
+/* open eventlog using API 6 and return the number of records */
+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, char **error)
+{
+	EVT_HANDLE	tmp_first_event_query = NULL;
+	EVT_HANDLE	tmp_last_event_query = NULL;
+	DWORD		status = 0;
+	int		ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() lastlogsize:" ZBX_FS_UI64, __func__, *lastlogsize);
+
+	*FirstID = 0;
+	*LastID = 0;
 
 	/* get the number of the oldest record in the log				*/
 	/* "EvtGetLogInfo()" does not work properly with "EvtLogOldestRecordNumber"	*/
@@ -387,8 +420,7 @@ static int	zbx_open_eventlog6(const wchar_t *wsource, zbx_uint64_t *lastlogsize,
 	}
 
 	/* get all eventlog */
-	tmp_all_event_query = EvtQuery(NULL, wsource, NULL, EvtQueryChannelPath);
-	if (NULL == tmp_all_event_query)
+	if (NULL == (tmp_first_event_query = EvtQuery(NULL, wsource, NULL, EvtQueryChannelPath)))
 	{
 		if (ERROR_EVT_CHANNEL_NOT_FOUND == (status = GetLastError()))
 			*error = zbx_dsprintf(*error, "EvtQuery channel missed:%s", strerror_from_system(status));
@@ -398,63 +430,55 @@ static int	zbx_open_eventlog6(const wchar_t *wsource, zbx_uint64_t *lastlogsize,
 		goto out;
 	}
 
-	/* get the entries and allocate the required space */
-	renderedContent = zbx_malloc(renderedContent, size);
-	if (TRUE != EvtNext(tmp_all_event_query, 1, &event_bookmark, INFINITE, 0, &size_required))
+	if (SUCCEED != get_eventlog6_id(&tmp_first_event_query, render_context, FirstID, error))
+		goto out;
+
+	if (0 == *FirstID)
 	{
 		/* no data in eventlog */
-		zabbix_log(LOG_LEVEL_DEBUG, "first EvtNext failed:%s", strerror_from_system(GetLastError()));
+		zabbix_log(LOG_LEVEL_DEBUG, "%s() first EvtNext failed", __func__);
 		*FirstID = 1;
 		*LastID = 1;
-		numIDs = 0;
 		*lastlogsize = 0;
 		ret = SUCCEED;
 		goto out;
 	}
 
-	/* obtain the information from selected events */
-	if (TRUE != EvtRender(*render_context, event_bookmark, EvtRenderEventValues, size, renderedContent,
-			&size_required, &bookmarkedCount))
+	if (NULL == (tmp_last_event_query = EvtQuery(NULL, wsource, NULL,
+			EvtQueryChannelPath | EvtQueryReverseDirection)))
 	{
-		/* information exceeds the allocated space */
-		if (ERROR_INSUFFICIENT_BUFFER != (status = GetLastError()))
-		{
-			*error = zbx_dsprintf(*error, "EvtRender failed:%s", strerror_from_system(status));
-			goto out;
-		}
-
-		renderedContent = (EVT_VARIANT*)zbx_realloc((void *)renderedContent, size_required);
-		size = size_required;
+		if (ERROR_EVT_CHANNEL_NOT_FOUND == (status = GetLastError()))
+			*error = zbx_dsprintf(*error, "EvtQuery channel missed:%s", strerror_from_system(status));
+		else
+			*error = zbx_dsprintf(*error, "EvtQuery failed:%s", strerror_from_system(status));
 
-		if (TRUE != EvtRender(*render_context, event_bookmark, EvtRenderEventValues, size, renderedContent,
-				&size_required, &bookmarkedCount))
-		{
-			*error = zbx_dsprintf(*error, "EvtRender failed:%s", strerror_from_system(GetLastError()));
-			goto out;
-		}
+		goto out;
 	}
 
-	*FirstID = VAR_RECORD_NUMBER(renderedContent);
-	*LastID = *FirstID + numIDs;
+	if (SUCCEED != get_eventlog6_id(&tmp_last_event_query, render_context, LastID, error) || 0 == *LastID)
+	{
+		/* no data in eventlog */
+		zabbix_log(LOG_LEVEL_DEBUG, "%s() last EvtNext failed", __func__);
+		*LastID = 1;
+	}
+	else
+		*LastID += 1;	/* we should read the last record */
 
 	if (*lastlogsize >= *LastID)
 	{
 		*lastlogsize = *FirstID - 1;
-		zabbix_log(LOG_LEVEL_DEBUG, "lastlogsize is too big. It is set to:" ZBX_FS_UI64, *lastlogsize);
+		zabbix_log(LOG_LEVEL_WARNING, "lastlogsize is too big. It is set to:" ZBX_FS_UI64, *lastlogsize);
 	}
 
 	ret = SUCCEED;
 out:
-	if (NULL != log)
-		EvtClose(log);
-	if (NULL != tmp_all_event_query)
-		EvtClose(tmp_all_event_query);
-	if (NULL != event_bookmark)
-		EvtClose(event_bookmark);
-	zbx_free(tmp_str);
-	zbx_free(renderedContent);
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s FirstID:" ZBX_FS_UI64 " LastID:" ZBX_FS_UI64 " numIDs:" ZBX_FS_UI64,
-			__func__, zbx_result_string(ret), *FirstID, *LastID, numIDs);
+	if (NULL != tmp_first_event_query)
+		EvtClose(tmp_first_event_query);
+	if (NULL != tmp_last_event_query)
+		EvtClose(tmp_last_event_query);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s FirstID:" ZBX_FS_UI64 " LastID:" ZBX_FS_UI64,
+			__func__, zbx_result_string(ret), *FirstID, *LastID);
 
 	return ret;
 }
@@ -875,7 +899,7 @@ int	process_eventslog6(const char *server, unsigned short port, const char *even
 	int		s_count = 0, p_count = 0, send_err = SUCCEED, ret = FAIL, match = SUCCEED;
 	DWORD		required_buf_size = 0, error_code = ERROR_SUCCESS;
 
-	unsigned long	evt_timestamp, evt_eventid;
+	unsigned long	evt_timestamp, evt_eventid = 0;
 	char		*evt_provider, *evt_source, *evt_message, str_logeventid[8];
 	unsigned short	evt_severity;
 	EVT_HANDLE	event_bookmarks[EVT_ARRAY_SIZE];
@@ -1087,7 +1111,7 @@ out:
 	}
 
 	zbx_free(eventlog_name_w);
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s last eventid:%lu", __func__, zbx_result_string(ret), evt_eventid);
 
 	return ret;
 }
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index dc7bcdcf5f4..f14b87dd70c 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -24,8 +24,8 @@ SUBDIRS = \
 	availability \
 	lld \
 	reporter \
-	service 
-	
+	service
+
 sbin_PROGRAMS = zabbix_server
 
 noinst_LIBRARIES = libzbxserver.a
@@ -113,6 +113,7 @@ zabbix_server_LDADD = \
 	$(top_builddir)/src/libs/zbxserver/libzbxserver_server.a \
 	$(top_builddir)/src/libs/zbxvault/libzbxvault.a \
 	$(top_builddir)/src/libs/zbxavailability/libzbxavailability.a \
+	$(top_builddir)/src/libs/zbxaudit/libzbxaudit.a \
 	$(top_builddir)/src/libs/zbxservice/libzbxservice.a
 
 if HAVE_IPMI
diff --git a/src/zabbix_server/actions.h b/src/zabbix_server/actions.h
index 1e6485694c0..8d68d979e19 100644
--- a/src/zabbix_server/actions.h
+++ b/src/zabbix_server/actions.h
@@ -31,6 +31,8 @@ typedef struct
 	zbx_uint64_t	eventid;
 	zbx_uint64_t	acknowledgeid;
 	zbx_uint64_t	taskid;
+	int		old_severity;
+	int		new_severity;
 }
 zbx_ack_task_t;
 
diff --git a/src/zabbix_server/lld/lld.h b/src/zabbix_server/lld/lld.h
index 3bef0a66319..f0205fadbb5 100644
--- a/src/zabbix_server/lld/lld.h
+++ b/src/zabbix_server/lld/lld.h
@@ -40,6 +40,190 @@ typedef struct
 }
 zbx_lld_row_t;
 
+typedef struct
+{
+	zbx_uint64_t		itemid;
+	zbx_uint64_t		valuemapid;
+	zbx_uint64_t		interfaceid;
+	zbx_uint64_t		master_itemid;
+	char			*name;
+	char			*key;
+	char			*delay;
+	char			*history;
+	char			*trends;
+	char			*trapper_hosts;
+	char			*units;
+	char			*formula;
+	char			*logtimefmt;
+	char			*params;
+	char			*ipmi_sensor;
+	char			*snmp_oid;
+	char			*username;
+	char			*password;
+	char			*publickey;
+	char			*privatekey;
+	char			*description;
+	char			*jmx_endpoint;
+	char			*timeout;
+	char			*url;
+	char			*query_fields;
+	char			*posts;
+	char			*status_codes;
+	char			*http_proxy;
+	char			*headers;
+	char			*ssl_cert_file;
+	char			*ssl_key_file;
+	char			*ssl_key_password;
+	unsigned char		verify_peer;
+	unsigned char		verify_host;
+	unsigned char		follow_redirects;
+	unsigned char		post_type;
+	unsigned char		retrieve_mode;
+	unsigned char		request_method;
+	unsigned char		output_format;
+	unsigned char		type;
+	unsigned char		value_type;
+	unsigned char		status;
+	unsigned char		authtype;
+	unsigned char		allow_traps;
+	unsigned char		discover;
+	zbx_vector_ptr_t	lld_rows;
+	zbx_vector_ptr_t	preproc_ops;
+	zbx_vector_ptr_t	item_params;
+	zbx_vector_ptr_t	item_tags;
+}
+zbx_lld_item_prototype_t;
+
+typedef struct
+{
+	zbx_uint64_t		itemid;
+	zbx_uint64_t		parent_itemid;
+	zbx_uint64_t		master_itemid;
+	zbx_uint64_t		master_itemid_orig;
+#define ZBX_FLAG_LLD_ITEM_UNSET				__UINT64_C(0x0000000000000000)
+#define ZBX_FLAG_LLD_ITEM_DISCOVERED			__UINT64_C(0x0000000000000001)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_NAME			__UINT64_C(0x0000000000000002)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_KEY			__UINT64_C(0x0000000000000004)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_TYPE			__UINT64_C(0x0000000000000008)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_VALUE_TYPE		__UINT64_C(0x0000000000000010)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_DELAY			__UINT64_C(0x0000000000000040)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_HISTORY		__UINT64_C(0x0000000000000100)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_TRENDS			__UINT64_C(0x0000000000000200)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_TRAPPER_HOSTS		__UINT64_C(0x0000000000000400)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_UNITS			__UINT64_C(0x0000000000000800)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_FORMULA		__UINT64_C(0x0000000000004000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_LOGTIMEFMT		__UINT64_C(0x0000000000008000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_VALUEMAPID		__UINT64_C(0x0000000000010000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_PARAMS			__UINT64_C(0x0000000000020000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_IPMI_SENSOR		__UINT64_C(0x0000000000040000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_SNMP_OID		__UINT64_C(0x0000000000100000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_AUTHTYPE		__UINT64_C(0x0000000010000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_USERNAME		__UINT64_C(0x0000000020000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_PASSWORD		__UINT64_C(0x0000000040000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_PUBLICKEY		__UINT64_C(0x0000000080000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_PRIVATEKEY		__UINT64_C(0x0000000100000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_DESCRIPTION		__UINT64_C(0x0000000200000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_INTERFACEID		__UINT64_C(0x0000000400000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_JMX_ENDPOINT		__UINT64_C(0x0000001000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_MASTER_ITEM		__UINT64_C(0x0000002000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_TIMEOUT		__UINT64_C(0x0000004000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_URL			__UINT64_C(0x0000008000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_QUERY_FIELDS		__UINT64_C(0x0000010000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_POSTS			__UINT64_C(0x0000020000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_STATUS_CODES		__UINT64_C(0x0000040000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_FOLLOW_REDIRECTS	__UINT64_C(0x0000080000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_POST_TYPE		__UINT64_C(0x0000100000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_HTTP_PROXY		__UINT64_C(0x0000200000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_HEADERS		__UINT64_C(0x0000400000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_RETRIEVE_MODE		__UINT64_C(0x0000800000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_REQUEST_METHOD		__UINT64_C(0x0001000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_OUTPUT_FORMAT		__UINT64_C(0x0002000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_SSL_CERT_FILE		__UINT64_C(0x0004000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_SSL_KEY_FILE		__UINT64_C(0x0008000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_SSL_KEY_PASSWORD	__UINT64_C(0x0010000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_PEER		__UINT64_C(0x0020000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_HOST		__UINT64_C(0x0040000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE_ALLOW_TRAPS		__UINT64_C(0x0080000000000000)
+#define ZBX_FLAG_LLD_ITEM_UPDATE			(~ZBX_FLAG_LLD_ITEM_DISCOVERED)
+	zbx_uint64_t		flags;
+	char			*key_proto;
+	char			*name;
+	char			*name_proto;
+	char			*key_orig;
+	char			*key;
+	char			*delay_orig;
+	char			*delay;
+	char			*history_orig;
+	char			*history;
+	char			*trends_orig;
+	char			*trends;
+	char			*units_orig;
+	char			*units;
+	char			*params_orig;
+	char			*params;
+	char			*username_orig;
+	char			*username;
+	char			*password_orig;
+	char			*password;
+	char			*ipmi_sensor_orig;
+	char			*ipmi_sensor;
+	char			*snmp_oid_orig;
+	char			*snmp_oid;
+	char			*description_orig;
+	char			*description;
+	char			*jmx_endpoint_orig;
+	char			*jmx_endpoint;
+	char			*timeout_orig;
+	char			*timeout;
+	char			*url_orig;
+	char			*url;
+	char			*query_fields_orig;
+	char			*query_fields;
+	char			*posts_orig;
+	char			*posts;
+	char			*status_codes_orig;
+	char			*status_codes;
+	char			*http_proxy_orig;
+	char			*http_proxy;
+	char			*headers_orig;
+	char			*headers;
+	char			*ssl_cert_file_orig;
+	char			*ssl_cert_file;
+	char			*ssl_key_file_orig;
+	char			*ssl_key_file;
+	char			*ssl_key_password_orig;
+	char			*ssl_key_password;
+	int			lastcheck;
+	int			ts_delete;
+	const zbx_lld_row_t	*lld_row;
+	zbx_vector_ptr_t	preproc_ops;
+	zbx_vector_ptr_t	dependent_items;
+	zbx_vector_ptr_t	item_params;
+	zbx_vector_ptr_t	item_tags;
+	zbx_vector_db_tag_ptr_t	override_tags;
+	unsigned char		status;
+	unsigned char		type_orig;
+	unsigned char		type;
+	unsigned char		value_type_orig;
+	char			*trapper_hosts_orig;
+	char			*formula_orig;
+	char			*logtimefmt_orig;
+	zbx_uint64_t		valuemapid_orig;
+	unsigned char		authtype_orig;
+	char			*publickey_orig;
+	char			*privatekey_orig;
+	zbx_uint64_t		interfaceid_orig;
+	unsigned char		follow_redirects_orig;
+	unsigned char		post_type_orig;
+	unsigned char		retrieve_mode_orig;
+	unsigned char		request_method_orig;
+	unsigned char		output_format_orig;
+	unsigned char		verify_peer_orig;
+	unsigned char		verify_host_orig;
+	unsigned char		allow_traps_orig;
+}
+zbx_lld_item_full_t;
+
 void	lld_field_str_rollback(char **field, char **field_orig, zbx_uint64_t *flags, zbx_uint64_t flag);
 void	lld_field_uint64_rollback(zbx_uint64_t *field, zbx_uint64_t *field_orig, zbx_uint64_t *flags,
 		zbx_uint64_t flag);
@@ -74,7 +258,7 @@ int	lld_end_of_life(int lastcheck, int lifetime);
 
 typedef void	(*delete_ids_f)(zbx_vector_uint64_t *ids);
 typedef void	(*get_object_info_f)(const void *object, zbx_uint64_t *id, int *discovered, int *lastcheck,
-		int *ts_delete);
+		int *ts_delete, const char **name);
 void	lld_remove_lost_objects(const char *table, const char *id_name, const zbx_vector_ptr_t *objects,
 		int lifetime, int lastcheck, delete_ids_f cb, get_object_info_f cb_info);
 
diff --git a/src/zabbix_server/lld/lld_common.c b/src/zabbix_server/lld/lld_common.c
index 1e657af1407..a5242265207 100644
--- a/src/zabbix_server/lld/lld_common.c
+++ b/src/zabbix_server/lld/lld_common.c
@@ -21,6 +21,8 @@
 #include "log.h"
 #include "db.h"
 
+#include "../../libs/zbxaudit/audit_item.h"
+
 /******************************************************************************
  *                                                                            *
  * Function: lld_field_str_rollback                                           *
@@ -98,8 +100,9 @@ void	lld_remove_lost_objects(const char *table, const char *id_name, const zbx_v
 	{
 		zbx_uint64_t	id;
 		int		discovery_flag, object_lastcheck, object_ts_delete;
+		const char	*name;
 
-		cb_info(objects->values[i], &id, &discovery_flag, &object_lastcheck, &object_ts_delete);
+		cb_info(objects->values[i], &id, &discovery_flag, &object_lastcheck, &object_ts_delete, &name);
 
 		if (0 == id)
 			continue;
@@ -111,6 +114,12 @@ void	lld_remove_lost_objects(const char *table, const char *id_name, const zbx_v
 			if (lastcheck > ts_delete)
 			{
 				zbx_vector_uint64_append(&del_ids, id);
+
+				if (0 == strcmp(table, "item_discovery"))
+				{
+					zbx_audit_item_create_entry_for_delete(id, name,
+							(int)ZBX_FLAG_DISCOVERY_CREATED);
+				}
 			}
 			else if (object_ts_delete != ts_delete)
 			{
@@ -185,6 +194,7 @@ void	lld_remove_lost_objects(const char *table, const char *id_name, const zbx_v
 	if (0 != del_ids.values_num)
 	{
 		zbx_vector_uint64_sort(&del_ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
 		cb(&del_ids);
 	}
 
diff --git a/src/zabbix_server/lld/lld_graph.c b/src/zabbix_server/lld/lld_graph.c
index 77af18702dd..40a756ba4f9 100644
--- a/src/zabbix_server/lld/lld_graph.c
+++ b/src/zabbix_server/lld/lld_graph.c
@@ -639,7 +639,7 @@ static void 	lld_graph_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 	if (NULL != (graph = lld_graph_get(graphs, &lld_row->item_links)))
 	{
 		buffer = zbx_strdup(buffer, name_proto);
-		substitute_lld_macros(&buffer, jp_row, lld_macro_paths, ZBX_MACRO_SIMPLE, NULL, 0);
+		substitute_lld_macros(&buffer, jp_row, lld_macro_paths, ZBX_MACRO_ANY, NULL, 0);
 		zbx_lrtrim(buffer, ZBX_WHITESPACE);
 		if (0 != strcmp(graph->name, buffer))
 		{
@@ -676,7 +676,7 @@ static void 	lld_graph_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 
 		graph->name = zbx_strdup(NULL, name_proto);
 		graph->name_orig = NULL;
-		substitute_lld_macros(&graph->name, jp_row, lld_macro_paths, ZBX_MACRO_SIMPLE, NULL, 0);
+		substitute_lld_macros(&graph->name, jp_row, lld_macro_paths, ZBX_MACRO_ANY, NULL, 0);
 		zbx_lrtrim(graph->name, ZBX_WHITESPACE);
 
 		lld_override_graph(&lld_row->overrides, graph->name, &discover_proto);
@@ -1280,16 +1280,17 @@ out:
 }
 
 static	void	get_graph_info(const void *object, zbx_uint64_t *id, int *discovery_flag, int *lastcheck,
-		int *ts_delete)
+		int *ts_delete, const char **name)
 {
-	zbx_lld_graph_t	*graph;
+	const zbx_lld_graph_t	*graph;
 
-	graph = (zbx_lld_graph_t *)object;
+	graph = (const zbx_lld_graph_t *)object;
 
 	*id = graph->graphid;
 	*discovery_flag = graph->flags & ZBX_FLAG_LLD_GRAPH_DISCOVERED;
 	*lastcheck = graph->lastcheck;
 	*ts_delete = graph->ts_delete;
+	*name = graph->name;
 }
 
 /******************************************************************************
diff --git a/src/zabbix_server/lld/lld_host.c b/src/zabbix_server/lld/lld_host.c
index a6b59b9301b..98fdb67aa9d 100644
--- a/src/zabbix_server/lld/lld_host.c
+++ b/src/zabbix_server/lld/lld_host.c
@@ -451,6 +451,15 @@ static void	lld_hosts_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts, z
 		host->tls_subject_orig = NULL;
 		host->tls_psk_identity_orig = NULL;
 		host->tls_psk_orig = NULL;
+		host->jp_row = NULL;
+		host->inventory_mode = 0;
+		host->status = 0;
+		host->custom_interfaces_orig = 0;
+		host->proxy_hostid_orig = 0;
+		host->ipmi_authtype_orig = 0;
+		host->ipmi_privilege_orig = 0;
+		host->tls_connect_orig = 0;
+		host->tls_accept_orig = 0;
 		host->flags = 0x00;
 		ZBX_STR2UCHAR(host->custom_interfaces, row[18]);
 
@@ -821,7 +830,7 @@ static zbx_lld_host_t	*lld_host_make(zbx_vector_ptr_t *hosts, const char *host_p
 {
 	char			*buffer = NULL;
 	int			i;
-	zbx_lld_host_t		*host;
+	zbx_lld_host_t		*host = NULL;
 	zbx_vector_db_tag_ptr_t	tmp_tags;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
@@ -892,6 +901,12 @@ static zbx_lld_host_t	*lld_host_make(zbx_vector_ptr_t *hosts, const char *host_p
 			zbx_vector_db_tag_ptr_create(&host->tags);
 			zbx_vector_ptr_create(&host->interfaces);
 			host->flags = ZBX_FLAG_LLD_HOST_DISCOVERED;
+			host->jp_row = NULL;
+			host->inventory_mode_orig = host->inventory_mode;
+			host->custom_interfaces_orig = host->custom_interfaces;
+			host->proxy_hostid_orig = 0;
+			host->ipmi_authtype_orig = 0;
+			host->ipmi_privilege_orig = 0;
 
 			zbx_vector_ptr_append(hosts, host);
 		}
@@ -1086,7 +1101,8 @@ static void	lld_hostgroups_make(const zbx_vector_uint64_t *groupids, zbx_vector_
 				/* host groups which should be unlinked */
 				ZBX_STR2UINT64(hostgroupid, row[2]);
 				zbx_vector_uint64_append(del_hostgroupids, hostgroupid);
-				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE, hostid, host->name);
+				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE, hostid,
+						(NULL == host->name_orig) ? host->name : host->name_orig);
 				zbx_audit_hostgroup_update_json_delete_group(hostid, hostgroupid, groupid);
 			}
 			else
@@ -1918,11 +1934,14 @@ static void	lld_masterhostmacros_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *
 	{
 		hostmacro = (zbx_lld_hostmacro_t *)zbx_malloc(NULL, sizeof(zbx_lld_hostmacro_t));
 
+		hostmacro->hostmacroid = 0;
 		hostmacro->macro = zbx_strdup(NULL, row[0]);
 		hostmacro->value = zbx_strdup(NULL, row[1]);
 		hostmacro->value_orig = NULL;
 		hostmacro->description = zbx_strdup(NULL, row[2]);
 		hostmacro->description_orig = NULL;
+		hostmacro->type_orig = 0;
+		hostmacro->flags = 0;
 		ZBX_STR2UCHAR(hostmacro->type, row[3]);
 
 		zbx_vector_ptr_append(hostmacros, hostmacro);
@@ -1984,12 +2003,15 @@ static void	lld_hostmacros_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *mas
 	{
 		hostmacro = (zbx_lld_hostmacro_t *)zbx_malloc(NULL, sizeof(zbx_lld_hostmacro_t));
 
+		hostmacro->hostmacroid = 0;
 		hostmacro->macro = zbx_strdup(NULL, row[0]);
 		hostmacro->value = zbx_strdup(NULL, row[1]);
 		hostmacro->value_orig = NULL;
 		hostmacro->description = zbx_strdup(NULL, row[2]);
 		hostmacro->description_orig = NULL;
 		ZBX_STR2UCHAR(hostmacro->type, row[3]);
+		hostmacro->type_orig = hostmacro->type;
+		hostmacro->flags = 0;
 
 		zbx_vector_ptr_append(hostmacros, hostmacro);
 	}
@@ -2005,13 +2027,15 @@ static void	lld_hostmacros_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *mas
 		hostmacro = (zbx_lld_hostmacro_t *)zbx_malloc(NULL, sizeof(zbx_lld_hostmacro_t));
 
 		masterhostmacro = (const zbx_lld_hostmacro_t *)masterhostmacros->values[i];
+		hostmacro->hostmacroid = 0;
 		hostmacro->macro = zbx_strdup(NULL, masterhostmacro->macro);
 		hostmacro->value = zbx_strdup(NULL, masterhostmacro->value);
 		hostmacro->value_orig = NULL;
 		hostmacro->description = zbx_strdup(NULL, masterhostmacro->description);
 		hostmacro->description_orig = NULL;
 		hostmacro->type = masterhostmacro->type;
-
+		hostmacro->type_orig = hostmacro->type;
+		hostmacro->flags = 0;
 		zbx_vector_ptr_append(hostmacros, hostmacro);
 	}
 
@@ -2065,6 +2089,8 @@ static void	lld_hostmacro_make(zbx_vector_ptr_t *hostmacros, zbx_uint64_t hostma
 	hostmacro->description = NULL;
 	hostmacro->description_orig = NULL;
 	hostmacro->flags = ZBX_FLAG_LLD_HMACRO_REMOVE;
+	hostmacro->type = 0;
+	hostmacro->type_orig = 0;
 
 	zbx_vector_ptr_append(hostmacros, hostmacro);
 }
@@ -2104,7 +2130,7 @@ static void	lld_hostmacros_make(const zbx_vector_ptr_t *hostmacros, zbx_vector_p
 		if (0 == (host->flags & ZBX_FLAG_LLD_HOST_DISCOVERED))
 			continue;
 
-		zbx_vector_ptr_reserve(&host->new_hostmacros, hostmacros->values_num);
+		zbx_vector_ptr_reserve(&host->new_hostmacros, (size_t)hostmacros->values_num);
 		for (j = 0; j < hostmacros->values_num; j++)
 		{
 			hostmacro = (zbx_lld_hostmacro_t *)zbx_malloc(NULL, sizeof(zbx_lld_hostmacro_t));
@@ -2114,6 +2140,7 @@ static void	lld_hostmacros_make(const zbx_vector_ptr_t *hostmacros, zbx_vector_p
 			hostmacro->value = zbx_strdup(NULL, ((zbx_lld_hostmacro_t *)hostmacros->values[j])->value);
 			hostmacro->value_orig = NULL;
 			hostmacro->type = ((zbx_lld_hostmacro_t *)hostmacros->values[j])->type;
+			hostmacro->type_orig = ((zbx_lld_hostmacro_t *)hostmacros->values[j])->type_orig;
 			hostmacro->description = zbx_strdup(NULL,
 					((zbx_lld_hostmacro_t *)hostmacros->values[j])->description);
 			hostmacro->description_orig = NULL;
@@ -2336,7 +2363,7 @@ static void	lld_host_update_tags(zbx_lld_host_t *host, const zbx_vector_db_tag_p
 
 	zbx_vector_db_tag_ptr_sort(&new_tags, zbx_db_tag_compare_func);
 
-	zbx_vector_db_tag_ptr_reserve(&host->tags, new_tags.values_num);
+	zbx_vector_db_tag_ptr_reserve(&host->tags, (size_t)new_tags.values_num);
 
 	/* update host tags or flag them for removal */
 	for (i = 0; i < host->tags.values_num; i++)
@@ -2706,7 +2733,8 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 		}
 		else
 		{
-			zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE, host->hostid, host->name);
+			zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE, host->hostid,
+					(NULL == host->name_orig) ? host->name : host->name_orig);
 
 			if (0 != (host->flags & ZBX_FLAG_LLD_HOST_UPDATE))
 				upd_hosts++;
@@ -2753,7 +2781,7 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 			{
 				zbx_vector_uint64_append(&del_interfaceids, interface->interfaceid);
 				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE,
-						host->hostid, host->name);
+						host->hostid, (NULL == host->name_orig) ? host->name : host->name_orig);
 				zbx_audit_host_update_json_delete_interface(
 						host->hostid, interface->interfaceid);
 			}
@@ -2762,7 +2790,7 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 			{
 				zbx_vector_uint64_append(&del_snmp_ids, interface->interfaceid);
 				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE,
-						host->hostid, host->name);
+						host->hostid, (NULL == host->name_orig) ? host->name : host->name_orig);
 				zbx_audit_host_update_json_delete_interface(
 						host->hostid, interface->interfaceid);
 			}
@@ -2796,7 +2824,7 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 				zbx_vector_uint64_append(&del_hostmacroids, hostmacro->hostmacroid);
 
 				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE,
-						host->hostid, host->name);
+						host->hostid, (NULL == host->name_orig) ? host->name : host->name_orig);
 				zbx_audit_host_update_json_delete_hostmacro(
 						host->hostid, hostmacro->hostmacroid);
 			}
@@ -3050,7 +3078,6 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 					zbx_audit_host_update_json_update_tls_issuer(host->hostid,
 							host->tls_issuer_orig, value_esc);
 
-
 					zbx_free(value_esc);
 				}
 				if (0 != (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_TLS_SUBJECT))
@@ -3591,7 +3618,6 @@ static void	lld_hosts_remove(const zbx_vector_ptr_t *hosts, int lifetime, int la
 			zbx_ids_names_compare_func);
 #undef IDS_NAMES_HASHSET_DEF_SIZE
 
-
 	zbx_vector_uint64_create(&del_hostids);
 	zbx_vector_str_create(&del_hosts);
 	zbx_vector_uint64_create(&lc_hostids);
@@ -3849,14 +3875,18 @@ static void	lld_interfaces_get(zbx_uint64_t id, zbx_vector_ptr_t *interfaces, un
 
 		ZBX_STR2UINT64(interface->interfaceid, row[0]);
 		interface->type = (unsigned char)atoi(row[1]);
+		interface->type_orig = interface->type;
 		interface->main = (unsigned char)atoi(row[2]);
+		interface->main_orig = interface->main;
 		interface->useip = (unsigned char)atoi(row[3]);
+		interface->useip_orig = interface->useip;
 		interface->ip = zbx_strdup(NULL, row[4]);
 		interface->dns = zbx_strdup(NULL, row[5]);
 		interface->port = zbx_strdup(NULL, row[6]);
 		interface->ip_orig = NULL;
 		interface->dns_orig = NULL;
 		interface->port_orig = NULL;
+		interface->parent_interfaceid = 0;
 
 		if (INTERFACE_TYPE_SNMP == interface->type)
 		{
@@ -3864,20 +3894,26 @@ static void	lld_interfaces_get(zbx_uint64_t id, zbx_vector_ptr_t *interfaces, un
 
 			snmp = (zbx_lld_interface_snmp_t *)zbx_malloc(NULL, sizeof(zbx_lld_interface_snmp_t));
 			ZBX_STR2UCHAR(snmp->version, row[7]);
+			snmp->version_orig = snmp->version;
 			ZBX_STR2UCHAR(snmp->bulk, row[8]);
+			snmp->bulk_orig = snmp->bulk;
 			snmp->community = zbx_strdup(NULL, row[9]);
 			snmp->community_orig = NULL;
 			snmp->securityname = zbx_strdup(NULL, row[10]);
 			snmp->securityname_orig = NULL;
 			ZBX_STR2UCHAR(snmp->securitylevel, row[11]);
+			snmp->securitylevel_orig = snmp->securitylevel;
 			snmp->authpassphrase = zbx_strdup(NULL, row[12]);
 			snmp->authpassphrase_orig = NULL;
 			snmp->privpassphrase = zbx_strdup(NULL, row[13]);
 			snmp->privpassphrase_orig = NULL;
 			ZBX_STR2UCHAR(snmp->authprotocol, row[14]);
+			snmp->authprotocol_orig = snmp->authprotocol;
 			ZBX_STR2UCHAR(snmp->privprotocol, row[15]);
+			snmp->privprotocol_orig = snmp->privprotocol;
 			snmp->contextname = zbx_strdup(NULL, row[16]);
 			snmp->contextname_orig = NULL;
+			snmp->flags = 0;
 			interface->data.snmp = snmp;
 			interface->flags = ZBX_FLAG_LLD_INTERFACE_SNMP_DATA_EXISTS;
 		}
@@ -4077,7 +4113,7 @@ static void	lld_interfaces_make(const zbx_vector_ptr_t *interfaces, zbx_vector_p
 		if (0 == (host->flags & ZBX_FLAG_LLD_HOST_DISCOVERED))
 			continue;
 
-		zbx_vector_ptr_reserve(&host->interfaces, interfaces->values_num);
+		zbx_vector_ptr_reserve(&host->interfaces, (size_t)interfaces->values_num);
 
 		for (j = 0; j < interfaces->values_num; j++)
 		{
@@ -4088,8 +4124,11 @@ static void	lld_interfaces_make(const zbx_vector_ptr_t *interfaces, zbx_vector_p
 			new_interface->interfaceid = 0;
 			new_interface->parent_interfaceid = interface->interfaceid;
 			new_interface->type = interface->type;
+			new_interface->type_orig = interface->type_orig;
 			new_interface->main = interface->main;
+			new_interface->main_orig = interface->main_orig;
 			new_interface->useip = interface->useip;
+			new_interface->useip_orig = interface->useip_orig;
 			new_interface->ip = zbx_strdup(NULL, interface->ip);
 			new_interface->ip_orig = NULL;
 			new_interface->dns = zbx_strdup(NULL, interface->dns);
diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c
index 371a7715e85..af9d883b8d1 100644
--- a/src/zabbix_server/lld/lld_item.c
+++ b/src/zabbix_server/lld/lld_item.c
@@ -26,59 +26,9 @@
 #include "zbxprometheus.h"
 #include "zbxvariant.h"
 
-typedef struct
-{
-	zbx_uint64_t		itemid;
-	zbx_uint64_t		valuemapid;
-	zbx_uint64_t		interfaceid;
-	zbx_uint64_t		master_itemid;
-	char			*name;
-	char			*key;
-	char			*delay;
-	char			*history;
-	char			*trends;
-	char			*trapper_hosts;
-	char			*units;
-	char			*formula;
-	char			*logtimefmt;
-	char			*params;
-	char			*ipmi_sensor;
-	char			*snmp_oid;
-	char			*username;
-	char			*password;
-	char			*publickey;
-	char			*privatekey;
-	char			*description;
-	char			*jmx_endpoint;
-	char			*timeout;
-	char			*url;
-	char			*query_fields;
-	char			*posts;
-	char			*status_codes;
-	char			*http_proxy;
-	char			*headers;
-	char			*ssl_cert_file;
-	char			*ssl_key_file;
-	char			*ssl_key_password;
-	unsigned char		verify_peer;
-	unsigned char		verify_host;
-	unsigned char		follow_redirects;
-	unsigned char		post_type;
-	unsigned char		retrieve_mode;
-	unsigned char		request_method;
-	unsigned char		output_format;
-	unsigned char		type;
-	unsigned char		value_type;
-	unsigned char		status;
-	unsigned char		authtype;
-	unsigned char		allow_traps;
-	unsigned char		discover;
-	zbx_vector_ptr_t	lld_rows;
-	zbx_vector_ptr_t	preproc_ops;
-	zbx_vector_ptr_t	item_params;
-	zbx_vector_ptr_t	item_tags;
-}
-zbx_lld_item_prototype_t;
+#include "../../libs/zbxaudit/audit_item.h"
+
+typedef zbx_lld_item_full_t	zbx_lld_item_t;
 
 #define	ZBX_DEPENDENT_ITEM_MAX_COUNT	29999
 #define	ZBX_DEPENDENT_ITEM_MAX_LEVELS	3
@@ -93,123 +43,16 @@ zbx_item_dependence_t;
 
 typedef struct
 {
-	zbx_uint64_t		itemid;
-	zbx_uint64_t		parent_itemid;
-	zbx_uint64_t		master_itemid;
-#define ZBX_FLAG_LLD_ITEM_UNSET				__UINT64_C(0x0000000000000000)
-#define ZBX_FLAG_LLD_ITEM_DISCOVERED			__UINT64_C(0x0000000000000001)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_NAME			__UINT64_C(0x0000000000000002)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_KEY			__UINT64_C(0x0000000000000004)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_TYPE			__UINT64_C(0x0000000000000008)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_VALUE_TYPE		__UINT64_C(0x0000000000000010)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_DELAY			__UINT64_C(0x0000000000000040)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_HISTORY		__UINT64_C(0x0000000000000100)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_TRENDS			__UINT64_C(0x0000000000000200)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_TRAPPER_HOSTS		__UINT64_C(0x0000000000000400)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_UNITS			__UINT64_C(0x0000000000000800)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_FORMULA		__UINT64_C(0x0000000000004000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_LOGTIMEFMT		__UINT64_C(0x0000000000008000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_VALUEMAPID		__UINT64_C(0x0000000000010000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_PARAMS			__UINT64_C(0x0000000000020000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_IPMI_SENSOR		__UINT64_C(0x0000000000040000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_SNMP_OID		__UINT64_C(0x0000000000100000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_AUTHTYPE		__UINT64_C(0x0000000010000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_USERNAME		__UINT64_C(0x0000000020000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_PASSWORD		__UINT64_C(0x0000000040000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_PUBLICKEY		__UINT64_C(0x0000000080000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_PRIVATEKEY		__UINT64_C(0x0000000100000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_DESCRIPTION		__UINT64_C(0x0000000200000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_INTERFACEID		__UINT64_C(0x0000000400000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_JMX_ENDPOINT		__UINT64_C(0x0000001000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_MASTER_ITEM		__UINT64_C(0x0000002000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_TIMEOUT		__UINT64_C(0x0000004000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_URL			__UINT64_C(0x0000008000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_QUERY_FIELDS		__UINT64_C(0x0000010000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_POSTS			__UINT64_C(0x0000020000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_STATUS_CODES		__UINT64_C(0x0000040000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_FOLLOW_REDIRECTS	__UINT64_C(0x0000080000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_POST_TYPE		__UINT64_C(0x0000100000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_HTTP_PROXY		__UINT64_C(0x0000200000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_HEADERS		__UINT64_C(0x0000400000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_RETRIEVE_MODE		__UINT64_C(0x0000800000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_REQUEST_METHOD		__UINT64_C(0x0001000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_OUTPUT_FORMAT		__UINT64_C(0x0002000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_SSL_CERT_FILE		__UINT64_C(0x0004000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_SSL_KEY_FILE		__UINT64_C(0x0008000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_SSL_KEY_PASSWORD	__UINT64_C(0x0010000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_PEER		__UINT64_C(0x0020000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_HOST		__UINT64_C(0x0040000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE_ALLOW_TRAPS		__UINT64_C(0x0080000000000000)
-#define ZBX_FLAG_LLD_ITEM_UPDATE			(~ZBX_FLAG_LLD_ITEM_DISCOVERED)
-	zbx_uint64_t		flags;
-	char			*key_proto;
-	char			*name;
-	char			*name_proto;
-	char			*key;
-	char			*key_orig;
-	char			*delay;
-	char			*delay_orig;
-	char			*history;
-	char			*history_orig;
-	char			*trends;
-	char			*trends_orig;
-	char			*units;
-	char			*units_orig;
-	char			*params;
-	char			*params_orig;
-	char			*username;
-	char			*username_orig;
-	char			*password;
-	char			*password_orig;
-	char			*ipmi_sensor;
-	char			*ipmi_sensor_orig;
-	char			*snmp_oid;
-	char			*snmp_oid_orig;
-	char			*description;
-	char			*description_orig;
-	char			*jmx_endpoint;
-	char			*jmx_endpoint_orig;
-	char			*timeout;
-	char			*timeout_orig;
-	char			*url;
-	char			*url_orig;
-	char			*query_fields;
-	char			*query_fields_orig;
-	char			*posts;
-	char			*posts_orig;
-	char			*status_codes;
-	char			*status_codes_orig;
-	char			*http_proxy;
-	char			*http_proxy_orig;
-	char			*headers;
-	char			*headers_orig;
-	char			*ssl_cert_file;
-	char			*ssl_cert_file_orig;
-	char			*ssl_key_file;
-	char			*ssl_key_file_orig;
-	char			*ssl_key_password;
-	char			*ssl_key_password_orig;
-	int			lastcheck;
-	int			ts_delete;
-	const zbx_lld_row_t	*lld_row;
-	zbx_vector_ptr_t	preproc_ops;
-	zbx_vector_ptr_t	dependent_items;
-	zbx_vector_ptr_t	item_params;
-	zbx_vector_ptr_t	item_tags;
-	zbx_vector_db_tag_ptr_t	override_tags;
-	unsigned char		status;
-	unsigned char		type;
-}
-zbx_lld_item_t;
-
-typedef struct
-{
 	zbx_uint64_t	item_preprocid;
 	int		step;
 	int		type;
+	int		type_orig;
 	int		error_handler;
+	int		error_handler_orig;
 	char		*params;
+	char		*params_orig;
 	char		*error_handler_params;
+	char		*error_handler_params_orig;
 
 #define ZBX_FLAG_LLD_ITEM_PREPROC_UNSET				__UINT64_C(0x00)
 #define ZBX_FLAG_LLD_ITEM_PREPROC_DISCOVERED			__UINT64_C(0x01)
@@ -236,7 +79,9 @@ typedef struct
 {
 	zbx_uint64_t	item_parameterid;
 	char		*name;
+	char		*name_orig;
 	char		*value;
+	char		*value_orig;
 
 #define ZBX_FLAG_LLD_ITEM_PARAM_UNSET				__UINT64_C(0x00)
 #define ZBX_FLAG_LLD_ITEM_PARAM_DISCOVERED			__UINT64_C(0x01)
@@ -255,7 +100,9 @@ typedef struct
 {
 	zbx_uint64_t	item_tagid;
 	char		*tag;
+	char		*tag_orig;
 	char		*value;
+	char		*value_orig;
 
 #define ZBX_FLAG_LLD_ITEM_TAG_UNSET				__UINT64_C(0x00)
 #define ZBX_FLAG_LLD_ITEM_TAG_DISCOVERED			__UINT64_C(0x01)
@@ -287,8 +134,8 @@ zbx_lld_item_ref_t;
 /* items index hashset support functions */
 static zbx_hash_t	lld_item_index_hash_func(const void *data)
 {
-	zbx_lld_item_index_t	*item_index = (zbx_lld_item_index_t *)data;
-	zbx_hash_t		hash;
+	const zbx_lld_item_index_t	*item_index = (const zbx_lld_item_index_t *)data;
+	zbx_hash_t			hash;
 
 	hash = ZBX_DEFAULT_UINT64_HASH_ALGO(&item_index->parent_itemid,
 			sizeof(item_index->parent_itemid), ZBX_DEFAULT_HASH_SEED);
@@ -297,8 +144,8 @@ static zbx_hash_t	lld_item_index_hash_func(const void *data)
 
 static int	lld_item_index_compare_func(const void *d1, const void *d2)
 {
-	zbx_lld_item_index_t	*i1 = (zbx_lld_item_index_t *)d1;
-	zbx_lld_item_index_t	*i2 = (zbx_lld_item_index_t *)d2;
+	const zbx_lld_item_index_t	*i1 = (const zbx_lld_item_index_t *)d1;
+	const zbx_lld_item_index_t	*i2 = (const zbx_lld_item_index_t *)d2;
 
 	ZBX_RETURN_IF_NOT_EQUAL(i1->parent_itemid, i2->parent_itemid);
 	ZBX_RETURN_IF_NOT_EQUAL(i1->lld_row, i2->lld_row);
@@ -347,21 +194,33 @@ static int	lld_item_tag_sort_by_tag(const void *d1, const void *d2)
 static void	lld_item_preproc_free(zbx_lld_item_preproc_t *op)
 {
 	zbx_free(op->params);
+	if (0 != (op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_PARAMS))
+		zbx_free(op->params_orig);
 	zbx_free(op->error_handler_params);
+	if (0 != (op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_ERROR_HANDLER_PARAMS))
+		zbx_free(op->error_handler_params_orig);
 	zbx_free(op);
 }
 
 static void	lld_item_param_free(zbx_lld_item_param_t *param)
 {
 	zbx_free(param->name);
+	if (0 != (param->flags & ZBX_FLAG_LLD_ITEM_PARAM_UPDATE_NAME))
+		zbx_free(param->name_orig);
 	zbx_free(param->value);
+	if (0 != (param->flags & ZBX_FLAG_LLD_ITEM_PARAM_UPDATE_VALUE))
+		zbx_free(param->value_orig);
 	zbx_free(param);
 }
 
 static void	lld_item_tag_free(zbx_lld_item_tag_t *tag)
 {
 	zbx_free(tag->tag);
+	if (0 != (tag->flags & ZBX_FLAG_LLD_ITEM_TAG_UPDATE_TAG))
+		zbx_free(tag->tag_orig);
 	zbx_free(tag->value);
+	if (0 != (tag->flags & ZBX_FLAG_LLD_ITEM_TAG_UPDATE_VALUE))
+		zbx_free(tag->value_orig);
 	zbx_free(tag);
 }
 
@@ -459,6 +318,11 @@ static void	lld_item_free(zbx_lld_item_t *item)
 	zbx_free(item->ssl_key_file_orig);
 	zbx_free(item->ssl_key_password);
 	zbx_free(item->ssl_key_password_orig);
+	zbx_free(item->trapper_hosts_orig);
+	zbx_free(item->formula_orig);
+	zbx_free(item->logtimefmt_orig);
+	zbx_free(item->publickey_orig);
+	zbx_free(item->privatekey_orig);
 
 	zbx_vector_ptr_clear_ext(&item->preproc_ops, (zbx_clean_func_t)lld_item_preproc_free);
 	zbx_vector_ptr_destroy(&item->preproc_ops);
@@ -558,10 +422,16 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 
 		item->type = item_prototype->type;
 		if ((unsigned char)atoi(row[6]) != item_prototype->type)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_TYPE;
+			item->type_orig = (unsigned char)atoi(row[6]);
+		}
 
 		if ((unsigned char)atoi(row[7]) != item_prototype->value_type)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_VALUE_TYPE;
+			item->value_type_orig = (unsigned char)atoi(row[7]);
+		}
 
 		item->delay = zbx_strdup(NULL, row[8]);
 		item->delay_orig = NULL;
@@ -572,21 +442,36 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item->trends = zbx_strdup(NULL, row[10]);
 		item->trends_orig = NULL;
 
+		item->trapper_hosts_orig = NULL;
 		if (0 != strcmp(row[11], item_prototype->trapper_hosts))
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_TRAPPER_HOSTS;
+			item->trapper_hosts_orig = zbx_strdup(NULL, row[11]);
+		}
 
 		item->units = zbx_strdup(NULL, row[12]);
 		item->units_orig = NULL;
 
+		item->formula_orig = NULL;
 		if (0 != strcmp(row[13], item_prototype->formula))
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_FORMULA;
+			item->formula_orig = zbx_strdup(NULL, row[13]);
+		}
 
+		item->logtimefmt_orig = NULL;
 		if (0 != strcmp(row[14], item_prototype->logtimefmt))
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_LOGTIMEFMT;
+			item->logtimefmt_orig = zbx_strdup(NULL, row[14]);
+		}
 
 		ZBX_DBROW2UINT64(db_valuemapid, row[15]);
 		if (db_valuemapid != item_prototype->valuemapid)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_VALUEMAPID;
+			item->valuemapid_orig = db_valuemapid;
+		}
 
 		item->params = zbx_strdup(NULL, row[16]);
 		item->params_orig = NULL;
@@ -598,7 +483,10 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item->snmp_oid_orig = NULL;
 
 		if ((unsigned char)atoi(row[19]) != item_prototype->authtype)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_AUTHTYPE;
+			item->authtype_orig = (unsigned char)atoi(row[19]);
+		}
 
 		item->username = zbx_strdup(NULL, row[20]);
 		item->username_orig = NULL;
@@ -606,18 +494,29 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item->password = zbx_strdup(NULL, row[21]);
 		item->password_orig = NULL;
 
-		if (0 != strcmp(row[20], item_prototype->publickey))
+		item->publickey_orig = NULL;
+		if (0 != strcmp(row[22], item_prototype->publickey))
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_PUBLICKEY;
+			item->publickey_orig = zbx_strdup(NULL, row[22]);
+		}
 
+		item->privatekey_orig = NULL;
 		if (0 != strcmp(row[23], item_prototype->privatekey))
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_PRIVATEKEY;
+			item->privatekey_orig = zbx_strdup(NULL, row[23]);
+		}
 
 		item->description = zbx_strdup(NULL, row[24]);
 		item->description_orig = NULL;
 
 		ZBX_DBROW2UINT64(db_interfaceid, row[25]);
 		if (db_interfaceid != item_prototype->interfaceid)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_INTERFACEID;
+			item->interfaceid_orig = db_interfaceid;
+		}
 
 		item->jmx_endpoint = zbx_strdup(NULL, row[26]);
 		item->jmx_endpoint_orig = NULL;
@@ -640,10 +539,16 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item->status_codes_orig = NULL;
 
 		if ((unsigned char)atoi(row[33]) != item_prototype->follow_redirects)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_FOLLOW_REDIRECTS;
+			item->follow_redirects_orig = (unsigned char)atoi(row[33]);
+		}
 
 		if ((unsigned char)atoi(row[34]) != item_prototype->post_type)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_POST_TYPE;
+			item->post_type_orig = (unsigned char)atoi(row[34]);
+		}
 
 		item->http_proxy = zbx_strdup(NULL, row[35]);
 		item->http_proxy_orig = NULL;
@@ -652,13 +557,22 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item->headers_orig = NULL;
 
 		if ((unsigned char)atoi(row[37]) != item_prototype->retrieve_mode)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_RETRIEVE_MODE;
+			item->retrieve_mode_orig = (unsigned char)atoi(row[37]);
+		}
 
 		if ((unsigned char)atoi(row[38]) != item_prototype->request_method)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_REQUEST_METHOD;
+			item->request_method_orig = (unsigned char)atoi(row[38]);
+		}
 
 		if ((unsigned char)atoi(row[39]) != item_prototype->output_format)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_OUTPUT_FORMAT;
+			item->output_format_orig = (unsigned char)atoi(row[39]);
+		}
 
 		item->ssl_cert_file = zbx_strdup(NULL, row[40]);
 		item->ssl_cert_file_orig = NULL;
@@ -670,13 +584,22 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item->ssl_key_password_orig = NULL;
 
 		if ((unsigned char)atoi(row[43]) != item_prototype->verify_peer)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_PEER;
+			item->verify_peer_orig = (unsigned char)atoi(row[43]);
+		}
 
 		if ((unsigned char)atoi(row[44]) != item_prototype->verify_host)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_HOST;
+			item->verify_host_orig = (unsigned char)atoi(row[44]);
+		}
 
 		if ((unsigned char)atoi(row[46]) != item_prototype->allow_traps)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_ALLOW_TRAPS;
+			item->allow_traps_orig = (unsigned char)atoi(row[46]);
+		}
 
 		item->lld_row = NULL;
 
@@ -718,7 +641,10 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item_prototype = (const zbx_lld_item_prototype_t *)item_prototypes->values[index];
 
 		if (master_itemid != item_prototype->master_itemid)
+		{
 			item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_MASTER_ITEM;
+			item->master_itemid_orig = master_itemid;
+		}
 
 		item->master_itemid = item_prototype->master_itemid;
 	}
@@ -754,9 +680,13 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		ZBX_STR2UINT64(preproc_op->item_preprocid, row[0]);
 		preproc_op->step = atoi(row[2]);
 		preproc_op->type = atoi(row[3]);
+		preproc_op->type_orig = preproc_op->type;
 		preproc_op->params = zbx_strdup(NULL, row[4]);
+		preproc_op->params_orig = NULL;
 		preproc_op->error_handler = atoi(row[5]);
+		preproc_op->error_handler_orig = preproc_op->error_handler;
 		preproc_op->error_handler_params = zbx_strdup(NULL, row[6]);
+		preproc_op->error_handler_params_orig = NULL;
 		zbx_vector_ptr_append(&item->preproc_ops, preproc_op);
 	}
 	DBfree_result(result);
@@ -790,7 +720,9 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item_param->flags = ZBX_FLAG_LLD_ITEM_PARAM_UNSET;
 		ZBX_STR2UINT64(item_param->item_parameterid, row[0]);
 		item_param->name = zbx_strdup(NULL, row[2]);
+		item_param->name_orig = NULL;
 		item_param->value = zbx_strdup(NULL, row[3]);
+		item_param->value_orig = NULL;
 		zbx_vector_ptr_append(&item->item_params, item_param);
 	}
 	DBfree_result(result);
@@ -824,7 +756,9 @@ static void	lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt
 		item_tag->flags = ZBX_FLAG_LLD_ITEM_TAG_UNSET;
 		ZBX_STR2UINT64(item_tag->item_tagid, row[0]);
 		item_tag->tag = zbx_strdup(NULL, row[2]);
+		item_tag->tag_orig = NULL;
 		item_tag->value = zbx_strdup(NULL, row[3]);
+		item_tag->value_orig = NULL;
 		zbx_vector_ptr_append(&item->item_tags, item_tag);
 	}
 	DBfree_result(result);
@@ -2130,6 +2064,12 @@ static zbx_lld_item_t	*lld_item_make(const zbx_lld_item_prototype_t *item_protot
 	substitute_lld_macros(&item->ssl_key_password, jp_row, lld_macro_paths, ZBX_MACRO_ANY, NULL, 0);
 	/* zbx_lrtrim(item->ipmi_sensor, ZBX_WHITESPACE); is not missing here */
 
+	item->trapper_hosts_orig = NULL;
+	item->formula_orig = NULL;
+	item->logtimefmt_orig = NULL;
+	item->publickey_orig = NULL;
+	item->privatekey_orig = NULL;
+
 	item->flags = ZBX_FLAG_LLD_ITEM_DISCOVERED;
 	item->lld_row = lld_row;
 
@@ -2748,9 +2688,13 @@ static void	lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes,
 				ppdst->flags = ZBX_FLAG_LLD_ITEM_PREPROC_DISCOVERED | ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE;
 				ppdst->step = ppsrc->step;
 				ppdst->type = ppsrc->type;
+				ppdst->type_orig = ppdst->type;
 				ppdst->params = zbx_strdup(NULL, ppsrc->params);
+				ppdst->params_orig = NULL;
 				ppdst->error_handler = ppsrc->error_handler;
+				ppdst->error_handler_orig = ppdst->error_handler;
 				ppdst->error_handler_params = zbx_strdup(NULL, ppsrc->error_handler_params);
+				ppdst->error_handler_params_orig = NULL;
 
 				substitute_lld_macros_in_preproc_params(ppsrc->type, item->lld_row, lld_macro_paths,
 						&ppdst->params);
@@ -2775,6 +2719,7 @@ static void	lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes,
 
 			if (ppdst->type != ppsrc->type)
 			{
+				ppdst->type_orig = ppdst->type;
 				ppdst->type = ppsrc->type;
 				ppdst->flags |= ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_TYPE;
 			}
@@ -2791,6 +2736,7 @@ static void	lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes,
 
 			if (0 != strcmp(ppdst->params, buffer))
 			{
+				ppdst->params_orig = zbx_strdup(NULL, ppdst->params);
 				zbx_free(ppdst->params);
 				ppdst->params = buffer;
 				buffer = NULL;
@@ -2799,6 +2745,7 @@ static void	lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes,
 
 			if (ppdst->error_handler != ppsrc->error_handler)
 			{
+				ppdst->error_handler_orig = ppdst->error_handler;
 				ppdst->error_handler = ppsrc->error_handler;
 				ppdst->flags |= ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_ERROR_HANDLER;
 			}
@@ -2808,6 +2755,7 @@ static void	lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes,
 
 			if (0 != strcmp(ppdst->error_handler_params, buffer))
 			{
+				ppdst->error_handler_params_orig = zbx_strdup(NULL, ppdst->error_handler_params);
 				zbx_free(ppdst->error_handler_params);
 				ppdst->error_handler_params = buffer;
 				buffer = NULL;
@@ -2869,7 +2817,9 @@ static void	lld_items_param_make(const zbx_vector_ptr_t *item_prototypes,
 				ipdst->item_parameterid = 0;
 				ipdst->flags = ZBX_FLAG_LLD_ITEM_PARAM_DISCOVERED | ZBX_FLAG_LLD_ITEM_PARAM_UPDATE;
 				ipdst->name = zbx_strdup(NULL, ipsrc->name);
+				ipdst->name_orig = NULL;
 				ipdst->value = zbx_strdup(NULL, ipsrc->value);
+				ipdst->value_orig = NULL;
 
 				substitute_lld_macros(&ipdst->name, &item->lld_row->jp_row,
 						lld_macro_paths, ZBX_MACRO_ANY, NULL, 0);
@@ -2897,6 +2847,7 @@ static void	lld_items_param_make(const zbx_vector_ptr_t *item_prototypes,
 
 			if (0 != strcmp(ipdst->name, buffer))
 			{
+				ipdst->name_orig = zbx_strdup(NULL, ipdst->name);
 				zbx_free(ipdst->name);
 				ipdst->name = buffer;
 				buffer = NULL;
@@ -2910,6 +2861,7 @@ static void	lld_items_param_make(const zbx_vector_ptr_t *item_prototypes,
 
 			if (0 != strcmp(ipdst->value, buffer))
 			{
+				ipdst->value_orig = zbx_strdup(NULL, ipdst->value);
 				zbx_free(ipdst->value);
 				ipdst->value = buffer;
 				buffer = NULL;
@@ -2995,7 +2947,9 @@ static void	lld_items_tags_make(const zbx_vector_ptr_t *item_prototypes, const z
 				itdst->item_tagid = 0;
 				itdst->flags = ZBX_FLAG_LLD_ITEM_TAG_DISCOVERED | ZBX_FLAG_LLD_ITEM_TAG_UPDATE;
 				itdst->tag = zbx_strdup(NULL, name);
+				itdst->tag_orig = NULL;
 				itdst->value = zbx_strdup(NULL, value);
+				itdst->value_orig = NULL;
 
 				substitute_lld_macros(&itdst->tag, &item->lld_row->jp_row,
 						lld_macro_paths, ZBX_MACRO_ANY, NULL, 0);
@@ -3014,6 +2968,7 @@ static void	lld_items_tags_make(const zbx_vector_ptr_t *item_prototypes, const z
 
 			if (0 != strcmp(itdst->tag, buffer))
 			{
+				itdst->tag_orig = zbx_strdup(NULL, itdst->tag);
 				zbx_free(itdst->tag);
 				itdst->tag = buffer;
 				buffer = NULL;
@@ -3027,6 +2982,7 @@ static void	lld_items_tags_make(const zbx_vector_ptr_t *item_prototypes, const z
 
 			if (0 != strcmp(itdst->value, buffer))
 			{
+				itdst->value_orig = zbx_strdup(NULL, itdst->value);
 				zbx_free(itdst->value);
 				itdst->value = buffer;
 				buffer = NULL;
@@ -3081,9 +3037,8 @@ static void	lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot
 		const zbx_lld_item_prototype_t	*item_prototype;
 
 		item_prototype = (zbx_lld_item_prototype_t *)item_prototypes->values[index];
-		item->itemid = (*itemid)++;
 
-		zbx_db_insert_add_values(db_insert_items, item->itemid, item->name, item->key, hostid,
+		zbx_db_insert_add_values(db_insert_items, *itemid, item->name, item->key, hostid,
 				(int)item_prototype->type, (int)item_prototype->value_type,
 				item->delay, item->history, item->trends,
 				(int)item->status, item_prototype->trapper_hosts, item->units,
@@ -3099,10 +3054,14 @@ static void	lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot
 				item->ssl_key_password, item_prototype->verify_peer, item_prototype->verify_host,
 				item_prototype->allow_traps);
 
-		zbx_db_insert_add_values(db_insert_idiscovery, (*itemdiscoveryid)++, item->itemid,
+		zbx_db_insert_add_values(db_insert_idiscovery, (*itemdiscoveryid)++, *itemid,
 				item->parent_itemid, item_prototype->key);
 
-		zbx_db_insert_add_values(db_insert_irtdata, item->itemid);
+		zbx_db_insert_add_values(db_insert_irtdata, *itemid);
+
+		zbx_audit_item_create_entry(AUDIT_ACTION_ADD, *itemid, item->name, ZBX_FLAG_DISCOVERY_CREATED);
+		zbx_audit_item_update_json_add_lld_data(*itemid, item, item_prototype, hostid);
+		item->itemid = (*itemid)++;
 	}
 
 	for (index = 0; index < item->dependent_items.values_num; index++)
@@ -3139,145 +3098,189 @@ static void	lld_item_prepare_update(const zbx_lld_item_prototype_t *item_prototy
 	const char			*d = "";
 
 	zbx_strcpy_alloc(sql, sql_alloc, sql_offset, "update items set ");
+
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_NAME))
 	{
 		value_esc = DBdyn_escape_string(item->name);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "name='%s'", value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_name(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED, item->name_proto,
+				item->name);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY))
 	{
 		value_esc = DBdyn_escape_string(item->key);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%skey_='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_key(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED, item->key_orig,
+				item->key);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TYPE))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%stype=%d", d, (int)item_prototype->type);
 		d = ",";
+		zbx_audit_item_update_json_update_type(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED, item->type_orig,
+				(int)item_prototype->type);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VALUE_TYPE))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svalue_type=%d", d, (int)item_prototype->value_type);
 		d = ",";
+		zbx_audit_item_update_json_update_value_type(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->value_type_orig, (int)item_prototype->value_type);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_DELAY))
 	{
 		value_esc = DBdyn_escape_string(item->delay);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdelay='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_delay(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED, item->delay_orig,
+				item->delay);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_HISTORY))
 	{
 		value_esc = DBdyn_escape_string(item->history);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%shistory='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_history(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->history_orig, item->history);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TRENDS))
 	{
 		value_esc = DBdyn_escape_string(item->trends);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strends='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_trends(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->trends_orig, item->trends);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TRAPPER_HOSTS))
 	{
 		value_esc = DBdyn_escape_string(item_prototype->trapper_hosts);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strapper_hosts='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_trapper_hosts(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->trapper_hosts_orig, item_prototype->trapper_hosts);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_UNITS))
 	{
 		value_esc = DBdyn_escape_string(item->units);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sunits='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_units(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED, item->units_orig,
+				item->units);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_FORMULA))
 	{
 		value_esc = DBdyn_escape_string(item_prototype->formula);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sformula='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_formula(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->formula_orig, item_prototype->formula);
+		zbx_free(value_esc);
+
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_LOGTIMEFMT))
 	{
 		value_esc = DBdyn_escape_string(item_prototype->logtimefmt);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%slogtimefmt='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_logtimefmt(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->logtimefmt_orig, item_prototype->logtimefmt);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VALUEMAPID))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svaluemapid=%s",
 				d, DBsql_id_ins(item_prototype->valuemapid));
 		d = ",";
+		zbx_audit_item_update_json_update_valuemapid(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->valuemapid_orig, item_prototype->valuemapid);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PARAMS))
 	{
 		value_esc = DBdyn_escape_string(item->params);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sparams='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_params(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->params_orig, item->params);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_IPMI_SENSOR))
 	{
 		value_esc = DBdyn_escape_string(item->ipmi_sensor);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sipmi_sensor='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_ipmi_sensor(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->ipmi_sensor_orig, item->ipmi_sensor);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMP_OID))
 	{
 		value_esc = DBdyn_escape_string(item->snmp_oid);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmp_oid='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_snmp_oid(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->snmp_oid_orig, item->snmp_oid);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_AUTHTYPE))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sauthtype=%d", d, (int)item_prototype->authtype);
 		d = ",";
+		zbx_audit_item_update_json_update_authtype(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->authtype_orig, (int)item_prototype->authtype);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_USERNAME))
 	{
 		value_esc = DBdyn_escape_string(item->username);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%susername='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_username(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->username_orig, item->username);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PASSWORD))
 	{
 		value_esc = DBdyn_escape_string(item->password);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spassword='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_password(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				ZBX_MACRO_SECRET_MASK, ZBX_MACRO_SECRET_MASK);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PUBLICKEY))
 	{
 		value_esc = DBdyn_escape_string(item_prototype->publickey);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spublickey='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_publickey(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->publickey_orig, item_prototype->publickey);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PRIVATEKEY))
 	{
 		value_esc = DBdyn_escape_string(item_prototype->privatekey);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sprivatekey='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_privatekey(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->privatekey_orig, item_prototype->privatekey);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_DESCRIPTION))
 	{
 		value_esc = DBdyn_escape_string(item->description);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdescription='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_description(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->description_orig, item->description);
+		zbx_free(value_esc);
 
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_INTERFACEID))
@@ -3285,132 +3288,174 @@ static void	lld_item_prepare_update(const zbx_lld_item_prototype_t *item_prototy
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sinterfaceid=%s",
 				d, DBsql_id_ins(item_prototype->interfaceid));
 		d = ",";
+		zbx_audit_item_update_json_update_interfaceid(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->interfaceid_orig, item_prototype->interfaceid);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_JMX_ENDPOINT))
 	{
 		value_esc = DBdyn_escape_string(item->jmx_endpoint);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sjmx_endpoint='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_jmx_endpoint(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->jmx_endpoint_orig, item->jmx_endpoint);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_MASTER_ITEM))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%smaster_itemid=%s",
 				d, DBsql_id_ins(item->master_itemid));
 		d = ",";
+		zbx_audit_item_update_json_update_master_itemid(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->master_itemid_orig, item->master_itemid);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TIMEOUT))
 	{
 		value_esc = DBdyn_escape_string(item->timeout);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%stimeout='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_timeout(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->timeout_orig, item->timeout);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_URL))
 	{
 		value_esc = DBdyn_escape_string(item->url);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%surl='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_url(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED, item->url_orig,
+				item->url);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_QUERY_FIELDS))
 	{
 		value_esc = DBdyn_escape_string(item->query_fields);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%squery_fields='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_query_fields(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->query_fields_orig, item->query_fields);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_POSTS))
 	{
 		value_esc = DBdyn_escape_string(item->posts);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sposts='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_posts(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED, item->posts_orig,
+				item->posts);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_STATUS_CODES))
 	{
 		value_esc = DBdyn_escape_string(item->status_codes);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sstatus_codes='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_status_codes(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->status_codes_orig, item->status_codes);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_FOLLOW_REDIRECTS))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sfollow_redirects=%d", d,
 				(int)item_prototype->follow_redirects);
 		d = ",";
+		zbx_audit_item_update_json_update_follow_redirects(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->follow_redirects_orig, (int)item_prototype->follow_redirects);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_POST_TYPE))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spost_type=%d", d, (int)item_prototype->post_type);
 		d = ",";
+		zbx_audit_item_update_json_update_post_type(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->post_type_orig, (int)item_prototype->post_type);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_HTTP_PROXY))
 	{
 		value_esc = DBdyn_escape_string(item->http_proxy);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%shttp_proxy='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_http_proxy(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->http_proxy_orig, item->http_proxy);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_HEADERS))
 	{
 		value_esc = DBdyn_escape_string(item->headers);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sheaders='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_headers(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->headers_orig, item->headers);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_RETRIEVE_MODE))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sretrieve_mode=%d", d,
 				(int)item_prototype->retrieve_mode);
 		d = ",";
+		zbx_audit_item_update_json_update_retrieve_mode(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->retrieve_mode_orig, (int)item_prototype->retrieve_mode);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_REQUEST_METHOD))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%srequest_method=%d", d,
 				(int)item_prototype->request_method);
 		d = ",";
+		zbx_audit_item_update_json_update_request_method(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->request_method_orig, (int)item_prototype->request_method);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_OUTPUT_FORMAT))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%soutput_format=%d", d,
 				(int)item_prototype->output_format);
 		d = ",";
+		zbx_audit_item_update_json_update_output_format(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->output_format_orig, (int)item_prototype->output_format);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SSL_CERT_FILE))
 	{
 		value_esc = DBdyn_escape_string(item->ssl_cert_file);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sssl_cert_file='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_ssl_cert_file(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->ssl_cert_file_orig, item->ssl_cert_file);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SSL_KEY_FILE))
 	{
 		value_esc = DBdyn_escape_string(item->ssl_key_file);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sssl_key_file='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_ssl_key_file(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				item->ssl_key_file_orig, item->ssl_key_file);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SSL_KEY_PASSWORD))
 	{
 		value_esc = DBdyn_escape_string(item->ssl_key_password);
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sssl_key_password='%s'", d, value_esc);
-		zbx_free(value_esc);
 		d = ",";
+		zbx_audit_item_update_json_update_ssl_key_password(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				ZBX_MACRO_SECRET_MASK, ZBX_MACRO_SECRET_MASK);
+		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_PEER))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sverify_peer=%d", d, (int)item_prototype->verify_peer);
 		d = ",";
+		zbx_audit_item_update_json_update_verify_peer(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->verify_peer_orig, (int)item_prototype->verify_peer);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_HOST))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sverify_host=%d", d, (int)item_prototype->verify_host);
 		d = ",";
+		zbx_audit_item_update_json_update_verify_host(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->verify_host_orig, (int)item_prototype->verify_host);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_ALLOW_TRAPS))
 	{
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sallow_traps=%d", d, (int)item_prototype->allow_traps);
+		zbx_audit_item_update_json_update_allow_traps(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+				(int)item->allow_traps_orig, (int)item_prototype->allow_traps);
 	}
 
 	zbx_snprintf_alloc(sql, sql_alloc, sql_offset, " where itemid=" ZBX_FS_UI64 ";\n", item->itemid);
@@ -3501,7 +3546,14 @@ static int	lld_items_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot
 		{
 			new_items++;
 		}
-		else if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE))
+		else
+		{
+			zbx_audit_item_create_entry(AUDIT_ACTION_UPDATE, item->itemid,
+					(NULL == item->name_proto) ? item->name : item->name_proto,
+					ZBX_FLAG_DISCOVERY_CREATED);
+		}
+
+		if (0 != item->itemid && 0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE))
 		{
 			upd_items++;
 			if(0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY))
@@ -3687,6 +3739,7 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 	zbx_db_insert_t		db_insert;
 	char			*sql = NULL;
 	size_t			sql_alloc = 0, sql_offset = 0;
+	zbx_uint64_t		new_preprocid = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -3706,6 +3759,8 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 			if (0 == (preproc_op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_DISCOVERED))
 			{
 				zbx_vector_uint64_append(&deleteids, preproc_op->item_preprocid);
+				zbx_audit_item_delete_preproc(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+						preproc_op->item_preprocid);
 				continue;
 			}
 
@@ -3741,6 +3796,7 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 
 	if (0 != new_preproc_num)
 	{
+		new_preprocid = DBget_maxid_num("item_preproc", new_preproc_num);
 		zbx_db_insert_prepare(&db_insert, "item_preproc", "item_preprocid", "itemid", "step", "type", "params",
 				"error_handler", "error_handler_params", NULL);
 	}
@@ -3760,21 +3816,33 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 
 			if (0 == preproc_op->item_preprocid)
 			{
-				zbx_db_insert_add_values(&db_insert, __UINT64_C(0), item->itemid, preproc_op->step,
+				zbx_db_insert_add_values(&db_insert, new_preprocid, item->itemid, preproc_op->step,
 						preproc_op->type, preproc_op->params, preproc_op->error_handler,
 						preproc_op->error_handler_params);
+				zbx_audit_item_update_json_add_item_preproc(item->itemid, new_preprocid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, preproc_op->step, preproc_op->type,
+						preproc_op->params, preproc_op->error_handler,
+						preproc_op->error_handler_params);
+				new_preprocid++;
 				continue;
 			}
 
 			if (0 == (preproc_op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE))
 				continue;
 
+			zbx_audit_item_update_json_update_item_preproc_create_entry(item->itemid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, preproc_op->item_preprocid);
+
 			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "update item_preproc set");
 
 			if (0 != (preproc_op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_TYPE))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%ctype=%d", delim, preproc_op->type);
 				delim = ',';
+
+				zbx_audit_item_update_json_update_item_preproc_type(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, preproc_op->item_preprocid,
+						preproc_op->type_orig, preproc_op->type);
 			}
 
 			if (0 != (preproc_op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_STEP))
@@ -3790,8 +3858,11 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 				params_esc = DBdyn_escape_string(preproc_op->params);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%cparams='%s'", delim, params_esc);
 
-				zbx_free(params_esc);
 				delim = ',';
+				zbx_audit_item_update_json_update_item_preproc_params(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, preproc_op->item_preprocid,
+						preproc_op->params_orig, preproc_op->params);
+				zbx_free(params_esc);
 			}
 
 			if (0 != (preproc_op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_ERROR_HANDLER))
@@ -3799,6 +3870,10 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%cerror_handler=%d", delim,
 						preproc_op->error_handler);
 				delim = ',';
+
+				zbx_audit_item_update_json_update_item_preproc_error_handler(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, preproc_op->item_preprocid,
+						preproc_op->error_handler_orig, preproc_op->error_handler);
 			}
 
 			if (0 != (preproc_op->flags & ZBX_FLAG_LLD_ITEM_PREPROC_UPDATE_ERROR_HANDLER_PARAMS))
@@ -3809,6 +3884,11 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%cerror_handler_params='%s'", delim,
 						params_esc);
 
+				zbx_audit_item_update_json_update_item_preproc_error_handler_params(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, preproc_op->item_preprocid,
+						preproc_op->error_handler_params_orig,
+						preproc_op->error_handler_params);
+
 				zbx_free(params_esc);
 			}
 
@@ -3829,7 +3909,6 @@ static int	lld_items_preproc_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items,
 
 	if (0 != new_preproc_num)
 	{
-		zbx_db_insert_autoincrement(&db_insert, "item_preprocid");
 		zbx_db_insert_execute(&db_insert);
 		zbx_db_insert_clean(&db_insert);
 	}
@@ -3874,6 +3953,7 @@ static int	lld_items_param_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, in
 	zbx_db_insert_t		db_insert;
 	char			*sql = NULL;
 	size_t			sql_alloc = 0, sql_offset = 0;
+	zbx_uint64_t		new_paramid = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -3893,6 +3973,8 @@ static int	lld_items_param_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, in
 			if (0 == (item_param->flags & ZBX_FLAG_LLD_ITEM_PARAM_DISCOVERED))
 			{
 				zbx_vector_uint64_append(&deleteids, item_param->item_parameterid);
+				zbx_audit_item_delete_params(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+						item_param->item_parameterid);
 				continue;
 			}
 
@@ -3928,6 +4010,7 @@ static int	lld_items_param_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, in
 
 	if (0 != new_param_num)
 	{
+		new_paramid = DBget_maxid_num("item_parameter", new_param_num);
 		zbx_db_insert_prepare(&db_insert, "item_parameter", "item_parameterid", "itemid", "name", "value",
 				NULL);
 	}
@@ -3947,8 +4030,13 @@ static int	lld_items_param_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, in
 
 			if (0 == item_param->item_parameterid)
 			{
-				zbx_db_insert_add_values(&db_insert, __UINT64_C(0), item->itemid, item_param->name,
+				zbx_db_insert_add_values(&db_insert, new_paramid, item->itemid, item_param->name,
 						item_param->value);
+
+				zbx_audit_item_update_json_add_params(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+						new_paramid, item_param->name, item_param->value);
+
+				new_paramid++;
 				continue;
 			}
 
@@ -3964,8 +4052,11 @@ static int	lld_items_param_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, in
 				name_esc = DBdyn_escape_string(item_param->name);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%cname='%s'", delim, name_esc);
 
-				zbx_free(name_esc);
 				delim = ',';
+				zbx_audit_item_update_json_update_params_name(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, item_param->item_parameterid,
+						item_param->name_orig, item_param->name);
+				zbx_free(name_esc);
 			}
 
 			if (0 != (item_param->flags & ZBX_FLAG_LLD_ITEM_PARAM_UPDATE_VALUE))
@@ -3975,6 +4066,10 @@ static int	lld_items_param_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, in
 				value_esc = DBdyn_escape_string(item_param->value);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%cvalue='%s'", delim, value_esc);
 
+				zbx_audit_item_update_json_update_params_value(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, item_param->item_parameterid,
+						item_param->value_orig, item_param->value);
+
 				zbx_free(value_esc);
 			}
 
@@ -3995,7 +4090,6 @@ static int	lld_items_param_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, in
 
 	if (0 != new_param_num)
 	{
-		zbx_db_insert_autoincrement(&db_insert, "item_parameterid");
 		zbx_db_insert_execute(&db_insert);
 		zbx_db_insert_clean(&db_insert);
 	}
@@ -4040,6 +4134,7 @@ static int	lld_items_tags_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, int
 	zbx_db_insert_t		db_insert;
 	char			*sql = NULL;
 	size_t			sql_alloc = 0, sql_offset = 0;
+	zbx_uint64_t		new_tagid = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -4059,6 +4154,8 @@ static int	lld_items_tags_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, int
 			if (0 == (item_tag->flags & ZBX_FLAG_LLD_ITEM_TAG_DISCOVERED))
 			{
 				zbx_vector_uint64_append(&deleteids, item_tag->item_tagid);
+				zbx_audit_item_delete_tag(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+						item_tag->item_tagid);
 				continue;
 			}
 
@@ -4094,6 +4191,7 @@ static int	lld_items_tags_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, int
 
 	if (0 != new_tag_num)
 	{
+		new_tagid = DBget_maxid_num("item_tag", new_tag_num);
 		zbx_db_insert_prepare(&db_insert, "item_tag", "itemtagid", "itemid", "tag", "value",
 				NULL);
 	}
@@ -4113,14 +4211,19 @@ static int	lld_items_tags_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, int
 
 			if (0 == item_tag->item_tagid)
 			{
-				zbx_db_insert_add_values(&db_insert, __UINT64_C(0), item->itemid, item_tag->tag,
+				zbx_db_insert_add_values(&db_insert, new_tagid, item->itemid, item_tag->tag,
 						item_tag->value);
+				zbx_audit_item_update_json_add_item_tag(item->itemid, new_tagid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, item_tag->tag, item_tag->value);
+				new_tagid++;
 				continue;
 			}
 
 			if (0 == (item_tag->flags & ZBX_FLAG_LLD_ITEM_TAG_UPDATE))
 				continue;
 
+			zbx_audit_item_update_json_update_item_tag_create_entry(item->itemid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, item_tag->item_tagid);
 			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "update item_tag set");
 
 			if (0 != (item_tag->flags & ZBX_FLAG_LLD_ITEM_TAG_UPDATE_TAG))
@@ -4130,6 +4233,9 @@ static int	lld_items_tags_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, int
 				tag_esc = DBdyn_escape_string(item_tag->tag);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%ctag='%s'", delim, tag_esc);
 
+				zbx_audit_item_update_json_update_item_tag_tag(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, item_tag->item_tagid,
+						item_tag->tag_orig, item_tag->tag);
 				zbx_free(tag_esc);
 				delim = ',';
 			}
@@ -4141,6 +4247,10 @@ static int	lld_items_tags_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, int
 				value_esc = DBdyn_escape_string(item_tag->value);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%cvalue='%s'", delim, value_esc);
 
+				zbx_audit_item_update_json_update_item_tag_value(item->itemid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, item_tag->item_tagid,
+						item_tag->value_orig, item_tag->value);
+
 				zbx_free(value_esc);
 			}
 
@@ -4161,7 +4271,6 @@ static int	lld_items_tags_save(zbx_uint64_t hostid, zbx_vector_ptr_t *items, int
 
 	if (0 != new_tag_num)
 	{
-		zbx_db_insert_autoincrement(&db_insert, "itemtagid");
 		zbx_db_insert_execute(&db_insert);
 		zbx_db_insert_clean(&db_insert);
 	}
@@ -4187,7 +4296,7 @@ out:
 }
 
 static	void	get_item_info(const void *object, zbx_uint64_t *id, int *discovery_flag, int *lastcheck,
-		int *ts_delete)
+		int *ts_delete, const char **name)
 {
 	zbx_lld_item_t	*item;
 
@@ -4197,6 +4306,7 @@ static	void	get_item_info(const void *object, zbx_uint64_t *id, int *discovery_f
 	*discovery_flag = item->flags & ZBX_FLAG_LLD_ITEM_DISCOVERED;
 	*lastcheck = item->lastcheck;
 	*ts_delete = item->ts_delete;
+	*name = item->name;
 }
 
 static void	lld_item_links_populate(const zbx_vector_ptr_t *item_prototypes, zbx_vector_ptr_t *lld_rows,
@@ -4371,9 +4481,13 @@ static void	lld_item_prototypes_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *i
 		preproc_op = (zbx_lld_item_preproc_t *)zbx_malloc(NULL, sizeof(zbx_lld_item_preproc_t));
 		preproc_op->step = atoi(row[1]);
 		preproc_op->type = atoi(row[2]);
+		preproc_op->type_orig = preproc_op->type;
 		preproc_op->params = zbx_strdup(NULL, row[3]);
+		preproc_op->params_orig = NULL;
 		preproc_op->error_handler = atoi(row[4]);
+		preproc_op->error_handler_orig = preproc_op->error_handler;
 		preproc_op->error_handler_params = zbx_strdup(NULL, row[5]);
+		preproc_op->error_handler_params_orig = NULL;
 		zbx_vector_ptr_append(&item_prototype->preproc_ops, preproc_op);
 	}
 	DBfree_result(result);
@@ -4408,7 +4522,9 @@ static void	lld_item_prototypes_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *i
 
 		item_param = (zbx_lld_item_param_t *)zbx_malloc(NULL, sizeof(zbx_lld_item_param_t));
 		item_param->name = zbx_strdup(NULL, row[1]);
+		item_param->name_orig = NULL;
 		item_param->value = zbx_strdup(NULL, row[2]);
+		item_param->value_orig = NULL;
 		zbx_vector_ptr_append(&item_prototype->item_params, item_param);
 	}
 	DBfree_result(result);
@@ -4443,7 +4559,9 @@ static void	lld_item_prototypes_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *i
 
 		item_tag = (zbx_lld_item_tag_t *)zbx_malloc(NULL, sizeof(zbx_lld_item_tag_t));
 		item_tag->tag = zbx_strdup(NULL, row[1]);
+		item_tag->tag_orig = NULL;
 		item_tag->value = zbx_strdup(NULL, row[2]);
+		item_tag->value_orig = NULL;
 		zbx_vector_ptr_append(&item_prototype->item_tags, item_tag);
 	}
 	DBfree_result(result);
diff --git a/src/zabbix_server/lld/lld_trigger.c b/src/zabbix_server/lld/lld_trigger.c
index f120cb76bd9..1a04d4b696d 100644
--- a/src/zabbix_server/lld/lld_trigger.c
+++ b/src/zabbix_server/lld/lld_trigger.c
@@ -3729,7 +3729,7 @@ static void	lld_trigger_dependencies_validate(zbx_vector_ptr_t *triggers, char *
 }
 
 static	void	get_trigger_info(const void *object, zbx_uint64_t *id, int *discovery_flag, int *lastcheck,
-		int *ts_delete)
+		int *ts_delete, const char **name)
 {
 	zbx_lld_trigger_t	*trigger;
 
@@ -3739,6 +3739,7 @@ static	void	get_trigger_info(const void *object, zbx_uint64_t *id, int *discover
 	*discovery_flag = trigger->flags & ZBX_FLAG_LLD_TRIGGER_DISCOVERED;
 	*lastcheck = trigger->lastcheck;
 	*ts_delete = trigger->ts_delete;
+	*name = trigger->description;
 }
 
 /******************************************************************************
diff --git a/src/zabbix_server/service/service_manager.c b/src/zabbix_server/service/service_manager.c
index 7c624b00e08..2a756464cb4 100644
--- a/src/zabbix_server/service/service_manager.c
+++ b/src/zabbix_server/service/service_manager.c
@@ -571,8 +571,6 @@ static void	sync_services(zbx_service_manager_t *service_manager, int *updated,
 
 		if (NULL == (service = zbx_hashset_search(&service_manager->services, &service_local)))
 		{
-			service_local.revision = revision;
-
 			zbx_vector_ptr_create(&service_local.tags);
 			zbx_vector_ptr_create(&service_local.children);
 			zbx_vector_ptr_create(&service_local.parents);
@@ -584,7 +582,6 @@ static void	sync_services(zbx_service_manager_t *service_manager, int *updated,
 			service = zbx_hashset_insert(&service_manager->services, &service_local, sizeof(service_local));
 
 			update = 1;
-			continue;
 		}
 		else
 		{
@@ -2916,6 +2913,144 @@ static void	process_parentlist(const zbx_ipc_message_t *message, zbx_service_man
 	zbx_free(data);
 }
 
+
+/******************************************************************************
+ *                                                                            *
+ * Function: service_update_event_severity                                    *
+ *                                                                            *
+ * Purpose: update cached service problem and queue service for update        *
+ *                                                                            *
+ ******************************************************************************/
+static void	service_update_event_severity(zbx_service_manager_t *service_manager, zbx_service_t *service,
+		zbx_uint64_t eventid, int severity)
+{
+	int			index;
+	zbx_service_problem_t	*service_problem;
+	zbx_services_diff_t	*services_diff, services_diff_local;
+
+	if (FAIL == (index = zbx_vector_ptr_search(&service->service_problems, &eventid,
+			ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC)))
+	{
+		return;
+	}
+
+	service_problem = (zbx_service_problem_t *)service->service_problems.values[index];
+	service_problem->severity = severity;
+
+	services_diff_local.serviceid = service->serviceid;
+
+	if (NULL == (services_diff = zbx_hashset_search(&service_manager->service_diffs, &services_diff_local)))
+	{
+		zbx_vector_ptr_create(&services_diff_local.service_problems);
+		zbx_vector_ptr_create(&services_diff_local.service_problems_recovered);
+		services_diff_local.flags = ZBX_FLAG_SERVICE_UPDATE;
+		zbx_hashset_insert(&service_manager->service_diffs, &services_diff_local, sizeof(services_diff_local));
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: db_update_service_problems                                       *
+ *                                                                            *
+ * Purpose: update service_problem table with the changed event severities    *
+ *                                                                            *
+ ******************************************************************************/
+static int	db_update_service_problems(const zbx_vector_ptr_t *event_severities)
+{
+	int	i, txn_rc;
+	char	*sql = NULL;
+	size_t	sql_alloc = 0;
+
+	do
+	{
+		size_t	sql_offset = 0;
+
+		DBbegin();
+		DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset);
+
+		for (i = 0; i < event_severities->values_num; i++)
+		{
+			zbx_event_severity_t	*es = (zbx_event_severity_t *)event_severities->values[i];
+
+			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
+					"update service_problem set severity=%d where eventid=" ZBX_FS_UI64 ";\n",
+					es->severity, es->eventid);
+			DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset);
+		}
+
+		DBend_multiple_update(&sql, &sql_alloc, &sql_offset);
+
+		if (16 < sql_offset)
+			DBexecute("%s", sql);
+	}
+	while (ZBX_DB_DOWN == (txn_rc = DBcommit()));
+
+	zbx_free(sql);
+
+	return (ZBX_DB_FAIL != txn_rc ? SUCCEED : FAIL);
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: process_event_severities                                         *
+ *                                                                            *
+ * Purpose: update event severities, service statuses in cache and database   *
+ *          according to the event severity changes during acknowledgment     *
+ *                                                                            *
+ ******************************************************************************/
+static void	process_event_severities(const zbx_ipc_message_t *message, zbx_service_manager_t *service_manager)
+{
+	zbx_vector_ptr_t	event_severities;
+	int			i, j, severities_num;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() size:%u" , __func__, message->size);
+
+	zbx_vector_ptr_create(&event_severities);
+
+	zbx_service_deserialize_event_severities(message->data, &event_severities);
+	severities_num = event_severities.values_num;
+
+	if (SUCCEED != db_update_service_problems(&event_severities))
+	{
+		zabbix_log(LOG_LEVEL_WARNING, "cannot update service problem severities in database");
+		goto out;
+	}
+
+	for (i = 0; i < event_severities.values_num; i++)
+	{
+		zbx_event_severity_t		*es = (zbx_event_severity_t *)event_severities.values[i];
+		zbx_event_t			event_local = {.eventid = es->eventid}, *event = &event_local;
+		zbx_service_problem_index_t	*pi, pi_local;
+
+		/* update event severity in problem cache */
+
+		if (NULL == (event = *(zbx_event_t **)zbx_hashset_search(&service_manager->problem_events, &event)))
+			continue;
+
+		event->severity = es->severity;
+
+		/* update event severities in service problems lists */
+
+		pi_local.eventid = es->eventid;
+
+		if (NULL == (pi = zbx_hashset_search(&service_manager->service_problems_index, &pi_local)))
+			continue;
+
+		for (j = 0; j < pi->services.values_num; j++)
+		{
+			zbx_service_t	*service = (zbx_service_t *)pi->services.values[j];
+			service_update_event_severity(service_manager, service, es->eventid, es->severity);
+		}
+	}
+
+	db_update_services(service_manager);
+out:
+	zbx_vector_ptr_clear_ext(&event_severities, zbx_ptr_free);
+	zbx_vector_ptr_destroy(&event_severities);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() severities_num:%d", __func__, severities_num);
+}
+
 static void	service_manager_init(zbx_service_manager_t *service_manager)
 {
 	zbx_hashset_create_ext(&service_manager->problem_events, 1000, default_uint64_ptr_hash_func,
@@ -3314,6 +3449,9 @@ ZBX_THREAD_ENTRY(service_manager_thread, args)
 				case ZBX_IPC_SERVICE_SERVICE_PARENT_LIST:
 					process_parentlist(message, &service_manager, client);
 					break;
+				case ZBX_IPC_SERVICE_EVENT_SEVERITIES:
+					process_event_severities(message, &service_manager);
+					break;
 				default:
 					THIS_SHOULD_NEVER_HAPPEN;
 			}
diff --git a/src/zabbix_server/taskmanager/taskmanager.c b/src/zabbix_server/taskmanager/taskmanager.c
index 461905552ec..4d7d958651a 100644
--- a/src/zabbix_server/taskmanager/taskmanager.c
+++ b/src/zabbix_server/taskmanager/taskmanager.c
@@ -29,6 +29,7 @@
 #include "export.h"
 #include "taskmanager.h"
 #include "zbxdiag.h"
+#include "service_protocol.h"
 
 #define ZBX_TM_PROCESS_PERIOD		5
 #define ZBX_TM_CLEANUP_PERIOD		SEC_PER_HOUR
@@ -120,7 +121,8 @@ static int	tm_try_task_close_problem(zbx_uint64_t taskid)
 			zbx_vector_uint64_append(&triggerids, triggerid);
 			DCconfig_lock_triggers_by_triggerids(&triggerids, &locked_triggerids);
 
-			/* only close the problem if source trigger was successfully locked */
+			/* close the problem if source trigger was successfully locked or */
+			/* if the trigger doesn't exist, but event still exists */
 			if (0 != locked_triggerids.values_num)
 			{
 				ZBX_STR2UINT64(userid, row[0]);
@@ -131,6 +133,12 @@ static int	tm_try_task_close_problem(zbx_uint64_t taskid)
 
 				ret = SUCCEED;
 			}
+			else if (FAIL == DCconfig_trigger_exists(triggerid))
+			{
+				DBexecute("update task set status=%d where taskid=" ZBX_FS_UI64, ZBX_TM_STATUS_DONE,
+						taskid);
+				ret = SUCCEED;
+			}
 		}
 	}
 	DBfree_result(result);
@@ -300,6 +308,48 @@ static void	tm_process_data_result(zbx_uint64_t taskid)
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
+/******************************************************************************
+ *                                                                            *
+ * Function: notify_service_manager                                           *
+ *                                                                            *
+ * Purpose: notify service manager about problem severity changes             *
+ *                                                                            *
+ ******************************************************************************/
+static void	notify_service_manager(const zbx_vector_ptr_t *ack_tasks)
+{
+	int			i;
+	zbx_vector_ptr_t	event_severities;
+
+	zbx_vector_ptr_create(&event_severities);
+
+	for (i = 0; i < ack_tasks->values_num; i++)
+	{
+		zbx_ack_task_t	*ack_task = (zbx_ack_task_t *)ack_tasks->values[i];
+
+		if (ack_task->old_severity != ack_task->new_severity)
+		{
+			zbx_event_severity_t	*es;
+
+			es = (zbx_event_severity_t *)zbx_malloc(NULL, sizeof(zbx_event_severity_t));
+			es->eventid = ack_task->eventid;
+			es->severity = ack_task->new_severity;
+			zbx_vector_ptr_append(&event_severities, es);
+		}
+	}
+
+	if (0 != event_severities.values_num)
+	{
+		unsigned char	*data;
+		zbx_uint32_t	size;
+
+		size = zbx_service_serialize_event_severities(&data, &event_severities);
+		zbx_service_send(ZBX_IPC_SERVICE_EVENT_SEVERITIES, data, size, NULL);
+		zbx_free(data);
+	}
+
+	zbx_vector_ptr_clear_ext(&event_severities, zbx_ptr_free);
+	zbx_vector_ptr_destroy(&event_severities);
+}
 
 /******************************************************************************
  *                                                                            *
@@ -327,7 +377,7 @@ static int	tm_process_acknowledgements(zbx_vector_uint64_t *ack_taskids)
 	zbx_vector_ptr_create(&ack_tasks);
 
 	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"select a.eventid,ta.acknowledgeid,ta.taskid"
+			"select a.eventid,ta.acknowledgeid,ta.taskid,a.old_severity,a.new_severity"
 			" from task_acknowledge ta"
 			" left join acknowledges a"
 				" on ta.acknowledgeid=a.acknowledgeid"
@@ -354,6 +404,8 @@ static int	tm_process_acknowledgements(zbx_vector_uint64_t *ack_taskids)
 		ZBX_STR2UINT64(ack_task->eventid, row[0]);
 		ZBX_STR2UINT64(ack_task->acknowledgeid, row[1]);
 		ZBX_STR2UINT64(ack_task->taskid, row[2]);
+		ack_task->old_severity = atoi(row[3]);
+		ack_task->new_severity = atoi(row[4]);
 		zbx_vector_ptr_append(&ack_tasks, ack_task);
 	}
 	DBfree_result(result);
@@ -362,6 +414,8 @@ static int	tm_process_acknowledgements(zbx_vector_uint64_t *ack_taskids)
 	{
 		zbx_vector_ptr_sort(&ack_tasks, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC);
 		processed_num = process_actions_by_acknowledgements(&ack_tasks);
+
+		notify_service_manager(&ack_tasks);
 	}
 
 	sql_offset = 0;
diff --git a/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml b/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml
index 328dfdedcc8..190afeb7ec9 100644
--- a/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml
+++ b/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:27Z'
+  version: '6.0'
+  date: '2021-08-24T06:09:11Z'
   groups:
     -
       uuid: d37f71c7e3f7469bab645852a69a2018
@@ -485,7 +485,7 @@ zabbix_export:
               parameters:
                 - 1h
           master_item:
-            key: hikvision_cam.get_streaming
+            key: hikvision_cam.get_status
           tags:
             -
               tag: Application
diff --git a/templates/db/mssql_odbc/README.md b/templates/db/mssql_odbc/README.md
index edf29d928da..6f6322c0188 100644
--- a/templates/db/mssql_odbc/README.md
+++ b/templates/db/mssql_odbc/README.md
@@ -131,10 +131,10 @@ There are no template links in this template.
 |MSSQL |MSSQL: Logouts per second |<p>Total number of logout operations started per second. Any value over 2 may indicate insufcient connection pooling.</p> |DEPENDENT |mssql.logouts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='Logouts/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: Number of blocked processes |<p>Number of currently blocked processes.</p> |DEPENDENT |mssql.processes_blocked<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='Processes blocked')].cntr_value.first()`</p> |
 |MSSQL |MSSQL: Number users connected |<p>Number of users connected to MS SQL Server.</p> |DEPENDENT |mssql.user_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='User Connections')].cntr_value.first()`</p> |
-|MSSQL |MSSQL: Average latch wait time |<p>Average latch wait time (in milliseconds) for latch requests that had to wait.</p> |CALCULATED |mssql.average_latch_wait_time<p>**Expression**:</p>`(last(mssql.average_latch_wait_time_raw) - prev(mssql.average_latch_wait_time_raw)) / (last(mssql.average_latch_wait_time_base) - prev(mssql.average_latch_wait_time_base) +  (last(mssql.average_latch_wait_time_base) - prev(mssql.average_latch_wait_time_base)=0)) ` |
+|MSSQL |MSSQL: Average latch wait time |<p>Average latch wait time (in milliseconds) for latch requests that had to wait.</p> |CALCULATED |mssql.average_latch_wait_time<p>**Expression**:</p>`(last(//mssql.average_latch_wait_time_raw) - last(//mssql.average_latch_wait_time_raw,#2)) / (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2) +  (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2)=0)) ` |
 |MSSQL |MSSQL: Latch waits per second |<p>The number of latch requests that could not be granted immediately. Latches are lightweight means of holding a very transient server resource, such as an address in memory.</p> |DEPENDENT |mssql.latch_waits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Latch Waits/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: Total latch wait Time |<p>Total latch wait time (in milliseconds) for latch requests in the last second. This value should stay stable compared to the number of latch waits per second.</p> |DEPENDENT |mssql.total_latch_wait_time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Total Latch Wait Time (ms)')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Total average wait time |<p>The average wait time, in milliseconds, for each lock request that had to wait.</p> |CALCULATED |mssql.average_wait_time<p>**Expression**:</p>`(last(mssql.average_wait_time_raw) - prev(mssql.average_wait_time_raw)) / (last(mssql.average_wait_time_base) - prev(mssql.average_wait_time_base) +  (last(mssql.average_wait_time_base) - prev(mssql.average_wait_time_base)=0)) ` |
+|MSSQL |MSSQL: Total average wait time |<p>The average wait time, in milliseconds, for each lock request that had to wait.</p> |CALCULATED |mssql.average_wait_time<p>**Expression**:</p>`(last(//mssql.average_wait_time_raw) - last(//mssql.average_wait_time_raw,#2)) / (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2) +  (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2)=0)) ` |
 |MSSQL |MSSQL: Total lock requests per second |<p>Number of new locks and lock conversions per second requested from the lock manager.</p> |DEPENDENT |mssql.lock_requests_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Requests/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: Total lock requests per second that timed out |<p>Number of timed out lock requests per second, including requests for NOWAIT locks.</p> |DEPENDENT |mssql.lock_timeouts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Timeouts/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: Total lock requests per second that required waiting |<p>Number of lock requests per second that required the caller to wait.</p> |DEPENDENT |mssql.lock_waits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Waits/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
@@ -157,9 +157,9 @@ There are no template links in this template.
 |MSSQL |MSSQL: Total errors per second |<p>Number of errors per second.</p> |DEPENDENT |mssql.errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: Auto-param attempts per second |<p>Number of auto-parameterization attempts per second. The total should be the sum of the failed, safe, and unsafe auto-parameterizations. Auto-parameterization occurs when an instance of SQL Server tries to parameterize a Transact-SQL request by replacing some literals with parameters to me reuse of the resulting cached execution plan across multiple similar-looking requests possible. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server. This counter does not include forced parameterizations.</p> |DEPENDENT |mssql.autoparam_attempts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Auto-Param Attempts/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: Batch requests per second |<p>Number of Transact-SQL command batches received per second. This statistic is affected by all constraints (such as I/O, number of users, cache size, complexity of requests, and so on). High batch requests mean good throughput.</p> |DEPENDENT |mssql.batch_requests_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Batch Requests/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Percent of Adhoc queries running |<p>The ratio of SQL compilations per second to Batch requests per second in percentage.</p> |CALCULATED |mssql.percent_of_adhoc_queries<p>**Expression**:</p>`last(mssql.sql_compilations_sec.rate) * 100 / (last(mssql.batch_requests_sec.rate) + (last(mssql.batch_requests_sec.rate)=0))` |
-|MSSQL |MSSQL: Percent of Recompiled Transact-SQL Objects |<p>The ratio of SQL re-compilations per second to SQL compilations per second in percentage.</p> |CALCULATED |mssql.percent_recompilations_to_compilations<p>**Expression**:</p>`last(mssql.sql_recompilations_sec.rate) * 100 / (last(mssql.sql_compilations_sec.rate) + (last(mssql.sql_compilations_sec.rate)=0))` |
-|MSSQL |MSSQL: Full scans to Index searches ratio |<p>The ratio of Full scans per second to Index searches per second. The threshold recommendation is strictly for OLTP workloads.</p> |CALCULATED |mssql.scan_to_search<p>**Expression**:</p>`last(mssql.full_scans_sec.rate) / (last(mssql.index_searches_sec.rate) + (last(mssql.index_searches_sec.rate)=0))` |
+|MSSQL |MSSQL: Percent of Adhoc queries running |<p>The ratio of SQL compilations per second to Batch requests per second in percentage.</p> |CALCULATED |mssql.percent_of_adhoc_queries<p>**Expression**:</p>`last(//mssql.sql_compilations_sec.rate) * 100 / (last(//mssql.batch_requests_sec.rate) + (last(//mssql.batch_requests_sec.rate)=0)) ` |
+|MSSQL |MSSQL: Percent of Recompiled Transact-SQL Objects |<p>The ratio of SQL re-compilations per second to SQL compilations per second in percentage.</p> |CALCULATED |mssql.percent_recompilations_to_compilations<p>**Expression**:</p>`last(//mssql.sql_recompilations_sec.rate) * 100 / (last(//mssql.sql_compilations_sec.rate) + (last(//mssql.sql_compilations_sec.rate)=0)) ` |
+|MSSQL |MSSQL: Full scans to Index searches ratio |<p>The ratio of Full scans per second to Index searches per second. The threshold recommendation is strictly for OLTP workloads.</p> |CALCULATED |mssql.scan_to_search<p>**Expression**:</p>`last(//mssql.full_scans_sec.rate) / (last(//mssql.index_searches_sec.rate) + (last(//mssql.index_searches_sec.rate)=0))` |
 |MSSQL |MSSQL: Failed auto-params per second |<p>Number of failed auto-parameterization attempts per second. This number should be small. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server.</p> |DEPENDENT |mssql.failed_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Failed Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: Safe auto-params per second |<p>Number of safe auto-parameterization attempts per second. Safe refers to a determination that a cached execution plan can be shared between different similar-looking Transact-SQL statements. SQL Server makes many auto-parameterization attempts some of which turn out to be safe and others fail. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server. This does not include forced parameterizations.</p> |DEPENDENT |mssql.safe_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Safe Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
 |MSSQL |MSSQL: SQL compilations per second |<p>Number of SQL compilations per second. Indicates the number of times the compile code path is entered. Includes compiles caused by statement-level recompilations in SQL Server. After SQL Server user activity is stable, this value reaches a steady state.</p> |DEPENDENT |mssql.sql_compilations_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='SQL Compilations/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
@@ -229,62 +229,62 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|MSSQL: Service is unavailable |<p>The TCP port of the MS SQL Server service is currently unavailable.</p> |`{TEMPLATE_NAME:net.tcp.service[tcp,{HOST.CONN},{$MSSQL.PORT}].last()}=0` |DISASTER | |
-|MSSQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MSSQL version has changed. Ack to close.</p> |`{TEMPLATE_NAME:mssql.version.diff()}=1 and {TEMPLATE_NAME:mssql.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|MSSQL: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:mssql.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|MSSQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:mssql.uptime.nodata(30m)}=1` |INFO |<p>**Depends on**:</p><p>- MSSQL: Service is unavailable</p> |
-|MSSQL: Too frequently pointers using |<p>Rows with varchar columns can experience expansion when varchar values are updated with a longer string.  In the case where the row cannot fit in the existing page, the row migrates and access to the row will traverse a pointer.  This only happens on heaps (tables without clustered indexes). Evaluate clustered index for heap tables.  In cases where clustered indexes cannot be used, drop non-clustered indexes, build a clustered index to reorg pages and rows, drop the clustered index, then recreate non-clustered indexes.</p> |`{TEMPLATE_NAME:mssql.forwarded_records_sec.rate.last()} * 100 > 10 * {MSSQL by ODBC:mssql.batch_requests_sec.rate.last()} ` |WARNING | |
-|MSSQL: Number of work files created per second is high (over {$MSSQL.WORK_FILES.MAX} for 5m) |<p>Too many work files created per second to store temporary results for hash joins and hash aggregates.</p> |`{TEMPLATE_NAME:mssql.workfiles_created_sec.rate.min(5m)}>{$MSSQL.WORK_FILES.MAX}` |AVERAGE | |
-|MSSQL: Number of work tables created per second is high (over {$MSSQL.WORK_TABLES.MAX} for 5m) |<p>Too many work tables created per second to store temporary results for query spool, lob variables, XML variables, and cursors.</p> |`{TEMPLATE_NAME:mssql.worktables_created_sec.rate.min(5m)}>{$MSSQL.WORK_TABLES.MAX}` |AVERAGE | |
-|MSSQL: Percentage of work tables available from the work table cache is low (below {$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}% for 5m) |<p>A value less than 90% may indicate insufcient memory, since execution plans are being dropped, or on 32-bit systems, may indicate the need for an upgrade to a 64-bit system</p> |`{TEMPLATE_NAME:mssql.worktables_from_cache_ratio.max(5m)}<{$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}` |HIGH | |
-|MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m) |<p>Too low buffer cache hit ratio.</p> |`{TEMPLATE_NAME:mssql.buffer_cache_hit_ratio.max(5m)}<{$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}` |HIGH | |
-|MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.WARN}% for 5m) |<p>Low buffer cache hit ratio.</p> |`{TEMPLATE_NAME:mssql.buffer_cache_hit_ratio.max(5m)}<{$MSSQL.BUFFER_CACHE_RATIO.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m)</p> |
-|MSSQL: Number of rps waiting for a free page is high (over {$MSSQL.FREE_LIST_STALLS.MAX} for 5m) |<p>Some requests have to wait for a free page.</p> |`{TEMPLATE_NAME:mssql.free_list_stalls_sec.rate.min(5m)}>{$MSSQL.FREE_LIST_STALLS.MAX}` |WARNING | |
-|MSSQL: Number of buffers written per second by the lazy writer is high (over {$MSSQL.LAZY_WRITES.MAX} for 5m) |<p>The number of buffers written per second by the buffer manager's lazy writer exceeds the threshold.</p> |`{TEMPLATE_NAME:mssql.lazy_writes_sec.rate.min(5m)}>{$MSSQL.LAZY_WRITES.MAX}` |WARNING | |
-|MSSQL: Page life expectancy is low (less {$MSSQL.PAGE_LIFE_EXPECTANCY.MIN}min for 15m) |<p>The page stays in the buffer pool without references of less time than the threshold value.</p> |`{TEMPLATE_NAME:mssql.page_life_expectancy.max(15m)}<{$MSSQL.PAGE_LIFE_EXPECTANCY.MIN}` |HIGH | |
-|MSSQL: Number of physical database page reads per second is high (over {$MSSQL.PAGE_READS.MAX} for 5m) |<p>The physical database page reads are issued too frequently.</p> |`{TEMPLATE_NAME:mssql.page_reads_sec.rate.min(5m)}>{$MSSQL.PAGE_READS.MAX}` |WARNING | |
-|MSSQL: Number of physical database page writes per second is high (over {$MSSQL.PAGE_WRITES.MAX} for 5m) |<p>The physical database page writes are issued too frequently.</p> |`{TEMPLATE_NAME:mssql.page_writes_sec.rate.min(5m)}>{$MSSQL.PAGE_WRITES.MAX}` |WARNING | |
-|MSSQL: Too many physical reads occurring |<p>If this value makes up even a sizeable minority of the total Page Reads/sec (say, greater than 20% of the total page reads), you may have too many physical reads occurring.</p> |`{TEMPLATE_NAME:mssql.readahead_pages_sec.rate.last()} > {$MSSQL.PERCENT_READAHEAD.MAX} / 100 * {MSSQL by ODBC:mssql.page_reads_sec.rate.last()}` |WARNING | |
-|MSSQL: Total average wait time for locks is high (over {$MSSQL.AVERAGE_WAIT_TIME.MAX}ms for 5m) |<p>An average wait time longer than 500ms may indicate excessive blocking. This value should generally correlate to 'Lock Waits/sec' and move up or down with it accordingly.</p> |`{TEMPLATE_NAME:mssql.average_wait_time.min(5m)}>{$MSSQL.AVERAGE_WAIT_TIME.MAX}` |WARNING | |
-|MSSQL: Total number of locks per second is high (over {$MSSQL.LOCK_REQUESTS.MAX} for 5m) |<p>Number of new locks and lock conversions per second requested from the lock manager is high.</p> |`{TEMPLATE_NAME:mssql.lock_requests_sec.rate.min(5m)}>{$MSSQL.LOCK_REQUESTS.MAX}` |WARNING | |
-|MSSQL: Total lock requests per second that timed out is high (over {$MSSQL.LOCK_TIMEOUTS.MAX} for 5m) |<p>The total number of timed out lock requests per second, including requests for NOWAIT locks, is high.</p> |`{TEMPLATE_NAME:mssql.lock_timeouts_sec.rate.min(5m)}>{$MSSQL.LOCK_TIMEOUTS.MAX}` |WARNING | |
-|MSSQL: Some blocking is occurring for 5m |<p>Values greater than zero indicate at least some blocking is occurring, while a value of zero can quickly eliminate blocking as a potential root-cause problem.</p> |`{TEMPLATE_NAME:mssql.lock_waits_sec.rate.min(5m)}>0` |AVERAGE | |
-|MSSQL: Number of deadlock is high (over {$MSSQL.DEADLOCKS.MAX} for 5m) |<p>Too many deadlocks are occurring currently.</p> |`{TEMPLATE_NAME:mssql.number_deadlocks_sec.rate.min(5m)}>{$MSSQL.DEADLOCKS.MAX}` |AVERAGE | |
-|MSSQL: Percent of adhoc queries running is over {$MSSQL.PERCENT_COMPILATIONS.MAX}% for 15m |<p>The lower this value is the better. High values often indicate excessive adhoc querying and should be as low as possible. If excessive adhoc querying is happening, try rewriting the queries as procedures or invoke the queries using sp_executeSQL. When rewriting isn’t possible, consider using a plan guide or setting the database to parameterization forced mode.</p> |`{TEMPLATE_NAME:mssql.percent_of_adhoc_queries.min(15m)} > {$MSSQL.PERCENT_COMPILATIONS.MAX}` |WARNING | |
-|MSSQL: Percent of times statement recompiles is over {$MSSQL.PERCENT_RECOMPILATIONS.MAX}% for 15m |<p>This number should be at or near zero, since recompiles can cause deadlocks and exclusive compile locks. This counter’s value should follow in proportion to “Batch Requests/sec” and “SQL Compilations/sec”.</p> |`{TEMPLATE_NAME:mssql.percent_recompilations_to_compilations.min(15m)} > {$MSSQL.PERCENT_RECOMPILATIONS.MAX}` |WARNING | |
-|MSSQL: Index and table scans are often than index searches for 15m |<p>Index searches are preferable to index and table scans. For OLTP applications, optimize for more index searches and less scans (preferably, 1 full scan for every 1000 index searches). Index and table scans are expensive I/O operations.</p> |`{TEMPLATE_NAME:mssql.scan_to_search.min(15m)} > 0.001` |WARNING | |
-|MSSQL DB '{#DBNAME}': State is {ITEM.VALUE} |<p>The DB has a non-working state.</p> |`{TEMPLATE_NAME:mssql.db.state["{#DBNAME}"].last()}>1` |HIGH | |
-|MSSQL DB '{#DBNAME}': Number of commits waiting for the log flush is high (over {$MSSQL.LOG_FLUSH_WAITS.MAX:"{#DBNAME}"}/sec for 5m) |<p>Too many commits are waiting for the log flush.</p> |`{TEMPLATE_NAME:mssql.db.log_flush_waits_sec.rate["{#DBNAME}"].min(5m)}>{$MSSQL.LOG_FLUSH_WAITS.MAX:"{#DBNAME}"}` |WARNING | |
-|MSSQL DB '{#DBNAME}': Total wait time to flush the log is high (over {$MSSQL.LOG_FLUSH_WAIT_TIME.MAX:"{#DBNAME}"}ms for 5m) |<p>The wait time to flush the log is too long.</p> |`{TEMPLATE_NAME:mssql.db.log_flush_wait_time["{#DBNAME}"].min(5m)}>{$MSSQL.LOG_FLUSH_WAIT_TIME.MAX:"{#DBNAME}"}` |WARNING | |
-|MSSQL DB '{#DBNAME}': Percent of log using is high (over {$MSSQL.PERCENT_LOG_USED.MAX:"{#DBNAME}"}% for 5m) |<p>There's not enough space left in the log.</p> |`{TEMPLATE_NAME:mssql.db.percent_log_used["{#DBNAME}"].min(5m)}>{$MSSQL.PERCENT_LOG_USED.MAX:"{#DBNAME}"}` |WARNING | |
-|MSSQL DB '{#DBNAME}': Diff backup older than {$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"} |<p>The differential backup has not been executed for a long time.</p> |`{TEMPLATE_NAME:mssql.backup.diff["{#DBNAME}"].last()}>{$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"}` |HIGH |<p>Manual close: YES</p> |
-|MSSQL DB '{#DBNAME}': Diff backup older than {$MSSQL.BACKUP_DIFF.WARN:"{#DBNAME}"} |<p>The differential backup has not been executed for a long time.</p> |`{TEMPLATE_NAME:mssql.backup.diff["{#DBNAME}"].last()}>{$MSSQL.BACKUP_DIFF.WARN:"{#DBNAME}"}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MSSQL DB '{#DBNAME}': Diff backup older than {$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"}</p> |
-|MSSQL DB '{#DBNAME}': Full backup older than {$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"} |<p>The full backup has not been executed for a long time.</p> |`{TEMPLATE_NAME:mssql.backup.full["{#DBNAME}"].last()}>{$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"}` |HIGH |<p>Manual close: YES</p> |
-|MSSQL DB '{#DBNAME}': Full backup older than {$MSSQL.BACKUP_FULL.WARN:"{#DBNAME}"} |<p>The full backup has not been executed for a long time.</p> |`{TEMPLATE_NAME:mssql.backup.full["{#DBNAME}"].last()}>{$MSSQL.BACKUP_FULL.WARN:"{#DBNAME}"}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MSSQL DB '{#DBNAME}': Full backup older than {$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"}</p> |
-|MSSQL DB '{#DBNAME}': Log backup older than {$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"} |<p>The log backup has not been executed for a long time.</p> |`{TEMPLATE_NAME:mssql.backup.log["{#DBNAME}"].last()}>{$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"}` |HIGH |<p>Manual close: YES</p> |
-|MSSQL DB '{#DBNAME}': Log backup older than {$MSSQL.BACKUP_LOG.WARN:"{#DBNAME}"} |<p>The log backup has not been executed for a long time.</p> |`{TEMPLATE_NAME:mssql.backup.log["{#DBNAME}"].last()}>{$MSSQL.BACKUP_LOG.WARN:"{#DBNAME}"}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MSSQL DB '{#DBNAME}': Log backup older than {$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"}</p> |
-|MSSQL AG '{#GROUP_NAME}': Primary replica recovery health in progress |<p>The primary replica is in the synchronization process.</p> |`{TEMPLATE_NAME:mssql.primary_recovery_health["{#GROUP_NAME}"].last()}=0` |WARNING | |
-|MSSQL AG '{#GROUP_NAME}': Secondary replica recovery health in progress |<p>The secondary replica is in the synchronization process.</p> |`{TEMPLATE_NAME:mssql.secondary_recovery_health["{#GROUP_NAME}"].last()}=0` |WARNING | |
-|MSSQL AG '{#GROUP_NAME}': All replicas unhealthy |<p>None of the availability replicas have a healthy synchronization.</p> |`{TEMPLATE_NAME:mssql.synchronization_health["{#GROUP_NAME}"].last()}=0` |DISASTER | |
-|MSSQL AG '{#GROUP_NAME}': Some replicas unhealthy |<p>The synchronization health of some, but not all, availability replicas is healthy.</p> |`{TEMPLATE_NAME:mssql.synchronization_health["{#GROUP_NAME}"].last()}=1` |HIGH | |
-|MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The local availability database has a non-working state.</p> |`{TEMPLATE_NAME:mssql.local_db.state["{#DBNAME}"].last()}>0` |WARNING | |
-|MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': "{#DBNAME}" is Not healthy |<p>The synchronization state of the local availability database is NOT SYNCHRONIZING.</p> |`{TEMPLATE_NAME:mssql.local_db.synchronization_health["{#DBNAME}"].last()}=0` |HIGH | |
-|MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': "{#DBNAME}" is Partially healthy |<p>A database on a synchronous-commit availability replica is considered partially healthy if synchronization state is SYNCHRONIZING.</p> |`{TEMPLATE_NAME:mssql.local_db.synchronization_health["{#DBNAME}"].last()}=1` |AVERAGE | |
-|MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Log queue size is growing |<p>The log records of the primary database are not sent to the secondary databases.</p> |`{TEMPLATE_NAME:mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#1)}>{TEMPLATE_NAME:mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#2)} and {TEMPLATE_NAME:mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#2)}>{TEMPLATE_NAME:mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#3)}` |HIGH | |
-|MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Redo log queue size is growing |<p>The log records in the log files of the secondary replica have not yet been redone.</p> |`{TEMPLATE_NAME:mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#1)}>{TEMPLATE_NAME:mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#2)} and {TEMPLATE_NAME:mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#2)}>{TEMPLATE_NAME:mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"].last(#3)}` |HIGH | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is disconnected |<p>The response of an availability replica to the DISCONNECTED state depends on its role: </p><p>On the primary replica, if a secondary replica is disconnected, its secondary databases are marked as NOT SYNCHRONIZED on the primary replica, which waits for the secondary to reconnect; On a secondary replica, upon detecting that it is disconnected, the secondary replica attempts to reconnect to the primary replica.</p> |`{TEMPLATE_NAME:mssql.replica.connected_state["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=0 and {MSSQL by ODBC:mssql.replica.role["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=2` |WARNING | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Pending" or "Offline".</p> |`{TEMPLATE_NAME:mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=0 or {TEMPLATE_NAME:mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=1 or {TEMPLATE_NAME:mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=3` |WARNING | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Failed".</p> |`{TEMPLATE_NAME:mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=4` |AVERAGE | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Failed, no quorum".</p> |`{TEMPLATE_NAME:mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=5` |HIGH | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} Recovery in progress |<p>At least one joined database has a database state other than ONLINE.</p> |`{TEMPLATE_NAME:mssql.replica.recovery_health["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=0` |INFO | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is Not healthy |<p>At least one joined database is in the NOT SYNCHRONIZING state.</p> |`{TEMPLATE_NAME:mssql.replica.synchronization_health["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=0` |AVERAGE | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is Partially healthy |<p>Some replicas are not in the target synchronization state: synchronous-commit replicas should be synchronized, and asynchronous-commit replicas should be synchronizing.</p> |`{TEMPLATE_NAME:mssql.replica.synchronization_health["{#GROUP_NAME}_{#REPLICA_NAME}"].last()}=1` |WARNING | |
-|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The state of the mirror database and of the database mirroring session is "Suspended", "Disconnected from the other partner", or "Synchronizing".</p> |`{TEMPLATE_NAME:mssql.mirroring.state["{#DBNAME}"].last()}>=0 and {TEMPLATE_NAME:mssql.mirroring.state["{#DBNAME}"].last()}<=2` |INFO | |
-|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The state of the mirror database and of the database mirroring session is "Pending Failover".</p> |`{TEMPLATE_NAME:mssql.mirroring.state["{#DBNAME}"].last()}=3` |WARNING | |
-|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The state of the mirror database and of the database mirroring session is "Not synchronized". The partners are not synchronized. A failover is not possible now.</p> |`{TEMPLATE_NAME:mssql.mirroring.state["{#DBNAME}"].last()}=5` |HIGH | |
-|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" Witness is disconnected |<p>The state of the witness in the database mirroring session of the database is "Disconnected".</p> |`{TEMPLATE_NAME:mssql.mirroring.witness_state["{#DBNAME}"].last()}=2` |WARNING | |
-|MSSQL Job '{#JOBNAME}': Failed to run |<p>The last run of the job has failed.</p> |`{TEMPLATE_NAME:mssql.job.runstatus["{#JOBNAME}"].last()}=0` |WARNING |<p>Manual close: YES</p> |
-|MSSQL Job '{#JOBNAME}': Job duration is greater than {$MSSQL.BACKUP_DURATION.WARN:"{#JOBNAME}"} |<p>The job is taking too long.</p> |`{TEMPLATE_NAME:mssql.job.run_duration["{#JOBNAME}"].last()}>{$MSSQL.BACKUP_DURATION.WARN:"{#JOBNAME}"}` |WARNING |<p>Manual close: YES</p> |
+|MSSQL: Service is unavailable |<p>The TCP port of the MS SQL Server service is currently unavailable.</p> |`last(/MSSQL by ODBC/net.tcp.service[tcp,{HOST.CONN},{$MSSQL.PORT}])=0` |DISASTER | |
+|MSSQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MSSQL version has changed. Ack to close.</p> |`last(/MSSQL by ODBC/mssql.version,#1)<>last(/MSSQL by ODBC/mssql.version,#2) and length(last(/MSSQL by ODBC/mssql.version))>0` |INFO |<p>Manual close: YES</p> |
+|MSSQL: Service has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MSSQL by ODBC/mssql.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|MSSQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/MSSQL by ODBC/mssql.uptime,30m)=1` |INFO |<p>**Depends on**:</p><p>- MSSQL: Service is unavailable</p> |
+|MSSQL: Too frequently pointers using |<p>Rows with varchar columns can experience expansion when varchar values are updated with a longer string.  In the case where the row cannot fit in the existing page, the row migrates and access to the row will traverse a pointer.  This only happens on heaps (tables without clustered indexes). Evaluate clustered index for heap tables.  In cases where clustered indexes cannot be used, drop non-clustered indexes, build a clustered index to reorg pages and rows, drop the clustered index, then recreate non-clustered indexes.</p> |`last(/MSSQL by ODBC/mssql.forwarded_records_sec.rate) * 100 > 10 * last(/MSSQL by ODBC/mssql.batch_requests_sec.rate)` |WARNING | |
+|MSSQL: Number of work files created per second is high (over {$MSSQL.WORK_FILES.MAX} for 5m) |<p>Too many work files created per second to store temporary results for hash joins and hash aggregates.</p> |`min(/MSSQL by ODBC/mssql.workfiles_created_sec.rate,5m)>{$MSSQL.WORK_FILES.MAX}` |AVERAGE | |
+|MSSQL: Number of work tables created per second is high (over {$MSSQL.WORK_TABLES.MAX} for 5m) |<p>Too many work tables created per second to store temporary results for query spool, lob variables, XML variables, and cursors.</p> |`min(/MSSQL by ODBC/mssql.worktables_created_sec.rate,5m)>{$MSSQL.WORK_TABLES.MAX}` |AVERAGE | |
+|MSSQL: Percentage of work tables available from the work table cache is low (below {$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}% for 5m) |<p>A value less than 90% may indicate insufcient memory, since execution plans are being dropped, or on 32-bit systems, may indicate the need for an upgrade to a 64-bit system</p> |`max(/MSSQL by ODBC/mssql.worktables_from_cache_ratio,5m)<{$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}` |HIGH | |
+|MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m) |<p>Too low buffer cache hit ratio.</p> |`max(/MSSQL by ODBC/mssql.buffer_cache_hit_ratio,5m)<{$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}` |HIGH | |
+|MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.WARN}% for 5m) |<p>Low buffer cache hit ratio.</p> |`max(/MSSQL by ODBC/mssql.buffer_cache_hit_ratio,5m)<{$MSSQL.BUFFER_CACHE_RATIO.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m)</p> |
+|MSSQL: Number of rps waiting for a free page is high (over {$MSSQL.FREE_LIST_STALLS.MAX} for 5m) |<p>Some requests have to wait for a free page.</p> |`min(/MSSQL by ODBC/mssql.free_list_stalls_sec.rate,5m)>{$MSSQL.FREE_LIST_STALLS.MAX}` |WARNING | |
+|MSSQL: Number of buffers written per second by the lazy writer is high (over {$MSSQL.LAZY_WRITES.MAX} for 5m) |<p>The number of buffers written per second by the buffer manager's lazy writer exceeds the threshold.</p> |`min(/MSSQL by ODBC/mssql.lazy_writes_sec.rate,5m)>{$MSSQL.LAZY_WRITES.MAX}` |WARNING | |
+|MSSQL: Page life expectancy is low (less {$MSSQL.PAGE_LIFE_EXPECTANCY.MIN}min for 15m) |<p>The page stays in the buffer pool without references of less time than the threshold value.</p> |`max(/MSSQL by ODBC/mssql.page_life_expectancy,15m)<{$MSSQL.PAGE_LIFE_EXPECTANCY.MIN}` |HIGH | |
+|MSSQL: Number of physical database page reads per second is high (over {$MSSQL.PAGE_READS.MAX} for 5m) |<p>The physical database page reads are issued too frequently.</p> |`min(/MSSQL by ODBC/mssql.page_reads_sec.rate,5m)>{$MSSQL.PAGE_READS.MAX}` |WARNING | |
+|MSSQL: Number of physical database page writes per second is high (over {$MSSQL.PAGE_WRITES.MAX} for 5m) |<p>The physical database page writes are issued too frequently.</p> |`min(/MSSQL by ODBC/mssql.page_writes_sec.rate,5m)>{$MSSQL.PAGE_WRITES.MAX}` |WARNING | |
+|MSSQL: Too many physical reads occurring |<p>If this value makes up even a sizeable minority of the total Page Reads/sec (say, greater than 20% of the total page reads), you may have too many physical reads occurring.</p> |`last(/MSSQL by ODBC/mssql.readahead_pages_sec.rate) > {$MSSQL.PERCENT_READAHEAD.MAX} / 100 * last(/MSSQL by ODBC/mssql.page_reads_sec.rate)` |WARNING | |
+|MSSQL: Total average wait time for locks is high (over {$MSSQL.AVERAGE_WAIT_TIME.MAX}ms for 5m) |<p>An average wait time longer than 500ms may indicate excessive blocking. This value should generally correlate to 'Lock Waits/sec' and move up or down with it accordingly.</p> |`min(/MSSQL by ODBC/mssql.average_wait_time,5m)>{$MSSQL.AVERAGE_WAIT_TIME.MAX}` |WARNING | |
+|MSSQL: Total number of locks per second is high (over {$MSSQL.LOCK_REQUESTS.MAX} for 5m) |<p>Number of new locks and lock conversions per second requested from the lock manager is high.</p> |`min(/MSSQL by ODBC/mssql.lock_requests_sec.rate,5m)>{$MSSQL.LOCK_REQUESTS.MAX}` |WARNING | |
+|MSSQL: Total lock requests per second that timed out is high (over {$MSSQL.LOCK_TIMEOUTS.MAX} for 5m) |<p>The total number of timed out lock requests per second, including requests for NOWAIT locks, is high.</p> |`min(/MSSQL by ODBC/mssql.lock_timeouts_sec.rate,5m)>{$MSSQL.LOCK_TIMEOUTS.MAX}` |WARNING | |
+|MSSQL: Some blocking is occurring for 5m |<p>Values greater than zero indicate at least some blocking is occurring, while a value of zero can quickly eliminate blocking as a potential root-cause problem.</p> |`min(/MSSQL by ODBC/mssql.lock_waits_sec.rate,5m)>0` |AVERAGE | |
+|MSSQL: Number of deadlock is high (over {$MSSQL.DEADLOCKS.MAX} for 5m) |<p>Too many deadlocks are occurring currently.</p> |`min(/MSSQL by ODBC/mssql.number_deadlocks_sec.rate,5m)>{$MSSQL.DEADLOCKS.MAX}` |AVERAGE | |
+|MSSQL: Percent of adhoc queries running is over {$MSSQL.PERCENT_COMPILATIONS.MAX}% for 15m |<p>The lower this value is the better. High values often indicate excessive adhoc querying and should be as low as possible. If excessive adhoc querying is happening, try rewriting the queries as procedures or invoke the queries using sp_executeSQL. When rewriting isn’t possible, consider using a plan guide or setting the database to parameterization forced mode.</p> |`min(/MSSQL by ODBC/mssql.percent_of_adhoc_queries,15m) > {$MSSQL.PERCENT_COMPILATIONS.MAX}` |WARNING | |
+|MSSQL: Percent of times statement recompiles is over {$MSSQL.PERCENT_RECOMPILATIONS.MAX}% for 15m |<p>This number should be at or near zero, since recompiles can cause deadlocks and exclusive compile locks. This counter’s value should follow in proportion to “Batch Requests/sec” and “SQL Compilations/sec”.</p> |`min(/MSSQL by ODBC/mssql.percent_recompilations_to_compilations,15m) > {$MSSQL.PERCENT_RECOMPILATIONS.MAX}` |WARNING | |
+|MSSQL: Number of index and table scans exceeds index searches in the last 15m |<p>Index searches are preferable to index and table scans. For OLTP applications, optimize for more index searches and less scans (preferably, 1 full scan for every 1000 index searches). Index and table scans are expensive I/O operations.</p> |`min(/MSSQL by ODBC/mssql.scan_to_search,15m) > 0.001` |WARNING | |
+|MSSQL DB '{#DBNAME}': State is {ITEM.VALUE} |<p>The DB has a non-working state.</p> |`last(/MSSQL by ODBC/mssql.db.state["{#DBNAME}"])>1` |HIGH | |
+|MSSQL DB '{#DBNAME}': Number of commits waiting for the log flush is high (over {$MSSQL.LOG_FLUSH_WAITS.MAX:"{#DBNAME}"}/sec for 5m) |<p>Too many commits are waiting for the log flush.</p> |`min(/MSSQL by ODBC/mssql.db.log_flush_waits_sec.rate["{#DBNAME}"],5m)>{$MSSQL.LOG_FLUSH_WAITS.MAX:"{#DBNAME}"}` |WARNING | |
+|MSSQL DB '{#DBNAME}': Total wait time to flush the log is high (over {$MSSQL.LOG_FLUSH_WAIT_TIME.MAX:"{#DBNAME}"}ms for 5m) |<p>The wait time to flush the log is too long.</p> |`min(/MSSQL by ODBC/mssql.db.log_flush_wait_time["{#DBNAME}"],5m)>{$MSSQL.LOG_FLUSH_WAIT_TIME.MAX:"{#DBNAME}"}` |WARNING | |
+|MSSQL DB '{#DBNAME}': Percent of log using is high (over {$MSSQL.PERCENT_LOG_USED.MAX:"{#DBNAME}"}% for 5m) |<p>There's not enough space left in the log.</p> |`min(/MSSQL by ODBC/mssql.db.percent_log_used["{#DBNAME}"],5m)>{$MSSQL.PERCENT_LOG_USED.MAX:"{#DBNAME}"}` |WARNING | |
+|MSSQL DB '{#DBNAME}': Diff backup older than {$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"} |<p>The differential backup has not been executed for a long time.</p> |`last(/MSSQL by ODBC/mssql.backup.diff["{#DBNAME}"])>{$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"}` |HIGH |<p>Manual close: YES</p> |
+|MSSQL DB '{#DBNAME}': Diff backup older than {$MSSQL.BACKUP_DIFF.WARN:"{#DBNAME}"} |<p>The differential backup has not been executed for a long time.</p> |`last(/MSSQL by ODBC/mssql.backup.diff["{#DBNAME}"])>{$MSSQL.BACKUP_DIFF.WARN:"{#DBNAME}"}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MSSQL DB '{#DBNAME}': Diff backup older than {$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"}</p> |
+|MSSQL DB '{#DBNAME}': Full backup older than {$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"} |<p>The full backup has not been executed for a long time.</p> |`last(/MSSQL by ODBC/mssql.backup.full["{#DBNAME}"])>{$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"}` |HIGH |<p>Manual close: YES</p> |
+|MSSQL DB '{#DBNAME}': Full backup older than {$MSSQL.BACKUP_FULL.WARN:"{#DBNAME}"} |<p>The full backup has not been executed for a long time.</p> |`last(/MSSQL by ODBC/mssql.backup.full["{#DBNAME}"])>{$MSSQL.BACKUP_FULL.WARN:"{#DBNAME}"}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MSSQL DB '{#DBNAME}': Full backup older than {$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"}</p> |
+|MSSQL DB '{#DBNAME}': Log backup older than {$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"} |<p>The log backup has not been executed for a long time.</p> |`last(/MSSQL by ODBC/mssql.backup.log["{#DBNAME}"])>{$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"}` |HIGH |<p>Manual close: YES</p> |
+|MSSQL DB '{#DBNAME}': Log backup older than {$MSSQL.BACKUP_LOG.WARN:"{#DBNAME}"} |<p>The log backup has not been executed for a long time.</p> |`last(/MSSQL by ODBC/mssql.backup.log["{#DBNAME}"])>{$MSSQL.BACKUP_LOG.WARN:"{#DBNAME}"}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MSSQL DB '{#DBNAME}': Log backup older than {$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"}</p> |
+|MSSQL AG '{#GROUP_NAME}': Primary replica recovery health in progress |<p>The primary replica is in the synchronization process.</p> |`last(/MSSQL by ODBC/mssql.primary_recovery_health["{#GROUP_NAME}"])=0` |WARNING | |
+|MSSQL AG '{#GROUP_NAME}': Secondary replica recovery health in progress |<p>The secondary replica is in the synchronization process.</p> |`last(/MSSQL by ODBC/mssql.secondary_recovery_health["{#GROUP_NAME}"])=0` |WARNING | |
+|MSSQL AG '{#GROUP_NAME}': All replicas unhealthy |<p>None of the availability replicas have a healthy synchronization.</p> |`last(/MSSQL by ODBC/mssql.synchronization_health["{#GROUP_NAME}"])=0` |DISASTER | |
+|MSSQL AG '{#GROUP_NAME}': Some replicas unhealthy |<p>The synchronization health of some, but not all, availability replicas is healthy.</p> |`last(/MSSQL by ODBC/mssql.synchronization_health["{#GROUP_NAME}"])=1` |HIGH | |
+|MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The local availability database has a non-working state.</p> |`last(/MSSQL by ODBC/mssql.local_db.state["{#DBNAME}"])>0` |WARNING | |
+|MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': "{#DBNAME}" is Not healthy |<p>The synchronization state of the local availability database is NOT SYNCHRONIZING.</p> |`last(/MSSQL by ODBC/mssql.local_db.synchronization_health["{#DBNAME}"])=0` |HIGH | |
+|MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': "{#DBNAME}" is Partially healthy |<p>A database on a synchronous-commit availability replica is considered partially healthy if synchronization state is SYNCHRONIZING.</p> |`last(/MSSQL by ODBC/mssql.local_db.synchronization_health["{#DBNAME}"])=1` |AVERAGE | |
+|MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Log queue size is growing |<p>The log records of the primary database are not sent to the secondary databases.</p> |`last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#1)>last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2) and last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2)>last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#3)` |HIGH | |
+|MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Redo log queue size is growing |<p>The log records in the log files of the secondary replica have not yet been redone.</p> |`last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#1)>last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2) and last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2)>last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#3)` |HIGH | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is disconnected |<p>The response of an availability replica to the DISCONNECTED state depends on its role: </p><p>On the primary replica, if a secondary replica is disconnected, its secondary databases are marked as NOT SYNCHRONIZED on the primary replica, which waits for the secondary to reconnect; On a secondary replica, upon detecting that it is disconnected, the secondary replica attempts to reconnect to the primary replica.</p> |`last(/MSSQL by ODBC/mssql.replica.connected_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=0 and last(/MSSQL by ODBC/mssql.replica.role["{#GROUP_NAME}_{#REPLICA_NAME}"])=2` |WARNING | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Pending" or "Offline".</p> |`last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=0 or last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=1 or last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=3` |WARNING | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Failed".</p> |`last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=4` |AVERAGE | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Failed, no quorum".</p> |`last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=5` |HIGH | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} Recovery in progress |<p>At least one joined database has a database state other than ONLINE.</p> |`last(/MSSQL by ODBC/mssql.replica.recovery_health["{#GROUP_NAME}_{#REPLICA_NAME}"])=0` |INFO | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is Not healthy |<p>At least one joined database is in the NOT SYNCHRONIZING state.</p> |`last(/MSSQL by ODBC/mssql.replica.synchronization_health["{#GROUP_NAME}_{#REPLICA_NAME}"])=0` |AVERAGE | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is Partially healthy |<p>Some replicas are not in the target synchronization state: synchronous-commit replicas should be synchronized, and asynchronous-commit replicas should be synchronizing.</p> |`last(/MSSQL by ODBC/mssql.replica.synchronization_health["{#GROUP_NAME}_{#REPLICA_NAME}"])=1` |WARNING | |
+|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The state of the mirror database and of the database mirroring session is "Suspended", "Disconnected from the other partner", or "Synchronizing".</p> |`last(/MSSQL by ODBC/mssql.mirroring.state["{#DBNAME}"])>=0 and last(/MSSQL by ODBC/mssql.mirroring.state["{#DBNAME}"])<=2` |INFO | |
+|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The state of the mirror database and of the database mirroring session is "Pending Failover".</p> |`last(/MSSQL by ODBC/mssql.mirroring.state["{#DBNAME}"])=3` |WARNING | |
+|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" is {ITEM.VALUE} |<p>The state of the mirror database and of the database mirroring session is "Not synchronized". The partners are not synchronized. A failover is not possible now.</p> |`last(/MSSQL by ODBC/mssql.mirroring.state["{#DBNAME}"])=5` |HIGH | |
+|MSSQL Mirroring '{#DBNAME}': "{#DBNAME}" Witness is disconnected |<p>The state of the witness in the database mirroring session of the database is "Disconnected".</p> |`last(/MSSQL by ODBC/mssql.mirroring.witness_state["{#DBNAME}"])=2` |WARNING | |
+|MSSQL Job '{#JOBNAME}': Failed to run |<p>The last run of the job has failed.</p> |`last(/MSSQL by ODBC/mssql.job.runstatus["{#JOBNAME}"])=0` |WARNING |<p>Manual close: YES</p> |
+|MSSQL Job '{#JOBNAME}': Job duration is greater than {$MSSQL.BACKUP_DURATION.WARN:"{#JOBNAME}"} |<p>The job is taking too long.</p> |`last(/MSSQL by ODBC/mssql.job.run_duration["{#JOBNAME}"])>{$MSSQL.BACKUP_DURATION.WARN:"{#JOBNAME}"}` |WARNING |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/db/mssql_odbc/template_db_mssql_odbc.yaml b/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
index cc9d01f814f..ca02376f6bc 100644
--- a/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
+++ b/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:42Z'
+  version: '6.0'
+  date: '2021-09-03T05:58:49Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -25,7 +25,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.39
       groups:
         -
           name: Templates/Databases
@@ -1386,7 +1386,7 @@ zabbix_export:
             -
               uuid: 3c22a74a94d641389b57a6013ddd10cb
               expression: 'min(/MSSQL by ODBC/mssql.scan_to_search,15m) > 0.001'
-              name: 'MSSQL: Index and table scans are often than index searches for 15m'
+              name: 'MSSQL: Number of index and table scans exceeds index searches in the last 15m'
               priority: WARNING
               description: 'Index searches are preferable to index and table scans. For OLTP applications, optimize for more index searches and less scans (preferably, 1 full scan for every 1000 index searches). Index and table scans are expensive I/O operations.'
         -
@@ -1655,7 +1655,7 @@ zabbix_export:
             -
               uuid: aa10f863608a494281f41e12f0d2b1a5
               expression: 'last(/MSSQL by ODBC/mssql.uptime)<10m'
-              name: 'MSSQL: has been restarted (uptime < 10m)'
+              name: 'MSSQL: Service has been restarted (uptime < 10m)'
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
diff --git a/templates/net/f5_bigip_snmp/README.md b/templates/net/f5_bigip_snmp/README.md
index b32249565e1..8ff0cbde7bf 100644
--- a/templates/net/f5_bigip_snmp/README.md
+++ b/templates/net/f5_bigip_snmp/README.md
@@ -132,16 +132,16 @@ There are no template links in this template.
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming QnQ packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of double tagged packets received on the specified interface.</p> |SNMP |bigip.net.in.qq.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing QnQ packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of double tagged packets transmitted out of the specified interface.</p> |SNMP |bigip.net.out.qq.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Pause state |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The pause state of the specified interface.</p><p>none - no pause;</p><p>txrx - pause all data flow;</p><p>tx - pause out going data flow;</p><p>rx - pause in coming data flow.</p> |SNMP |bigip.net.pause[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Current connections |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The current connections from client-side to the specified virtual server.</p> |SNMP |bigip.vserver.net.conn[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Usage ratio, avg 5s |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 5 seconds.</p> |SNMP |bigip.vserver.usage.5s[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Usage ratio, avg 1m |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 1 minute.</p> |SNMP |bigip.vserver.usage.1m[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Usage ratio, avg 5m |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 5 minutes.</p> |SNMP |bigip.vserver.usage.5m[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Connections hit a rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The last recorded value for the number of connections to the virtual server when connections hit a rate limit;</p><p>this calculation is only maintained if rate limiting is configured for the service.</p> |SNMP |bigip.vserver.overlimit[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Duration of exceeding rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>Duration of time in seconds the specified virtual server has exceeded the configured connection rate limit.</p> |SNMP |bigip.vserver.overtime[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Current connections |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The current connections from client-side to the specified virtual server.</p> |SNMP |bigip.vserver.net.conn[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5s |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 5 seconds.</p> |SNMP |bigip.vserver.usage.5s[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 1m |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 1 minute.</p> |SNMP |bigip.vserver.usage.1m[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5m |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 5 minutes.</p> |SNMP |bigip.vserver.usage.5m[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Connections hit a rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The last recorded value for the number of connections to the virtual server when connections hit a rate limit;</p><p>this calculation is only maintained if rate limiting is configured for the service.</p> |SNMP |bigip.vserver.overlimit[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Duration of exceeding rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>Duration of time in seconds the specified virtual server has exceeded the configured connection rate limit.</p> |SNMP |bigip.vserver.overtime[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified node address from server-side.</p> |SNMP |bigip.node.net.in.pkts.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified node address from server-side.</p> |SNMP |bigip.node.net.in.bytes.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to server-side from the specified node address.</p> |SNMP |bigip.node.net.out.pkts.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
diff --git a/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml b/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml
index 215818d9702..39872b7063b 100644
--- a/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml
+++ b/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml
@@ -2699,7 +2699,7 @@ zabbix_export:
           item_prototypes:
             -
               uuid: 28ecf3f03cad44bda0e6243bb02e2ae4
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Current connections'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Current connections'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.12.{#SNMPINDEX}'
               key: 'bigip.vserver.net.conn[{#VSERVER.NAME}]'
@@ -2718,7 +2718,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: 206503cc777a4156a29f0687d8fb5a7c
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Incoming traffic, rate'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming traffic, rate'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.7.{#SNMPINDEX}'
               key: 'bigip.vserver.net.in.bytes.rate[{#VSERVER.NAME}]'
@@ -2742,7 +2742,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: d8a36a30d99c44ca9b7172a5b66e74d6
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Incoming packet, rate'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming packet, rate'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.6.{#SNMPINDEX}'
               key: 'bigip.vserver.net.in.pkts.rate[{#VSERVER.NAME}]'
@@ -2766,7 +2766,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: efeb720fb7e44d068572d59eff947bc6
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Outgoing traffic, rate'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing traffic, rate'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.9.{#SNMPINDEX}'
               key: 'bigip.vserver.net.out.bytes.rate[{#VSERVER.NAME}]'
@@ -2790,7 +2790,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: bd588ea58eb4420085691046fa0a1e3b
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Outgoing packet, rate'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing packet, rate'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.8.{#SNMPINDEX}'
               key: 'bigip.vserver.net.out.pkts.rate[{#VSERVER.NAME}]'
@@ -2814,7 +2814,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: 01352ac9b6c24f13a6ceebac666026cb
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Connections hit a rate limit'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Connections hit a rate limit'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.34.{#SNMPINDEX}'
               key: 'bigip.vserver.overlimit[{#VSERVER.NAME}]'
@@ -2834,7 +2834,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: baa7718513a54ae4a7bd669f9b652521
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Duration of exceeding rate limit'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Duration of exceeding rate limit'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.35.{#SNMPINDEX}'
               key: 'bigip.vserver.overtime[{#VSERVER.NAME}]'
@@ -2854,7 +2854,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: 3e97e22368b84674a9720c3f076503c5
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Usage ratio, avg 1m'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 1m'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.32.{#SNMPINDEX}'
               key: 'bigip.vserver.usage.1m[{#VSERVER.NAME}]'
@@ -2874,7 +2874,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: 2c8c5e0e53e34e4ebc84ed9e5a8c4bd9
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Usage ratio, avg 5m'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5m'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.33.{#SNMPINDEX}'
               key: 'bigip.vserver.usage.5m[{#VSERVER.NAME}]'
@@ -2894,7 +2894,7 @@ zabbix_export:
                   value: 'Virtual server [{#VSERVER.NAME}]'
             -
               uuid: d6079ebaebbb40d09386e2b1abcbe987
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}]: Usage ratio, avg 5s'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5s'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.3375.2.2.10.2.3.1.31.{#SNMPINDEX}'
               key: 'bigip.vserver.usage.5s[{#VSERVER.NAME}]'
@@ -2915,7 +2915,7 @@ zabbix_export:
           graph_prototypes:
             -
               uuid: b49ee8a27f634c238317663d7cc9d426
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}] network'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}] network'
               graph_items:
                 -
                   color: 1A7C11
@@ -2944,7 +2944,7 @@ zabbix_export:
                     key: 'bigip.vserver.net.out.bytes.rate[{#VSERVER.NAME}]'
             -
               uuid: 17d18d4117f943d18873972584f3374e
-              name: 'F5 BIG-IP: Virtual sever [{#VSERVER.NAME}] usage ratio'
+              name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}] usage ratio'
               graph_items:
                 -
                   color: 1A7C11
diff --git a/tests/libs/zbxcommon/zbx_token_find.c b/tests/libs/zbxcommon/zbx_token_find.c
index 582bb31ca8d..ed4c42eaedc 100644
--- a/tests/libs/zbxcommon/zbx_token_find.c
+++ b/tests/libs/zbxcommon/zbx_token_find.c
@@ -188,7 +188,8 @@ void	zbx_mock_test_entry(void **state)
 	expected_ret = zbx_mock_str_to_return_code(zbx_mock_get_parameter_string("out.return"));
 
 	zbx_mock_assert_result_eq("zbx_token_find() return code", expected_ret,
-			zbx_token_find(expression, 0, &token, ZBX_TOKEN_SEARCH_EXPRESSION_MACRO));
+			zbx_token_find(expression, 0, &token, ZBX_TOKEN_SEARCH_EXPRESSION_MACRO |
+			ZBX_TOKEN_SEARCH_SIMPLE_MACRO));
 
 	if (SUCCEED == expected_ret)
 	{
diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am
index 3fc847bd7e8..8ff359b9a6f 100644
--- a/tests/libs/zbxdbcache/Makefile.am
+++ b/tests/libs/zbxdbcache/Makefile.am
@@ -72,6 +72,7 @@ CACHE_LIBS = \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
+	$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
 
 COMMON_WRAP_FUNCS = \
diff --git a/tests/libs/zbxdbhigh/Makefile.am b/tests/libs/zbxdbhigh/Makefile.am
index 4470dd97cce..c7db63c6e16 100644
--- a/tests/libs/zbxdbhigh/Makefile.am
+++ b/tests/libs/zbxdbhigh/Makefile.am
@@ -41,6 +41,7 @@ COMMON_LIB = \
 	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
 	$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
+	$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
 
@@ -86,6 +87,7 @@ SERVER_COMMON_LIB = \
 	$(top_srcdir)/src/libs/zbxservice/libzbxservice.a \
 	$(top_srcdir)/src/zabbix_server/service/libservice.a \
 	$(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \
+	$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a \
 	$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
 	$(COMMON_LIB)
 
diff --git a/tests/libs/zbxserver/Makefile.am b/tests/libs/zbxserver/Makefile.am
index 3d877ef0976..085c88cca18 100755
--- a/tests/libs/zbxserver/Makefile.am
+++ b/tests/libs/zbxserver/Makefile.am
@@ -33,13 +33,6 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/zabbix_server/odbc/libzbxodbc.a \
 	$(top_srcdir)/src/zabbix_server/scripts/libzbxscripts.a \
 	$(top_srcdir)/src/zabbix_server/preprocessor/libpreprocessor.a \
-	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
-	$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
-	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
 	$(top_srcdir)/src/libs/zbxself/libzbxself.a \
 	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
 	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
@@ -66,6 +59,24 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxicmpping/libzbxicmpping.a \
 	$(top_srcdir)/src/libs/zbxdbupgrade/libzbxdbupgrade.a \
 	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
+	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
+	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+	$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
+	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
+	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
+	$(top_srcdir)/src/libs/zbxavailability/libzbxavailability.a \
+	$(top_srcdir)/src/libs/zbxeval/libzbxeval.a \
+	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
+	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
+	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
+	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
+	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
+	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
 	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
 	$(top_srcdir)/src/libs/zbxtasks/libzbxtasks.a \
@@ -83,7 +94,8 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
 	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
 	$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
-	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a
+	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
+	$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a
 
 COMMON_COMPILER_FLAGS = -I@top_srcdir@/tests
 
diff --git a/tests/libs/zbxserver/substitute_lld_macros.c b/tests/libs/zbxserver/substitute_lld_macros.c
index da66b6ffa5d..93b3492d8cd 100644
--- a/tests/libs/zbxserver/substitute_lld_macros.c
+++ b/tests/libs/zbxserver/substitute_lld_macros.c
@@ -85,8 +85,6 @@ static int	get_flags(const char *path)
 			flags |= ZBX_MACRO_JSON;
 		else if (0 == strcmp(flag, "ZBX_MACRO_XML"))
 			flags |= ZBX_MACRO_XML;
-		else if (0 == strcmp(flag, "ZBX_MACRO_SIMPLE"))
-			flags |= ZBX_MACRO_SIMPLE;
 		else if (0 == strcmp(flag, "ZBX_MACRO_FUNC"))
 			flags |= ZBX_MACRO_FUNC;
 		else if (0 == strcmp(flag, "ZBX_TOKEN_EXPRESSION_MACRO"))
diff --git a/tests/zabbix_server/service/Makefile.am b/tests/zabbix_server/service/Makefile.am
index 3a908112d93..f9b85c60d95 100644
--- a/tests/zabbix_server/service/Makefile.am
+++ b/tests/zabbix_server/service/Makefile.am
@@ -32,26 +32,32 @@ COMMON_LIBS = \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
 	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
 	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
-	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
-	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
-	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
 	$(top_builddir)/src/libs/zbxaudit/libzbxaudit.a \
-	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
-	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
 	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
 	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
 	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
 	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
+	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
+	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
+	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/src/libs/zbxvault/libzbxvault.a \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
 	
+SERVICE_WRAP_FUNCS = \
+	-Wl,--wrap=DCget_nextid \
+	-Wl,--wrap=zbx_add_event \
+	-Wl,--wrap=zbx_process_events \
+	-Wl,--wrap=zbx_clean_events \
+	-Wl,--wrap=zbx_interface_availability_is_set
 	
 # service_get_rootcause_eventids
 
@@ -64,7 +70,9 @@ service_get_rootcause_eventids_LDADD = $(COMMON_LIBS)
 service_get_rootcause_eventids_LDADD += @SERVER_LIBS@
 service_get_rootcause_eventids_LDFLAGS = @SERVER_LDFLAGS@
 
-service_get_rootcause_eventids_CFLAGS = -I@top_srcdir@/tests -I@top_srcdir@/src/zabbix_server/service
+service_get_rootcause_eventids_CFLAGS = $(SERVICE_WRAP_FUNCS) \
+	-I@top_srcdir@/tests \
+	-I@top_srcdir@/src/zabbix_server/service
 
 # service_get_status
 
@@ -77,7 +85,9 @@ service_get_status_LDADD = $(COMMON_LIBS)
 service_get_status_LDADD += @SERVER_LIBS@
 service_get_status_LDFLAGS = @SERVER_LDFLAGS@
 
-service_get_status_CFLAGS = -I@top_srcdir@/tests -I@top_srcdir@/src/zabbix_server/service
+service_get_status_CFLAGS = $(SERVICE_WRAP_FUNCS) \
+	-I@top_srcdir@/tests \
+	-I@top_srcdir@/src/zabbix_server/service
 
 # service_get_main_status
 
@@ -90,7 +100,9 @@ service_get_main_status_LDADD = $(COMMON_LIBS)
 service_get_main_status_LDADD += @SERVER_LIBS@
 service_get_main_status_LDFLAGS = @SERVER_LDFLAGS@
 
-service_get_main_status_CFLAGS = -I@top_srcdir@/tests -I@top_srcdir@/src/zabbix_server/service
+service_get_main_status_CFLAGS = $(SERVICE_WRAP_FUNCS) \
+	-I@top_srcdir@/tests \
+	-I@top_srcdir@/src/zabbix_server/service
 
 # service_get_rule_status
 
@@ -103,6 +115,8 @@ service_get_rule_status_LDADD = $(COMMON_LIBS)
 service_get_rule_status_LDADD += @SERVER_LIBS@
 service_get_rule_status_LDFLAGS = @SERVER_LDFLAGS@
 
-service_get_rule_status_CFLAGS = -I@top_srcdir@/tests -I@top_srcdir@/src/zabbix_server/service
+service_get_rule_status_CFLAGS = $(SERVICE_WRAP_FUNCS) \
+	-I@top_srcdir@/tests \
+	-I@top_srcdir@/src/zabbix_server/service
 
 endif
diff --git a/tests/zabbix_server/service/mock_service.c b/tests/zabbix_server/service/mock_service.c
index 56a9a932c38..2156986b8b5 100644
--- a/tests/zabbix_server/service/mock_service.c
+++ b/tests/zabbix_server/service/mock_service.c
@@ -200,7 +200,7 @@ void	mock_init_service_cache(const char *path)
 					rule->type = ZBX_SERVICE_STATUS_RULE_TYPE_W_L;
 				else if (0 == strcmp(value, "WP_LT"))
 					rule->type = ZBX_SERVICE_STATUS_RULE_TYPE_WP_L;
-				else if (0 == strcmp(value, "NP_GE"))
+				else
 					fail_msg("unsupported service '%s' rule type '%s'", service->name, value);
 				rule->limit_status = zbx_mock_get_object_member_int(hrule, "limit");
 				rule->limit_value = zbx_mock_get_object_member_int(hrule, "value");
@@ -316,5 +316,61 @@ void	mock_destroy_service_cache(void)
 	zbx_hashset_destroy(&cache.services);
 }
 
+/* function stubs to cut off library dependencies */
+
+zbx_uint64_t	__wrap_DCget_nextid(const char *table_name, int num)
+{
+	ZBX_UNUSED(table_name);
+	ZBX_UNUSED(num);
+
+	return 0;
+}
+
+void	*__wrap_zbx_add_event(unsigned char source, unsigned char object, zbx_uint64_t objectid,
+		const zbx_timespec_t *timespec, int value, const char *trigger_description,
+		const char *trigger_expression, const char *trigger_recovery_expression, unsigned char trigger_priority,
+		unsigned char trigger_type, const zbx_vector_ptr_t *trigger_tags,
+		unsigned char trigger_correlation_mode, const char *trigger_correlation_tag,
+		unsigned char trigger_value, const char *trigger_opdata, const char *event_name, const char *error)
+{
+	ZBX_UNUSED(source);
+	ZBX_UNUSED(object);
+	ZBX_UNUSED(objectid);
+	ZBX_UNUSED(timespec);
+	ZBX_UNUSED(value);
+	ZBX_UNUSED(trigger_description);
+	ZBX_UNUSED(trigger_expression);
+	ZBX_UNUSED(trigger_recovery_expression);
+	ZBX_UNUSED(trigger_priority);
+	ZBX_UNUSED(trigger_type);
+	ZBX_UNUSED(trigger_tags);
+	ZBX_UNUSED(trigger_correlation_mode);
+	ZBX_UNUSED(trigger_correlation_tag);
+	ZBX_UNUSED(trigger_value);
+	ZBX_UNUSED(trigger_opdata);
+	ZBX_UNUSED(event_name);
+	ZBX_UNUSED(error);
+
+	return NULL;
+}
+
+int	__wrap_zbx_process_events(zbx_vector_ptr_t *trigger_diff, zbx_vector_uint64_t *triggerids_lock)
+{
+	ZBX_UNUSED(trigger_diff);
+	ZBX_UNUSED(triggerids_lock);
+
+	return 0;
+}
+
+void	__wrap_zbx_clean_events(void)
+{
+}
+
+int	__wrap_zbx_interface_availability_is_set(const void *ia)
+{
+	ZBX_UNUSED(ia);
+
+	return FAIL;
+}
 
 
diff --git a/ui/app/controllers/CControllerUsergroupCreate.php b/ui/app/controllers/CControllerUsergroupCreate.php
index ef2bac0d500..cf66a0b8f2b 100644
--- a/ui/app/controllers/CControllerUsergroupCreate.php
+++ b/ui/app/controllers/CControllerUsergroupCreate.php
@@ -67,10 +67,11 @@ class CControllerUsergroupCreate extends CController {
 
 	protected function doAction() {
 		$user_group = [
+			'users' => zbx_toObject($this->getInput('userids', []), 'userid'),
 			'rights' => []
 		];
 
-		$this->getInputs($user_group, ['name', 'users_status', 'gui_access', 'debug_mode', 'userids', 'tag_filters']);
+		$this->getInputs($user_group, ['name', 'users_status', 'gui_access', 'debug_mode', 'tag_filters']);
 
 		$group_rights = applyHostGroupRights($this->getInput('group_rights', []));
 
diff --git a/ui/app/controllers/CControllerUsergroupUpdate.php b/ui/app/controllers/CControllerUsergroupUpdate.php
index 98cf3b66ed3..a3d6a327f13 100644
--- a/ui/app/controllers/CControllerUsergroupUpdate.php
+++ b/ui/app/controllers/CControllerUsergroupUpdate.php
@@ -69,7 +69,7 @@ class CControllerUsergroupUpdate extends CController {
 
 	protected function doAction() {
 		$user_group = [
-			'userids' => $this->getInput('userids', []),
+			'users' => zbx_toObject($this->getInput('userids', []), 'userid'),
 			'tag_filters' => $this->getInput('tag_filters', []),
 			'rights' => []
 		];
diff --git a/ui/app/controllers/CControllerWidgetGraphView.php b/ui/app/controllers/CControllerWidgetGraphView.php
index 6c2f8020424..abc03907131 100644
--- a/ui/app/controllers/CControllerWidgetGraphView.php
+++ b/ui/app/controllers/CControllerWidgetGraphView.php
@@ -179,9 +179,8 @@ class CControllerWidgetGraphView extends CControllerWidget {
 					$new_dynamic = getSameGraphItemsForHost($graph['gitems'], $dynamic_hostid, false);
 
 					if ($new_dynamic) {
-						// Add destination host data required by CMacrosResolver::resolveGraphPositionalMacros().
+						// Add destination host data required by CMacrosResolver::resolveGraphNames().
 						foreach ($new_dynamic as &$item) {
-							$item['hostid'] = $host['hostid'];
 							$item['host'] = $host['host'];
 						}
 						unset($item);
diff --git a/ui/app/views/administration.user.edit.php b/ui/app/views/administration.user.edit.php
index d98b6c2d975..81d3b8cb864 100644
--- a/ui/app/views/administration.user.edit.php
+++ b/ui/app/views/administration.user.edit.php
@@ -293,7 +293,7 @@ if ($data['action'] === 'user.edit' || CWebUser::$data['type'] > USER_TYPE_ZABBI
 	$media_table_info = (new CTable())
 		->setId('media-table')
 		->setAttribute('style', 'width: 100%;')
-		->setHeader([_('Type'), _('Send to'), _('When active'), _('Use if severity'), ('Status'), _('Action')]);
+		->setHeader([_('Type'), _('Send to'), _('When active'), _('Use if severity'), _('Status'), _('Action')]);
 
 	foreach ($data['medias'] as $index => $media) {
 		if ($media['active'] == MEDIA_STATUS_ACTIVE) {
diff --git a/ui/include/blocks.inc.php b/ui/include/blocks.inc.php
index 7b9ae31d14b..a9e4ed61fa6 100644
--- a/ui/include/blocks.inc.php
+++ b/ui/include/blocks.inc.php
@@ -623,11 +623,15 @@ function make_status_of_zbx() {
 				if ($dbversion->flag != DB_VERSION_SUPPORTED) {
 					switch ($dbversion->flag) {
 						case DB_VERSION_LOWER_THAN_MINIMUM:
-							$error = _s('Minimum required database version is %1$s.', $dbversion->min_version);
+							$error = _s('Minimum required %1$s database version is %2$s.', $dbversion->database,
+								$dbversion->min_version
+							);
 							break;
 
 						case DB_VERSION_HIGHER_THAN_MAXIMUM:
-							$error = _s('Maximum required database version is %1$s.', $dbversion->max_version);
+							$error = _s('Maximum required %1$s database version is %2$s.', $dbversion->database,
+								$dbversion->max_version
+							);
 							break;
 
 						case DB_VERSION_FAILED_TO_RETRIEVE:
diff --git a/ui/include/classes/api/CAudit.php b/ui/include/classes/api/CAudit.php
index 88992259623..52e21e5e055 100644
--- a/ui/include/classes/api/CAudit.php
+++ b/ui/include/classes/api/CAudit.php
@@ -102,7 +102,8 @@ class CAudit {
 	 */
 	private const TABLE_NAMES = [
 		self::RESOURCE_AUTH_TOKEN => 'token',
-		self::RESOURCE_USER => 'users'
+		self::RESOURCE_USER => 'users',
+		self::RESOURCE_USER_GROUP => 'usrgrp'
 	];
 
 	/**
@@ -113,7 +114,8 @@ class CAudit {
 	 */
 	private const FIELD_NAMES = [
 		self::RESOURCE_AUTH_TOKEN => 'name',
-		self::RESOURCE_USER => 'username'
+		self::RESOURCE_USER => 'username',
+		self::RESOURCE_USER_GROUP => 'name'
 	];
 
 	/**
@@ -124,7 +126,8 @@ class CAudit {
 	 */
 	private const API_NAMES = [
 		self::RESOURCE_AUTH_TOKEN => 'token',
-		self::RESOURCE_USER => 'user'
+		self::RESOURCE_USER => 'user',
+		self::RESOURCE_USER_GROUP => 'usergroup'
 	];
 
 	/**
@@ -149,7 +152,10 @@ class CAudit {
 	 */
 	private const NESTED_OBJECTS_TABLE_NAMES = [
 		'user.medias' => 'media',
-		'user.usrgrps' => 'users_groups'
+		'user.usrgrps' => 'users_groups',
+		'usergroup.rights' => 'rights',
+		'usergroup.tag_filters' => 'tag_filter',
+		'usergroup.users' => 'users_groups'
 	];
 
 	/**
@@ -160,7 +166,10 @@ class CAudit {
 	 */
 	private const NESTED_OBJECTS_IDS = [
 		'user.medias' => 'mediaid',
-		'user.usrgrps' => 'id'
+		'user.usrgrps' => 'id',
+		'usergroup.rights' => 'rightid',
+		'usergroup.tag_filters' => 'tag_filterid',
+		'usergroup.users' => 'id'
 	];
 
 	/**
diff --git a/ui/include/classes/api/services/CUser.php b/ui/include/classes/api/services/CUser.php
index d7d675c0873..f9c2e1f19e0 100644
--- a/ui/include/classes/api/services/CUser.php
+++ b/ui/include/classes/api/services/CUser.php
@@ -267,8 +267,8 @@ class CUser extends CApiService {
 		}
 		unset($user);
 
-		$this->updateUsersGroups($users, __FUNCTION__);
-		$this->updateMedias($users, __FUNCTION__);
+		self::updateUsersGroups($users, __FUNCTION__);
+		self::updateMedias($users, __FUNCTION__);
 
 		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_USER, $users);
 
@@ -281,10 +281,6 @@ class CUser extends CApiService {
 	 * @throws APIException if the input is invalid.
 	 */
 	private function validateCreate(array &$users) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('You do not have permissions to create users.'));
-		}
-
 		$locales = LANG_DEFAULT.','.implode(',', array_keys(getLocales()));
 		$timezones = TIMEZONE_DEFAULT.','.implode(',', array_keys((new CDateTimeZoneHelper())->getAllDateTimeZones()));
 		$themes = THEME_DEFAULT.','.implode(',', array_keys(APP::getThemes()));
@@ -424,8 +420,8 @@ class CUser extends CApiService {
 			DB::update('users', $upd_users);
 		}
 
-		$this->updateUsersGroups($users, __FUNCTION__, $db_users);
-		$this->updateMedias($users, __FUNCTION__, $db_users);
+		self::updateUsersGroups($users, 'update', $db_users);
+		self::updateMedias($users, 'update', $db_users);
 
 		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_USER, $users, $db_users);
 
@@ -1022,11 +1018,13 @@ class CUser extends CApiService {
 	/**
 	 * Update table "users_groups" and populate users.usrgrps by "id" property.
 	 *
+	 * @static
+	 *
 	 * @param array      $users
 	 * @param string     $method
 	 * @param null|array $db_users
 	 */
-	private function updateUsersGroups(array &$users, string $method, array $db_users = null): void {
+	private static function updateUsersGroups(array &$users, string $method, array $db_users = null): void {
 		$ins_users_groups = [];
 		$del_ids = [];
 
@@ -1083,13 +1081,15 @@ class CUser extends CApiService {
 	/**
 	 * Auxiliary function for updateMedias().
 	 *
+	 * @static
+	 *
 	 * @param array  $medias
 	 * @param string $mediatypeid
 	 * @param string $sendto
 	 *
 	 * @return int
 	 */
-	private function getSimilarMedia(array $medias, $mediatypeid, $sendto) {
+	private static function getSimilarMedia(array $medias, $mediatypeid, $sendto) {
 		foreach ($medias as $index => $media) {
 			if (bccomp($media['mediatypeid'], $mediatypeid) == 0 && $media['sendto'] === $sendto) {
 				return $index;
@@ -1103,11 +1103,13 @@ class CUser extends CApiService {
 	 * Update table "media" and populate users.medias by "mediaid" property. Also this function converts "sendto" to the
 	 * string.
 	 *
+	 * @static
+	 *
 	 * @param array      $users
 	 * @param string     $method
 	 * @param null|array $db_users
 	 */
-	private function updateMedias(array &$users, string $method, array $db_users = null) {
+	private static function updateMedias(array &$users, string $method, array $db_users = null): void {
 		$ins_medias = [];
 		$upd_medias = [];
 		$del_mediaids = [];
@@ -1122,7 +1124,7 @@ class CUser extends CApiService {
 			foreach ($user['medias'] as &$media) {
 				$media['sendto'] = implode("\n", $media['sendto']);
 
-				$index = $this->getSimilarMedia($db_medias, $media['mediatypeid'], $media['sendto']);
+				$index = self::getSimilarMedia($db_medias, $media['mediatypeid'], $media['sendto']);
 
 				if ($index != -1) {
 					$db_media = $db_medias[$index];
diff --git a/ui/include/classes/api/services/CUserGroup.php b/ui/include/classes/api/services/CUserGroup.php
index a2575e0dbc7..6ab0aec5189 100644
--- a/ui/include/classes/api/services/CUserGroup.php
+++ b/ui/include/classes/api/services/CUserGroup.php
@@ -176,7 +176,7 @@ class CUserGroup extends CApiService {
 		$ins_usrgrps = [];
 
 		foreach ($usrgrps as $usrgrp) {
-			unset($usrgrp['rights'], $usrgrp['userids']);
+			unset($usrgrp['rights'], $usrgrp['tag_filters'], $usrgrp['users']);
 			$ins_usrgrps[] = $usrgrp;
 		}
 		$usrgrpids = DB::insert('usrgrp', $ins_usrgrps);
@@ -186,11 +186,11 @@ class CUserGroup extends CApiService {
 		}
 		unset($usrgrp);
 
-		$this->updateRights($usrgrps, __FUNCTION__);
-		$this->updateTagFilters($usrgrps, __FUNCTION__);
-		$this->updateUsersGroups($usrgrps, __FUNCTION__);
+		self::updateRights($usrgrps, __FUNCTION__);
+		self::updateTagFilters($usrgrps, __FUNCTION__);
+		self::updateUsersGroups($usrgrps, __FUNCTION__);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_USER_GROUP, $usrgrps);
+		$this->addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_USER_GROUP, $usrgrps);
 
 		return ['usrgrpids' => $usrgrpids];
 	}
@@ -201,10 +201,6 @@ class CUserGroup extends CApiService {
 	 * @throws APIException if the input is invalid.
 	 */
 	private function validateCreate(array &$usrgrps) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can create user groups.'));
-		}
-
 		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['name']], 'fields' => [
 			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('usrgrp', 'name')],
 			'debug_mode' =>		['type' => API_INT32, 'in' => implode(',', [GROUP_DEBUG_MODE_DISABLED, GROUP_DEBUG_MODE_ENABLED])],
@@ -219,13 +215,28 @@ class CUserGroup extends CApiService {
 				'tag' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('tag_filter', 'tag'), 'default' => DB::getDefault('tag_filter', 'tag')],
 				'value' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('tag_filter', 'value'), 'default' => DB::getDefault('tag_filter', 'value')]
 			]],
-			'userids' =>		['type' => API_IDS, 'flags' => API_NORMALIZE]
+			'userids' =>		['type' => API_IDS, 'flags' => API_NORMALIZE | API_DEPRECATED, 'uniq' => true],
+			'users' =>			['type' => API_OBJECTS, 'flags' => API_NORMALIZE, 'uniq' => [['userid']], 'fields' => [
+				'userid' =>			['type' => API_ID, 'flags' => API_REQUIRED]
+			]]
 		]];
 		if (!CApiInputValidator::validate($api_input_rules, $usrgrps, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		$this->checkDuplicates(zbx_objectValues($usrgrps, 'name'));
+		foreach ($usrgrps as &$usrgrp) {
+			if (array_key_exists('userids', $usrgrp)) {
+				if (array_key_exists('users', $usrgrp)) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Parameter "%1$s" is deprecated.', 'userids'));
+				}
+
+				$usrgrp['users'] = zbx_toObject($usrgrp['userids'], 'userid');
+				unset($usrgrp['userids']);
+			}
+		}
+		unset($usrgrp);
+
+		$this->checkDuplicates(array_column($usrgrps, 'name'));
 		$this->checkUsers($usrgrps);
 		$this->checkHimself($usrgrps, __FUNCTION__);
 		$this->checkHostGroups($usrgrps);
@@ -245,20 +256,7 @@ class CUserGroup extends CApiService {
 		foreach ($usrgrps as $usrgrp) {
 			$db_usrgrp = $db_usrgrps[$usrgrp['usrgrpid']];
 
-			$upd_usrgrp = [];
-
-			if (array_key_exists('name', $usrgrp) && $usrgrp['name'] !== $db_usrgrp['name']) {
-				$upd_usrgrp['name'] = $usrgrp['name'];
-			}
-			if (array_key_exists('debug_mode', $usrgrp) && $usrgrp['debug_mode'] != $db_usrgrp['debug_mode']) {
-				$upd_usrgrp['debug_mode'] = $usrgrp['debug_mode'];
-			}
-			if (array_key_exists('gui_access', $usrgrp) && $usrgrp['gui_access'] != $db_usrgrp['gui_access']) {
-				$upd_usrgrp['gui_access'] = $usrgrp['gui_access'];
-			}
-			if (array_key_exists('users_status', $usrgrp) && $usrgrp['users_status'] != $db_usrgrp['users_status']) {
-				$upd_usrgrp['users_status'] = $usrgrp['users_status'];
-			}
+			$upd_usrgrp = DB::getUpdatedValues('usrgrp', $usrgrp, $db_usrgrp);
 
 			if ($upd_usrgrp) {
 				$upd_usrgrps[] = [
@@ -272,13 +270,13 @@ class CUserGroup extends CApiService {
 			DB::update('usrgrp', $upd_usrgrps);
 		}
 
-		$this->updateRights($usrgrps, __FUNCTION__);
-		$this->updateTagFilters($usrgrps, __FUNCTION__);
-		$this->updateUsersGroups($usrgrps, __FUNCTION__);
+		self::updateRights($usrgrps, __FUNCTION__, $db_usrgrps);
+		self::updateTagFilters($usrgrps, __FUNCTION__, $db_usrgrps);
+		self::updateUsersGroups($usrgrps, __FUNCTION__, $db_usrgrps);
 
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_USER_GROUP, $usrgrps, $db_usrgrps);
+		$this->addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_USER_GROUP, $usrgrps, $db_usrgrps);
 
-		return ['usrgrpids'=> zbx_objectValues($usrgrps, 'usrgrpid')];
+		return ['usrgrpids'=> array_column($usrgrps, 'usrgrpid')];
 	}
 
 	/**
@@ -288,10 +286,6 @@ class CUserGroup extends CApiService {
 	 * @throws APIException if the input is invalid.
 	 */
 	private function validateUpdate(array &$usrgrps, array &$db_usrgrps = null) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can update user groups.'));
-		}
-
 		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['usrgrpid'], ['name']], 'fields' => [
 			'usrgrpid' =>		['type' => API_ID, 'flags' => API_REQUIRED],
 			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('usrgrp', 'name')],
@@ -307,7 +301,10 @@ class CUserGroup extends CApiService {
 				'tag' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('tag_filter', 'tag'), 'default' => DB::getDefault('tag_filter', 'tag')],
 				'value' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('tag_filter', 'value'), 'default' => DB::getDefault('tag_filter', 'value')]
 			]],
-			'userids' =>		['type' => API_IDS, 'flags' => API_NORMALIZE]
+			'userids' =>		['type' => API_IDS, 'flags' => API_NORMALIZE | API_DEPRECATED, 'uniq' => true],
+			'users' =>			['type' => API_OBJECTS, 'flags' => API_NORMALIZE, 'uniq' => [['userid']], 'fields' => [
+				'userid' =>			['type' => API_ID, 'flags' => API_REQUIRED]
+			]]
 		]];
 		if (!CApiInputValidator::validate($api_input_rules, $usrgrps, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
@@ -316,13 +313,13 @@ class CUserGroup extends CApiService {
 		// Check user group names.
 		$db_usrgrps = DB::select('usrgrp', [
 			'output' => ['usrgrpid', 'name', 'debug_mode', 'gui_access', 'users_status'],
-			'usrgrpids' => zbx_objectValues($usrgrps, 'usrgrpid'),
+			'usrgrpids' => array_column($usrgrps, 'usrgrpid'),
 			'preservekeys' => true
 		]);
 
 		$names = [];
 
-		foreach ($usrgrps as $usrgrp) {
+		foreach ($usrgrps as &$usrgrp) {
 			// Check if this user group exists.
 			if (!array_key_exists($usrgrp['usrgrpid'], $db_usrgrps)) {
 				self::exception(ZBX_API_ERROR_PERMISSIONS,
@@ -330,12 +327,24 @@ class CUserGroup extends CApiService {
 				);
 			}
 
+			if (array_key_exists('userids', $usrgrp)) {
+				if (array_key_exists('users', $usrgrp)) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Parameter "%1$s" is deprecated.', 'userids'));
+				}
+
+				$usrgrp['users'] = zbx_toObject($usrgrp['userids'], 'userid');
+				unset($usrgrp['userids']);
+			}
+
 			$db_usrgrp = $db_usrgrps[$usrgrp['usrgrpid']];
 
 			if (array_key_exists('name', $usrgrp) && $usrgrp['name'] !== $db_usrgrp['name']) {
 				$names[] = $usrgrp['name'];
 			}
 		}
+		unset($usrgrp);
+
+		$this->addAffectedObjects($usrgrps, $db_usrgrps);
 
 		if ($names) {
 			$this->checkDuplicates($names);
@@ -370,7 +379,8 @@ class CUserGroup extends CApiService {
 	 * Check for valid users.
 	 *
 	 * @param array  $usrgrps
-	 * @param array  $usrgrps[]['userids']   (optional)
+	 * @param array  $usrgrps[]['users']              (optional)
+	 * @param string $usrgrps[]['users'][]['userid']
 	 *
 	 * @throws APIException
 	 */
@@ -378,9 +388,9 @@ class CUserGroup extends CApiService {
 		$userids = [];
 
 		foreach ($usrgrps as $usrgrp) {
-			if (array_key_exists('userids', $usrgrp)) {
-				foreach ($usrgrp['userids'] as $userid) {
-					$userids[$userid] = true;
+			if (array_key_exists('users', $usrgrp)) {
+				foreach ($usrgrp['users'] as $user) {
+					$userids[$user['userid']] = true;
 				}
 			}
 		}
@@ -503,7 +513,7 @@ class CUserGroup extends CApiService {
 			$groups_users = [];
 
 			foreach ($usrgrps as $usrgrp) {
-				if (self::userGroupDisabled($usrgrp, $method, $db_usrgrps) && !array_key_exists('userids', $usrgrp)) {
+				if (self::userGroupDisabled($usrgrp, $method, $db_usrgrps) && !array_key_exists('users', $usrgrp)) {
 					$groups_users[$usrgrp['usrgrpid']] = [];
 				}
 			}
@@ -515,13 +525,12 @@ class CUserGroup extends CApiService {
 				]);
 
 				foreach ($db_users_groups as $db_user_group) {
-					$groups_users[$db_user_group['usrgrpid']][] = $db_user_group['userid'];
+					$groups_users[$db_user_group['usrgrpid']][] = ['userid' => $db_user_group['userid']];
 				}
 
 				foreach ($usrgrps as &$usrgrp) {
-					if (self::userGroupDisabled($usrgrp, $method, $db_usrgrps)
-							&& !array_key_exists('userids', $usrgrp)) {
-						$usrgrp['userids'] = $groups_users[$usrgrp['usrgrpid']];
+					if (self::userGroupDisabled($usrgrp, $method, $db_usrgrps) && !array_key_exists('users', $usrgrp)) {
+						$usrgrp['users'] = $groups_users[$usrgrp['usrgrpid']];
 					}
 				}
 				unset($usrgrp);
@@ -529,12 +538,14 @@ class CUserGroup extends CApiService {
 		}
 
 		foreach ($usrgrps as $usrgrp) {
-			if (self::userGroupDisabled($usrgrp, $method, $db_usrgrps)
-					&& array_key_exists('userids', $usrgrp)
-					&& uint_in_array(self::$userData['userid'], $usrgrp['userids'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_('User cannot add himself to a disabled group or a group with disabled GUI access.')
-				);
+			if (self::userGroupDisabled($usrgrp, $method, $db_usrgrps) && array_key_exists('users', $usrgrp)) {
+				foreach ($usrgrp['users'] as $user) {
+					if (bccomp(self::$userData['userid'], $user['userid']) == 0) {
+						self::exception(ZBX_API_ERROR_PARAMETERS,
+							_('User cannot add himself to a disabled group or a group with disabled GUI access.')
+						);
+					}
+				}
 			}
 		}
 	}
@@ -544,7 +555,8 @@ class CUserGroup extends CApiService {
 	 *
 	 * @param array  $usrgrps
 	 * @param array  $usrgrps[]['usrgrpid']
-	 * @param array  $usrgrps[]['userids']   (optional)
+	 * @param array  $usrgrps[]['users']              (optional)
+	 * @param string $usrgrps[]['users'][]['userid']
 	 *
 	 * @throws APIException
 	 */
@@ -552,11 +564,11 @@ class CUserGroup extends CApiService {
 		$users_groups = [];
 
 		foreach ($usrgrps as $usrgrp) {
-			if (array_key_exists('userids', $usrgrp)) {
+			if (array_key_exists('users', $usrgrp)) {
 				$users_groups[$usrgrp['usrgrpid']] = [];
 
-				foreach ($usrgrp['userids'] as $userid) {
-					$users_groups[$usrgrp['usrgrpid']][$userid] = true;
+				foreach ($usrgrp['users'] as $user) {
+					$users_groups[$usrgrp['usrgrpid']][$user['userid']] = true;
 				}
 			}
 		}
@@ -617,65 +629,58 @@ class CUserGroup extends CApiService {
 	/**
 	 * Update table "rights".
 	 *
-	 * @param array  $usrgrps
-	 * @param string $method
+	 * @static
+	 *
+	 * @param array      $usrgrps
+	 * @param string     $method
+	 * @param null|array $db_usrgrps
 	 */
-	private function updateRights(array $usrgrps, $method) {
-		$rights = [];
-
-		foreach ($usrgrps as $usrgrp) {
-			if (array_key_exists('rights', $usrgrp)) {
-				$rights[$usrgrp['usrgrpid']] = [];
+	private static function updateRights(array &$usrgrps, string $method, array $db_usrgrps = null): void {
+		$ins_rights = [];
+		$upd_rights = [];
+		$del_rightids = [];
 
-				foreach ($usrgrp['rights'] as $right) {
-					$rights[$usrgrp['usrgrpid']][$right['id']] = $right['permission'];
-				}
+		foreach ($usrgrps as &$usrgrp) {
+			if (!array_key_exists('rights', $usrgrp)) {
+				continue;
 			}
-		}
 
-		if (!$rights) {
-			return;
-		}
+			$db_rights = ($method === 'update')
+				? array_column($db_usrgrps[$usrgrp['usrgrpid']]['rights'], null, 'id')
+				: [];
 
-		$db_rights = ($method === 'update')
-			? DB::select('rights', [
-				'output' => ['rightid', 'groupid', 'id', 'permission'],
-				'filter' => ['groupid' => array_keys($rights)]
-			])
-			: [];
+			foreach ($usrgrp['rights'] as &$right) {
+				if (array_key_exists($right['id'], $db_rights)) {
+					$db_right = $db_rights[$right['id']];
+					unset($db_rights[$right['id']]);
 
-		$ins_rights = [];
-		$upd_rights = [];
-		$del_rightids = [];
+					$right['rightid'] = $db_right['rightid'];
+
+					$upd_right = DB::getUpdatedValues('rights', $right, $db_right);
 
-		foreach ($db_rights as $db_right) {
-			if (array_key_exists($db_right['groupid'], $rights)
-					&& array_key_exists($db_right['id'], $rights[$db_right['groupid']])) {
-				if ($db_right['permission'] != $rights[$db_right['groupid']][$db_right['id']]) {
-					$upd_rights[] = [
-						'values' => ['permission' => $rights[$db_right['groupid']][$db_right['id']]],
-						'where' => ['rightid' => $db_right['rightid']]
+					if ($upd_right) {
+						$upd_rights[] = [
+							'values' => $upd_right,
+							'where' => ['rightid' => $db_right['rightid']]
+						];
+					}
+				}
+				else {
+					$ins_rights[] = [
+						'groupid' => $usrgrp['usrgrpid'],
+						'id' => $right['id'],
+						'permission' => $right['permission']
 					];
 				}
-				unset($rights[$db_right['groupid']][$db_right['id']]);
 			}
-			else {
-				$del_rightids[] = $db_right['rightid'];
-			}
-		}
+			unset($right);
 
-		foreach ($rights as $groupid => $usrgrp_rights) {
-			foreach ($usrgrp_rights as $id => $permission) {
-				$ins_rights[] = [
-					'groupid' => $groupid,
-					'id' => $id,
-					'permission' => $permission
-				];
-			}
+			$del_rightids = array_merge($del_rightids, array_column($db_rights, 'rightid'));
 		}
+		unset($usrgrp);
 
 		if ($ins_rights) {
-			DB::insertBatch('rights', $ins_rights);
+			$rightids = DB::insertBatch('rights', $ins_rights);
 		}
 
 		if ($upd_rights) {
@@ -685,148 +690,163 @@ class CUserGroup extends CApiService {
 		if ($del_rightids) {
 			DB::delete('rights', ['rightid' => $del_rightids]);
 		}
+
+		foreach ($usrgrps as &$usrgrp) {
+			if (!array_key_exists('rights', $usrgrp)) {
+				continue;
+			}
+
+			foreach ($usrgrp['rights'] as &$right) {
+				if (!array_key_exists('rightid', $right)) {
+					$right['rightid'] = array_shift($rightids);
+				}
+			}
+			unset($right);
+		}
+		unset($usrgrp);
 	}
 
 	/**
 	 * Update table "tag_filter".
 	 *
-	 * @param array  $usrgrps
-	 * @param string $method
+	 * @static
+	 *
+	 * @param array      $usrgrps
+	 * @param string     $method
+	 * @param null|array $db_usrgrps
 	 */
-	private function updateTagFilters(array $usrgrps, $method) {
-		$tag_filters = [];
-
-		foreach ($usrgrps as $usrgrp) {
-			if (array_key_exists('tag_filters', $usrgrp)) {
-				$tag_filters[$usrgrp['usrgrpid']] = [];
+	private static function updateTagFilters(array &$usrgrps, string $method, array $db_usrgrps = null): void {
+		$ins_tag_filters = [];
+		$del_tag_filterids = [];
 
-				foreach ($usrgrp['tag_filters'] as $tag_filter) {
-					$tag_filter['usrgrpid'] = $usrgrp['usrgrpid'];
-					$tag_filters[$usrgrp['usrgrpid']][] = $tag_filter;
-				}
-				CArrayHelper::sort($tag_filters[$usrgrp['usrgrpid']], ['groupid', 'tag', 'value']);
+		foreach ($usrgrps as &$usrgrp) {
+			if (!array_key_exists('tag_filters', $usrgrp)) {
+				continue;
 			}
-		}
 
-		if (!$tag_filters) {
-			return;
-		}
+			$db_tag_filterids_by_tag_value = [];
+			$db_tag_filters = ($method === 'update')
+				? $db_usrgrps[$usrgrp['usrgrpid']]['tag_filters']
+				: [];
 
-		$db_tag_filters = ($method === 'update')
-			? DB::select('tag_filter', [
-				'output' => ['tag_filterid', 'usrgrpid', 'groupid', 'tag', 'value'],
-				'filter' => ['usrgrpid' => array_keys($tag_filters)]
-			])
-			: [];
-		CArrayHelper::sort($db_tag_filters, ['usrgrpid', 'groupid', 'tag', 'value']);
-
-		$ins_tag_filters = [];
-		$upd_tag_filters = [];
-		$del_tag_filterids = [];
+			foreach ($db_tag_filters as $db_tag_filter) {
+				$db_tag_filterids_by_tag_value[$db_tag_filter['groupid']][$db_tag_filter['tag']][
+					$db_tag_filter['value']
+				] = $db_tag_filter['tag_filterid'];
+			}
 
-		foreach ($db_tag_filters as $db_tag_filter) {
-			if ($tag_filters[$db_tag_filter['usrgrpid']]) {
-				$tag_filter = array_shift($tag_filters[$db_tag_filter['usrgrpid']]);
+			foreach ($usrgrp['tag_filters'] as &$tag_filter) {
+				$groupid = $tag_filter['groupid'];
+				$tag = $tag_filter['tag'];
+				$value = $tag_filter['value'];
 
-				$upd_tag_filter = [];
+				if (array_key_exists($groupid, $db_tag_filterids_by_tag_value)
+						&& array_key_exists($tag, $db_tag_filterids_by_tag_value[$groupid])
+						&& array_key_exists($value, $db_tag_filterids_by_tag_value[$groupid][$tag])) {
+					$tag_filterid = $db_tag_filterids_by_tag_value[$groupid][$tag][$value];
+					unset($db_tag_filters[$tag_filterid]);
 
-				if (bccomp($tag_filter['groupid'], $db_tag_filter['groupid']) != 0) {
-					$upd_tag_filter['groupid'] = $tag_filter['groupid'];
-				}
-				if ($tag_filter['tag'] !== $db_tag_filter['tag']) {
-					$upd_tag_filter['tag'] = $tag_filter['tag'];
+					$tag_filter['tag_filterid'] = $tag_filterid;
 				}
-				if ($tag_filter['value'] !== $db_tag_filter['value']) {
-					$upd_tag_filter['value'] = $tag_filter['value'];
-				}
-
-				if ($upd_tag_filter) {
-					$upd_tag_filters[] = [
-						'values' => $upd_tag_filter,
-						'where' => ['tag_filterid' => $db_tag_filter['tag_filterid']]
+				else {
+					$ins_tag_filters[] = [
+						'usrgrpid' => $usrgrp['usrgrpid'],
+						'groupid' => $tag_filter['groupid'],
+						'tag' => $tag_filter['tag'],
+						'value' => $tag_filter['value']
 					];
 				}
 			}
-			else {
-				$del_tag_filterids[] = $db_tag_filter['tag_filterid'];
-			}
-		}
+			unset($tag_filter);
 
-		foreach ($usrgrps as $usrgrp) {
-			$ins_tag_filters = array_merge($ins_tag_filters, $tag_filters[$usrgrp['usrgrpid']]);
+			$del_tag_filterids = array_merge($del_tag_filterids, array_column($db_tag_filters, 'tag_filterid'));
 		}
+		unset($usrgrp);
 
 		if ($ins_tag_filters) {
-			DB::insertBatch('tag_filter', array_values($ins_tag_filters));
-		}
-
-		if ($upd_tag_filters) {
-			DB::update('tag_filter', array_values($upd_tag_filters));
+			$tag_filterids = DB::insertBatch('tag_filter', $ins_tag_filters);
 		}
 
 		if ($del_tag_filterids) {
 			DB::delete('tag_filter', ['tag_filterid' => $del_tag_filterids]);
 		}
-	}
-
-	/**
-	 * Update table "users_groups".
-	 *
-	 * @param array  $usrgrps
-	 * @param string $method
-	 */
-	private function updateUsersGroups(array $usrgrps, $method) {
-		$users_groups = [];
 
-		foreach ($usrgrps as $usrgrp) {
-			if (array_key_exists('userids', $usrgrp)) {
-				$users_groups[$usrgrp['usrgrpid']] = [];
+		foreach ($usrgrps as &$usrgrp) {
+			if (!array_key_exists('tag_filters', $usrgrp)) {
+				continue;
+			}
 
-				foreach ($usrgrp['userids'] as $userid) {
-					$users_groups[$usrgrp['usrgrpid']][$userid] = true;
+			foreach ($usrgrp['tag_filters'] as &$tag_filter) {
+				if (!array_key_exists('tag_filterid', $tag_filter)) {
+					$tag_filter['tag_filterid'] = array_shift($tag_filterids);
 				}
 			}
+			unset($tag_filter);
 		}
+		unset($usrgrp);
+	}
 
-		if (!$users_groups) {
-			return;
-		}
-
-		$db_users_groups = ($method === 'update')
-			? DB::select('users_groups', [
-				'output' => ['id', 'usrgrpid', 'userid'],
-				'filter' => ['usrgrpid' => array_keys($users_groups)]
-			])
-			: [];
-
+	/**
+	 * Update table "users_groups".
+	 *
+	 * @static
+	 *
+	 * @param array      $usrgrps
+	 * @param string     $method
+	 * @param null|array $db_usrgrps
+	 */
+	private static function updateUsersGroups(array &$usrgrps, string $method, array $db_usrgrps = null): void {
 		$ins_users_groups = [];
 		$del_ids = [];
 
-		foreach ($db_users_groups as $db_user_group) {
-			if (array_key_exists($db_user_group['userid'], $users_groups[$db_user_group['usrgrpid']])) {
-				unset($users_groups[$db_user_group['usrgrpid']][$db_user_group['userid']]);
-			}
-			else {
-				$del_ids[] = $db_user_group['id'];
+		foreach ($usrgrps as &$usrgrp) {
+			if (!array_key_exists('users', $usrgrp)) {
+				continue;
 			}
-		}
 
-		foreach ($users_groups as $usrgrpid => $userids) {
-			foreach (array_keys($userids) as $userid) {
-				$ins_users_groups[] = [
-					'usrgrpid' => $usrgrpid,
-					'userid' => $userid
-				];
+			$db_users = ($method === 'update')
+				? array_column($db_usrgrps[$usrgrp['usrgrpid']]['users'], null, 'userid')
+				: [];
+
+			foreach ($usrgrp['users'] as &$user) {
+				if (array_key_exists($user['userid'], $db_users)) {
+					$user['id'] = $db_users[$user['userid']]['id'];
+					unset($db_users[$user['userid']]);
+				}
+				else {
+					$ins_users_groups[] = [
+						'userid' => $user['userid'],
+						'usrgrpid' => $usrgrp['usrgrpid']
+					];
+				}
 			}
+			unset($user);
+
+			$del_ids = array_merge($del_ids, array_column($db_users, 'id'));
 		}
+		unset($usrgrp);
 
 		if ($ins_users_groups) {
-			DB::insertBatch('users_groups', $ins_users_groups);
+			$ids = DB::insertBatch('users_groups', $ins_users_groups);
 		}
 
 		if ($del_ids) {
 			DB::delete('users_groups', ['id' => $del_ids]);
 		}
+
+		foreach ($usrgrps as &$usrgrp) {
+			if (!array_key_exists('users', $usrgrp)) {
+				continue;
+			}
+
+			foreach ($usrgrp['users'] as &$user) {
+				if (!array_key_exists('id', $user)) {
+					$user['id'] = array_shift($ids);
+				}
+			}
+			unset($user);
+		}
+		unset($usrgrp);
 	}
 
 	/**
@@ -841,7 +861,7 @@ class CUserGroup extends CApiService {
 		DB::delete('users_groups', ['usrgrpid' => $usrgrpids]);
 		DB::delete('usrgrp', ['usrgrpid' => $usrgrpids]);
 
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_USER_GROUP, $db_usrgrps);
+		$this->addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_USER_GROUP, $db_usrgrps);
 
 		return ['usrgrpids' => $usrgrpids];
 	}
@@ -853,10 +873,6 @@ class CUserGroup extends CApiService {
 	 * @param array $db_usrgrps
 	 */
 	protected function validateDelete(array &$usrgrpids, array &$db_usrgrps = null) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can delete user groups.'));
-		}
-
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
 		if (!CApiInputValidator::validate($api_input_rules, $usrgrpids, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
@@ -880,7 +896,7 @@ class CUserGroup extends CApiService {
 
 			$usrgrps[] = [
 				'usrgrpid' => $usrgrpid,
-				'userids' => []
+				'users' => []
 			];
 		}
 
@@ -1044,4 +1060,79 @@ class CUserGroup extends CApiService {
 
 		return $result;
 	}
+
+	/**
+	 * Add the existing rights, tag_filters and userids to $db_usrgrps whether these are affected by the update.
+	 *
+	 * @param array $usrgrps
+	 * @param array $db_usrgrps
+	 */
+	private function addAffectedObjects(array $usrgrps, array &$db_usrgrps): void {
+		$usrgrpids = ['rights' => [], 'tag_filters' => [], 'users' => []];
+
+		foreach ($usrgrps as $usrgrp) {
+			if (array_key_exists('rights', $usrgrp)) {
+				$usrgrpids['rights'][] = $usrgrp['usrgrpid'];
+				$db_usrgrps[$usrgrp['usrgrpid']]['rights'] = [];
+			}
+
+			if (array_key_exists('tag_filters', $usrgrp)) {
+				$usrgrpids['tag_filters'][] = $usrgrp['usrgrpid'];
+				$db_usrgrps[$usrgrp['usrgrpid']]['tag_filters'] = [];
+			}
+
+			if (array_key_exists('users', $usrgrp)) {
+				$usrgrpids['users'][] = $usrgrp['usrgrpid'];
+				$db_usrgrps[$usrgrp['usrgrpid']]['users'] = [];
+			}
+		}
+
+		if ($usrgrpids['rights']) {
+			$options = [
+				'output' => ['rightid', 'groupid', 'permission', 'id'],
+				'filter' => ['groupid' => $usrgrpids['rights']]
+			];
+			$db_rights = DBselect(DB::makeSql('rights', $options));
+
+			while ($db_right = DBfetch($db_rights)) {
+				$db_usrgrps[$db_right['groupid']]['rights'][$db_right['rightid']] = [
+					'rightid' => $db_right['rightid'],
+					'id' => $db_right['id'],
+					'permission' => $db_right['permission']
+				];
+			}
+		}
+
+		if ($usrgrpids['tag_filters']) {
+			$options = [
+				'output' => ['tag_filterid', 'usrgrpid', 'groupid', 'tag', 'value'],
+				'filter' => ['usrgrpid' => $usrgrpids['tag_filters']]
+			];
+			$db_tags = DBselect(DB::makeSql('tag_filter', $options));
+
+			while ($db_tag = DBfetch($db_tags)) {
+				$db_usrgrps[$db_tag['usrgrpid']]['tag_filters'][$db_tag['tag_filterid']] = [
+					'tag_filterid' => $db_tag['tag_filterid'],
+					'groupid' => $db_tag['groupid'],
+					'tag' => $db_tag['tag'],
+					'value' => $db_tag['value']
+				];
+			}
+		}
+
+		if ($usrgrpids['users']) {
+			$options = [
+				'output' => ['id', 'usrgrpid', 'userid'],
+				'filter' => ['usrgrpid' => $usrgrpids['users']]
+			];
+			$db_users = DBselect(DB::makeSql('users_groups', $options));
+
+			while ($db_user = DBfetch($db_users)) {
+				$db_usrgrps[$db_user['usrgrpid']]['users'][$db_user['id']] = [
+					'id' => $db_user['id'],
+					'userid' => $db_user['userid']
+				];
+			}
+		}
+	}
 }
diff --git a/ui/include/classes/db/MysqlDbBackend.php b/ui/include/classes/db/MysqlDbBackend.php
index e26b861c6e3..706fe19776b 100644
--- a/ui/include/classes/db/MysqlDbBackend.php
+++ b/ui/include/classes/db/MysqlDbBackend.php
@@ -65,9 +65,9 @@ class MysqlDbBackend extends DbBackend {
 			' WHERE schema_name='.zbx_dbstr($DB['DATABASE'])
 		));
 
-		if ($row && strtoupper($row['db_charset']) != ZBX_DB_DEFAULT_CHARSET) {
+		if ($row && !in_array(strtoupper($row['db_charset']), ZBX_DB_MYSQL_ALLOWED_CHARSETS)) {
 			$this->setWarning(_s('Incorrect default charset for Zabbix database: %1$s.',
-				_s('"%1$s" instead "%2$s"', $row['db_charset'], ZBX_DB_DEFAULT_CHARSET)
+				_s('"%1$s" instead "%2$s"', $row['db_charset'], implode(', ', ZBX_DB_MYSQL_ALLOWED_CHARSETS))
 			));
 			return false;
 		}
@@ -89,8 +89,8 @@ class MysqlDbBackend extends DbBackend {
 				' AND '.dbConditionString('table_name', array_keys(DB::getSchema())).
 				' AND '.dbConditionString('data_type', ['text', 'varchar', 'longtext']).
 				' AND ('.
-					' UPPER(character_set_name)!='.zbx_dbstr(ZBX_DB_DEFAULT_CHARSET).
-					' OR collation_name!='.zbx_dbstr(ZBX_DB_MYSQL_DEFAULT_COLLATION).
+					dbConditionString('UPPER(character_set_name)', ZBX_DB_MYSQL_ALLOWED_CHARSETS, true).
+					' OR '.dbConditionString('collation_name', ZBX_DB_MYSQL_ALLOWED_COLLATIONS, true).
 				')'
 		), 'table_name');
 
@@ -107,9 +107,9 @@ class MysqlDbBackend extends DbBackend {
 	}
 
 	/**
-	* Check if database is using IEEE754 compatible double precision columns.
-	*
-	* @return bool
+	 * Check if database is using IEEE754 compatible double precision columns.
+	 *
+	 * @return bool
 	*/
 	public function isDoubleIEEE754() {
 		global $DB;
diff --git a/ui/include/classes/db/PostgresqlDbBackend.php b/ui/include/classes/db/PostgresqlDbBackend.php
index 4f4e70891ff..379125a5ac8 100644
--- a/ui/include/classes/db/PostgresqlDbBackend.php
+++ b/ui/include/classes/db/PostgresqlDbBackend.php
@@ -91,9 +91,9 @@ class PostgresqlDbBackend extends DbBackend {
 			' WHERE datname='.zbx_dbstr($DB['DATABASE'])
 		));
 
-		if ($row && $row['db_charset'] != ZBX_DB_DEFAULT_CHARSET) {
+		if ($row && $row['db_charset'] != ZBX_DB_POSTGRESQL_ALLOWED_CHARSET) {
 			$this->setWarning(_s('Incorrect default charset for Zabbix database: %1$s.',
-				_s('"%1$s" instead "%2$s"', $row['db_charset'], ZBX_DB_DEFAULT_CHARSET)
+				_s('"%1$s" instead "%2$s"', $row['db_charset'], ZBX_DB_POSTGRESQL_ALLOWED_CHARSET)
 			));
 			return false;
 		}
diff --git a/ui/include/classes/helpers/CMapHelper.php b/ui/include/classes/helpers/CMapHelper.php
index 672f71204ae..bc08c98f70c 100644
--- a/ui/include/classes/helpers/CMapHelper.php
+++ b/ui/include/classes/helpers/CMapHelper.php
@@ -320,21 +320,14 @@ class CMapHelper {
 			'. '.
 			implode('', array_merge($status_problems, $status_other));
 
-		foreach ($sysmap['shapes'] as &$shape) {
-			if (array_key_exists('text', $shape)) {
-				$shape['text'] = CMacrosResolverHelper::resolveMapLabelMacros($shape['text']);
-				$shape['text'] = str_replace('{MAP.NAME}', $sysmap['name'], $shape['text']);
-			}
-		}
-		unset($shape);
+		$sysmap['shapes'] = CMacrosResolverHelper::resolveMapShapeLabelMacros($sysmap['name'], $sysmap['shapes']);
+		$sysmap['links'] = CMacrosResolverHelper::resolveMapLinkLabelMacros($sysmap['links']);
 
 		foreach ($sysmap['lines'] as $line) {
 			$sysmap['shapes'][] = self::convertLineToShape($line);
 		}
 
 		foreach ($sysmap['links'] as &$link) {
-			$link['label'] = CMacrosResolverHelper::resolveMapLabelMacros($link['label']);
-
 			if ($link['permission'] >= PERM_READ) {
 				if (empty($link['linktriggers'])) {
 					continue;
@@ -643,6 +636,7 @@ class CMapHelper {
 						'border_width' => 3,
 						'border_color' => $theme['maingridcolor'],
 						'background_color' => '',
+						'text' => '',
 						'zindex' => -1
 					];
 				}
diff --git a/ui/include/classes/helpers/CRoleHelper.php b/ui/include/classes/helpers/CRoleHelper.php
index 7de10e5b346..3d0d7b57f80 100644
--- a/ui/include/classes/helpers/CRoleHelper.php
+++ b/ui/include/classes/helpers/CRoleHelper.php
@@ -418,7 +418,7 @@ class CRoleHelper {
 
 		$labels += [
 			self::ACTIONS_ADD_PROBLEM_COMMENTS => _('Add problem comments'),
-			self::ACTIONS_CHANGE_SEVERITY => ('Change severity'),
+			self::ACTIONS_CHANGE_SEVERITY => _('Change severity'),
 			self::ACTIONS_ACKNOWLEDGE_PROBLEMS => _('Acknowledge problems'),
 			self::ACTIONS_CLOSE_PROBLEMS => _('Close problems'),
 			self::ACTIONS_EXECUTE_SCRIPTS => _('Execute scripts'),
diff --git a/ui/include/classes/import/converters/C54ImportConverter.php b/ui/include/classes/import/converters/C54ImportConverter.php
index ff4e7923f82..ae2e8891842 100644
--- a/ui/include/classes/import/converters/C54ImportConverter.php
+++ b/ui/include/classes/import/converters/C54ImportConverter.php
@@ -34,6 +34,180 @@ class C54ImportConverter extends CConverter {
 	public function convert(array $data): array {
 		$data['zabbix_export']['version'] = '6.0';
 
+		if (array_key_exists('hosts', $data['zabbix_export'])) {
+			$data['zabbix_export']['hosts'] = self::convertHosts($data['zabbix_export']['hosts']);
+		}
+
+		if (array_key_exists('templates', $data['zabbix_export'])) {
+			$data['zabbix_export']['templates'] = self::convertTemplates($data['zabbix_export']['templates']);
+		}
+
+		if (array_key_exists('graphs', $data['zabbix_export'])) {
+			$data['zabbix_export']['graphs'] = self::convertGraphs($data['zabbix_export']['graphs']);
+		}
+
+		if (array_key_exists('maps', $data['zabbix_export'])) {
+			$data['zabbix_export']['maps'] = self::convertMaps($data['zabbix_export']['maps']);
+		}
+
+		if (array_key_exists('media_types', $data['zabbix_export'])) {
+			$data['zabbix_export']['media_types'] = self::convertMediaTypes($data['zabbix_export']['media_types']);
+		}
+
 		return $data;
 	}
+
+	/**
+	 * Convert function macros "{host:key.func(<param>)}" to expression macros "{?func(/host/key<, param>)}".
+	 *
+	 * @static
+	 *
+	 * @param string $text
+	 *
+	 * @return string
+	 */
+	private static function convertFunctionMacros(string $text): string {
+		return (new C54SimpleMacroConverter())->convert($text);
+	}
+
+	/**
+	 * Convert hosts.
+	 *
+	 * @static
+	 *
+	 * @param array $hosts
+	 *
+	 * @return array
+	 */
+	private static function convertHosts(array $hosts): array {
+		foreach ($hosts as &$host) {
+			if (array_key_exists('discovery_rules', $host)) {
+				$host['discovery_rules'] = self::convertDiscoveryRules($host['discovery_rules']);
+			}
+		}
+		unset($host);
+
+		return $hosts;
+	}
+
+	/**
+	 * Convert templates.
+	 *
+	 * @static
+	 *
+	 * @param array $templates
+	 *
+	 * @return array
+	 */
+	private static function convertTemplates(array $templates): array {
+		foreach ($templates as &$template) {
+			if (array_key_exists('discovery_rules', $template)) {
+				$template['discovery_rules'] = self::convertDiscoveryRules($template['discovery_rules']);
+			}
+		}
+		unset($template);
+
+		return $templates;
+	}
+
+	/**
+	 * Convert discover rules.
+	 *
+	 * @param array $discovery_rules
+	 *
+	 * @return array
+	 */
+	private static function convertDiscoveryRules(array $discovery_rules): array {
+		foreach ($discovery_rules as &$discovery_rule) {
+			if (array_key_exists('graph_prototypes', $discovery_rule)) {
+				$discovery_rule['graph_prototypes'] = self::convertGraphs($discovery_rule['graph_prototypes']);
+			}
+		}
+		unset($discovery_rule);
+
+		return $discovery_rules;
+	}
+
+	/**
+	 * Convert graphs.
+	 *
+	 * @static
+	 *
+	 * @param array $graphs
+	 *
+	 * @return array
+	 */
+	private static function convertGraphs(array $graphs): array {
+		foreach ($graphs as &$graph) {
+			$graph['name'] = self::convertFunctionMacros($graph['name']);
+		}
+		unset($graph);
+
+		return $graphs;
+	}
+
+	/**
+	 * Convert maps.
+	 *
+	 * @static
+	 *
+	 * @param array $maps
+	 *
+	 * @return array
+	 */
+	private static function convertMaps(array $maps): array {
+		foreach ($maps as &$map) {
+			$map['label_string_host'] = self::convertFunctionMacros($map['label_string_host']);
+			$map['label_string_map'] = self::convertFunctionMacros($map['label_string_map']);
+			$map['label_string_trigger'] = self::convertFunctionMacros($map['label_string_trigger']);
+			$map['label_string_hostgroup'] = self::convertFunctionMacros($map['label_string_hostgroup']);
+			$map['label_string_image'] = self::convertFunctionMacros($map['label_string_image']);
+
+			foreach ($map['selements'] as &$selement) {
+				$selement['label'] = self::convertFunctionMacros($selement['label']);
+			}
+			unset($selement);
+
+			foreach ($map['shapes'] as &$shape) {
+				$shape['text'] = self::convertFunctionMacros($shape['text']);
+			}
+			unset($shape);
+
+			foreach ($map['links'] as &$link) {
+				$link['label'] = self::convertFunctionMacros($link['label']);
+			}
+			unset($link);
+		}
+		unset($map);
+
+		return $maps;
+	}
+
+	/**
+	 * Convert media types.
+	 *
+	 * @static
+	 *
+	 * @param array $media_types
+	 *
+	 * @return array
+	 */
+	private static function convertMediaTypes(array $media_types): array {
+		foreach ($media_types as &$media_type) {
+			if (array_key_exists('message_templates', $media_type)) {
+				foreach ($media_type['message_templates'] as &$message_template) {
+					if (array_key_exists('subject', $message_template)) {
+						$message_template['subject'] = self::convertFunctionMacros($message_template['subject']);
+					}
+					if (array_key_exists('message', $message_template)) {
+						$message_template['message'] = self::convertFunctionMacros($message_template['message']);
+					}
+				}
+				unset($message_template);
+			}
+		}
+		unset($media_type);
+
+		return $media_types;
+	}
 }
diff --git a/ui/include/classes/import/converters/C54SimpleMacroConverter.php b/ui/include/classes/import/converters/C54SimpleMacroConverter.php
new file mode 100644
index 00000000000..71d9d2530a0
--- /dev/null
+++ b/ui/include/classes/import/converters/C54SimpleMacroConverter.php
@@ -0,0 +1,74 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 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.
+**/
+
+
+/**
+ * Expression macros converter in event name field.
+ */
+class C54SimpleMacroConverter extends C52TriggerExpressionConverter {
+
+	/**
+	 * Converting simple macros to expression macros in the selected text.
+	 *
+	 * @param string $text
+	 *
+	 * @return string
+	 */
+	public function convert($text): string {
+		$function_macro_parser = new C10FunctionMacroParser(['host_macro' => [ '{HOST.HOST}', '{HOSTNAME}',
+			'{HOST.HOST1}', '{HOSTNAME1}', '{HOST.HOST2}', '{HOSTNAME2}', '{HOST.HOST3}', '{HOSTNAME3}',
+			'{HOST.HOST4}', '{HOSTNAME4}', '{HOST.HOST5}', '{HOSTNAME5}', '{HOST.HOST6}', '{HOSTNAME6}',
+			'{HOST.HOST7}', '{HOSTNAME7}', '{HOST.HOST8}', '{HOSTNAME8}', '{HOST.HOST9}', '{HOSTNAME9}'
+		]]);
+		$function_parser = new C10FunctionParser();
+		$macro_values = [];
+
+		for ($pos = strpos($text, '{'); $pos !== false; $pos = strpos($text, '{', $pos + 1)) {
+			if ($function_macro_parser->parse($text, $pos) == CParser::PARSE_FAIL) {
+				continue;
+			}
+
+			$function_parser->parse($function_macro_parser->getFunction());
+			$function_param_list = [];
+
+			for ($n = 0; $n < $function_parser->getParamsNum(); $n++) {
+				$function_param_list[] = $function_parser->getParam($n);
+			}
+
+			$data = [
+				'host' => $function_macro_parser->getHost(),
+				'item' => $function_macro_parser->getItem(),
+				'functionName' => $function_parser->getFunction(),
+				'functionParamsRaw' => $function_parser->getParamsRaw(),
+				'functionParams' => $function_param_list
+			];
+			$data['host'] = strtr($data['host'], ['HOSTNAME' => 'HOST.HOST']);
+			if ($data['host'] === '{HOST.HOST}' || $data['host'] === '{HOST.HOST1}') {
+				$data['host'] = '';
+			}
+
+			[$new_expr] = $this->convertFunction($data, '', '');
+
+			$macro_values[$function_macro_parser->getMatch()] = '{?'.$new_expr.'}';
+		}
+
+		return strtr($text, $macro_values);
+	}
+}
diff --git a/ui/include/classes/macros/CMacrosResolver.php b/ui/include/classes/macros/CMacrosResolver.php
index f1ef823ac86..b8a263dd570 100644
--- a/ui/include/classes/macros/CMacrosResolver.php
+++ b/ui/include/classes/macros/CMacrosResolver.php
@@ -67,11 +67,6 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 			'types' => ['user'],
 			'method' => 'resolveTexts'
 		],
-		'graphName' => [
-			'types' => ['graphFunctionalItem'],
-			'source' => 'name',
-			'method' => 'resolveGraph'
-		],
 		'widgetURL' => [
 			'types' => ['host', 'hostId', 'interfaceWithoutPort', 'user'],
 			'source' => 'url',
@@ -307,7 +302,7 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 				' FROM interface i'.
 				' WHERE i.main='.INTERFACE_PRIMARY.
 					' AND '.dbConditionInt('i.hostid', array_keys($interface_hostids)).
-					' AND '.dbConditionInt('i.type', $this->interfacePriorities)
+					' AND '.dbConditionInt('i.type', self::interfacePriorities)
 			));
 
 			$interfaces = CMacrosResolverHelper::resolveHostInterfaces($interfaces);
@@ -315,10 +310,10 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 			// Items with no interfaces must collect interface data from host.
 			foreach ($interfaces as $interface) {
 				$hostid = $interface['hostid'];
-				$priority = $this->interfacePriorities[$interface['type']];
+				$priority = self::interfacePriorities[$interface['type']];
 
 				if (!array_key_exists($hostid, $interfaces_by_priority)
-						|| $priority > $this->interfacePriorities[$interfaces_by_priority[$hostid]['type']]) {
+						|| $priority > self::interfacePriorities[$interfaces_by_priority[$hostid]['type']]) {
 					$interfaces_by_priority[$hostid] = $interface;
 				}
 			}
@@ -1243,256 +1238,95 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 	}
 
 	/**
-	 * Resolve functional item macros, for example, {{HOST.HOST1}:key.func(param)}.
+	 * Resolve {HOST.HOST<1-9} and empty plaseholders in the expression macros.
+	 *   For example:
+	 *     {$last(/ /key)} => {$last(/Zabbix server/key)}
+	 *     {$last(/MySQL server/key)} => {$last(/MySQL server/key)}
+	 *     {$last(/{HOST.HOST}/key)} => {$last(/host/key)}
 	 *
-	 * @param array  $graphs							list or hashmap of graphs
-	 * @param string $graphs[]['name']				string in which macros should be resolved
-	 * @param array  $graphs[]['items']				list of graph items
-	 * @param int    $graphs[]['items'][n]['hostid']	graph n-th item corresponding host Id
-	 * @param string $graphs[]['items'][n]['host']	graph n-th item corresponding host name
+	 * @param string	$macro            [IN]     Original macro.
+	 * @param array		$data             [IN/OUT] Data, returned by CHistFunctionParser.
+	 * @param string	$data['host']
+	 * @param array		$items            [IN]    The list of graph items.
+	 * @param string	$items[]['host']
 	 *
-	 * @return string	inputted data with resolved source field
+	 * @return string
 	 */
-	private function resolveGraph($graphs) {
-		if ($this->isTypeAvailable('graphFunctionalItem')) {
-			$sourceKeyName = $this->getSource();
-
-			$sourceStringList = [];
-			$itemsList = [];
-
-			foreach ($graphs as $graph) {
-				$sourceStringList[] = $graph[$sourceKeyName];
-				$itemsList[] = $graph['items'];
+	private static function resolveGraphNameExpressionMacroHost(string $macro, array &$data, array $items): string {
+		if ($data['host'] === '' || $data['host'][0] == '{') {
+			if ($data['host'] === '') {
+				$reference = 0;
+				$pattern = '#//#';
 			}
-
-			$resolvedStringList = $this->resolveGraphsFunctionalItemMacros($sourceStringList, $itemsList);
-			$resolvedString = reset($resolvedStringList);
-
-			foreach ($graphs as &$graph) {
-				$graph[$sourceKeyName] = $resolvedString;
-				$resolvedString = next($resolvedStringList);
-			}
-			unset($graph);
-		}
-
-		return $graphs;
-	}
-
-	/**
-	 * Resolve functional macros, like {hostname:key.function(param)}.
-	 * If macro can not be resolved it is replaced with UNRESOLVED_MACRO_STRING string i.e. "*UNKNOWN*".
-	 *
-	 * Supports function "last", "min", "max" and "avg".
-	 * Supports seconds as parameters, except "last" function.
-	 * Second parameter like {hostname:key.last(0,86400) and offsets like {hostname:key.last(#1)} are not supported.
-	 * Supports postfixes s,m,h,d and w for parameter.
-	 *
-	 * @param array  $sourceStringList			list of strings from graphs in which macros should be resolved
-	 * @param array  $itemsList					list of lists of graph items used in graphs
-	 * @param int    $itemsList[n][m]['hostid']	n-th graph m-th item corresponding host ID
-	 * @param string $itemsList[n][m]['host']	n-th graph m-th item corresponding host name
-	 *
-	 * @return array	list of strings, possibly with macros in them replaced with resolved values
-	 */
-	private function resolveGraphsFunctionalItemMacros(array $sourceStringList, array $itemsList) {
-		$hostKeyPairs = [];
-		$matchesList = [];
-
-		$items = reset($itemsList);
-		foreach ($sourceStringList as $sourceString) {
-
-			/*
-			 * Extract all macros into $matches - keys: macros, hosts, keys, functions and parameters are used
-			 * searches for macros, for example, "{somehost:somekey["param[123]"].min(10m)}"
-			 */
-			preg_match_all('/(?P<macros>{'.
-				'(?P<hosts>('.ZBX_PREG_HOST_FORMAT.'|({('.self::PATTERN_HOST_INTERNAL.')'.self::PATTERN_MACRO_PARAM.'}))):'.
-				'(?P<keys>'.ZBX_PREG_ITEM_KEY_FORMAT.')\.'.
-				'(?P<functions>(last|max|min|avg))\('.
-				'(?P<parameters>([0-9]+['.ZBX_TIME_SUFFIXES.']?)?)'.
-				'\)}{1})/Uux', $sourceString, $matches, PREG_OFFSET_CAPTURE);
-
-			foreach ($matches['hosts'] as $i => &$host) {
-				$host[0] = $this->resolveGraphPositionalMacros($host[0], $items);
-
-				if ($host[0] !== UNRESOLVED_MACRO_STRING) {
-					// Take note that resolved host has a such key (and it is used in a macro).
-					if (!isset($hostKeyPairs[$host[0]])) {
-						$hostKeyPairs[$host[0]] = [];
-					}
-					$hostKeyPairs[$host[0]][$matches['keys'][$i][0]] = true;
-				}
+			else {
+				$macro_parser = new CMacroParser([
+					'macros' => ['{HOST.HOST}'],
+					'ref_type' => CMacroParser::REFERENCE_NUMERIC
+				]);
+				$macro_parser->parse($data['host']);
+				$reference = $macro_parser->getReference();
+				$reference = ($reference == 0) ? 0 : $reference - 1;
+				$pattern = '#/\{HOST\.HOST[1-9]?\}/#';
 			}
-			unset($host);
-
-			// Remember match for later use.
-			$matchesList[] = $matches;
-
-			$items = next($itemsList);
-		}
-
-		/*
-		 * If no host/key pairs found in macro-like parts of source string then there is nothing to do but return
-		 * source strings as they are.
-		 */
-		if (!$hostKeyPairs) {
-			return $sourceStringList;
-		}
 
-		// Build item retrieval query from host-key pairs and get all necessary items for all source strings.
-		$queryParts = [];
-		foreach ($hostKeyPairs as $host => $keys) {
-			$queryParts[] = '(h.host='.zbx_dbstr($host).' AND '.dbConditionString('i.key_', array_keys($keys)).')';
-		}
-		$items = DBfetchArrayAssoc(DBselect(
-			'SELECT h.host,i.key_,i.itemid,i.value_type,i.units,i.valuemapid'.
-			' FROM items i,hosts h'.
-			' WHERE i.hostid=h.hostid'.
-				' AND ('.join(' OR ', $queryParts).')'
-		), 'itemid');
-
-		foreach ($matches['functions'] as $function) {
-			if ($function[0] === 'last') {
-				$items = self::getItemsValueMaps($items);
-				break;
+			if (!array_key_exists($reference, $items)) {
+				return $macro;
 			}
-		}
-
-		// Get items for which user has permission.
-		$allowedItems = API::Item()->get([
-			'itemids' => array_keys($items),
-			'webitems' => true,
-			'output' => ['itemid', 'value_type', 'lastvalue', 'lastclock'],
-			'preservekeys' => true
-		]);
-
-		// Get map item data only for those allowed items and set "value_type" for allowed items.
-		foreach ($items as $item) {
-			if (isset($allowedItems[$item['itemid']])) {
-				$item['lastvalue'] = $allowedItems[$item['itemid']]['lastvalue'];
-				$item['lastclock'] = $allowedItems[$item['itemid']]['lastclock'];
-				$hostKeyPairs[$item['host']][$item['key_']] = $item;
-			}
-		}
-
-		/*
-		 * Replace macros with their corresponding values in graph strings and replace macros with their resolved
-		 * values in source strings.
-		 */
-		$matches = reset($matchesList);
-		foreach ($sourceStringList as &$sourceString) {
-
-			/*
-			 * We iterate array backwards so that replacing unresolved macro string (see lower) with actual value
-			 * does not mess up originally captured offsets.
-			 */
-			$i = count($matches['macros']);
-
-			while ($i--) {
-				$host = $matches['hosts'][$i][0];
-				$key = $matches['keys'][$i][0];
-				$function = $matches['functions'][$i][0];
-				$parameter = $matches['parameters'][$i][0];
-
-				// If host is real and item exists and has permissions.
-				if ($host !== UNRESOLVED_MACRO_STRING && is_array($hostKeyPairs[$host][$key])) {
-					$item = $hostKeyPairs[$host][$key];
-
-					// Macro function is "last".
-					if ($function == 'last') {
-						$value = ($item['lastclock'] > 0)
-							? formatHistoryValue($item['lastvalue'], $item)
-							: UNRESOLVED_MACRO_STRING;
-					}
-					// For other macro functions ("max", "min" or "avg") get item value.
-					else {
-						$value = getItemFunctionalValue($item, $function, $parameter);
-					}
-				}
-				// Or if there is no item with given key in given host, or there is no permissions to that item.
-				else {
-					$value = UNRESOLVED_MACRO_STRING;
-				}
 
-				/*
-				 * Replace macro string with actual, resolved string value. This is safe because we start from far
-				 * end of $sourceString.
-				 */
-				$sourceString = substr_replace($sourceString, $value, $matches['macros'][$i][1],
-					strlen($matches['macros'][$i][0])
-				);
-			}
+			$data['host'] = $items[$reference]['host'];
 
-			// Advance to next matches for next $sourceString.
-			$matches = next($matchesList);
+			// Replace {HOST.HOST<1-9>} macro with real host name.
+			return preg_replace($pattern, '/'.$data['host'].'/', $macro, 1);
 		}
-		unset($sourceString);
 
-		return $sourceStringList;
+		return $macro;
 	}
 
 	/**
-	 * Resolve positional macros, like {HOST.HOST2}.
-	 * If macro can not be resolved it is replaced with UNRESOLVED_MACRO_STRING string i.e. "*UNKNOWN*"
-	 * Supports HOST.HOST<1..9> macros.
+	 * Resolve expression macros. For example, {?func(/host/key, param)} or {?func(/{HOST.HOST1}/key, param)}.
 	 *
-	 * @param string	$str				string in which macros should be resolved
-	 * @param array		$items				list of graph items
-	 * @param int 		$items[n]['hostid'] graph n-th item corresponding host Id
-	 * @param string	$items[n]['host']   graph n-th item corresponding host name
+	 * @param array  $graphs
+	 * @param string $graphs[]['name']
+	 * @param array  $graphs[]['items']
+	 * @param string $graphs[]['items'][]['host']
 	 *
-	 * @return string	string with macros replaces with corresponding values
+	 * @return array	Inputted data with resolved graph name.
 	 */
-	private function resolveGraphPositionalMacros($str, $items) {
-		// Extract all macros into $matches.
-		preg_match_all('/{(('.self::PATTERN_HOST_INTERNAL.')('.self::PATTERN_MACRO_PARAM.'))\}/', $str, $matches);
-
-		// Match found groups if ever regexp should change.
-		$matches['macroType'] = $matches[2];
-		$matches['position'] = $matches[3];
-
-		// Build structure of macros: $macroList['HOST.HOST'][2] = 'host name';
-		$macroList = [];
-
-		// $matches[3] contains positions, e.g., '',1,2,2,3,...
-		foreach ($matches['position'] as $i => $position) {
-			// Take care of macro without positional index.
-			$posInItemList = ($position === '') ? 0 : $position - 1;
-
-			// Init array.
-			if (!isset($macroList[$matches['macroType'][$i]])) {
-				$macroList[$matches['macroType'][$i]] = [];
-			}
+	public static function resolveGraphNames(array $graphs): array {
+		$types = ['expr_macros_host_n' => true];
+		$macros = ['expr_macros' => []];
+		$macro_values = [];
 
-			// Skip computing for duplicate macros.
-			if (isset($macroList[$matches['macroType'][$i]][$position])) {
-				continue;
-			}
+		foreach ($graphs as $key => $graph) {
+			$matched_macros = self::extractMacros([$graph['name']], $types);
 
-			// Positional index larger than item count, resolve to UNKNOWN.
-			if (!isset($items[$posInItemList])) {
-				$macroList[$matches['macroType'][$i]][$position] = UNRESOLVED_MACRO_STRING;
+			foreach ($matched_macros['expr_macros_host_n'] as $macro => $data) {
+				$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
 
-				continue;
+				$_macro = self::resolveGraphNameExpressionMacroHost($macro, $data, $graph['items']);
+				if (!array_key_exists($_macro, $macros['expr_macros'])) {
+					$macros['expr_macros'][$_macro] = $data;
+				}
+				$macros['expr_macros'][$_macro]['links'][$macro][] = $key;
 			}
+		}
 
-			// Retrieve macro replacement data.
-			switch ($matches['macroType'][$i]) {
-				case 'HOSTNAME':
-				case 'HOST.HOST':
-					$macroList[$matches['macroType'][$i]][$position] = $items[$posInItemList]['host'];
-					break;
+		foreach (self::getExpressionMacros($macros['expr_macros'], []) as $_macro => $value) {
+			foreach ($macros['expr_macros'][$_macro]['links'] as $macro => $keys) {
+				foreach ($keys as $key) {
+					$macro_values[$key][$macro] = $value;
+				}
 			}
 		}
 
-		// Replace macros with values in $str.
-		foreach ($macroList as $macroType => $positions) {
-			foreach ($positions as $position => $replacement) {
-				$str = str_replace('{'.$macroType.$position.'}', $replacement, $str);
+		foreach ($graphs as $key => &$graph) {
+			if (array_key_exists($key, $macro_values)) {
+				$graph['name'] = strtr($graph['name'], $macro_values[$key]);
 			}
 		}
+		unset($graph);
 
-		return $str;
+		return $graphs;
 	}
 
 	/**
@@ -1682,7 +1516,7 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 						'SELECT i.hostid,i.interfaceid,i.ip,i.dns,i.useip,i.port,i.type,i.main'.
 						' FROM interface i'.
 						' WHERE '.dbConditionInt('i.hostid', array_keys($hostids)).
-							' AND '.dbConditionInt('i.type', $this->interfacePriorities)
+							' AND '.dbConditionInt('i.type', self::interfacePriorities)
 					));
 
 					$interfaces = CMacrosResolverHelper::resolveHostInterfaces($interfaces);
@@ -1691,10 +1525,10 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 					// Items with no interfaces must collect interface data from host.
 					foreach ($interfaces as $interface) {
 						$hostid = $interface['hostid'];
-						$priority = $this->interfacePriorities[$interface['type']];
+						$priority = self::interfacePriorities[$interface['type']];
 
 						if ($interface['main'] == INTERFACE_PRIMARY && (!array_key_exists($hostid, $interfaces_by_priority)
-								|| $priority > $this->interfacePriorities[$interfaces_by_priority[$hostid]['type']])) {
+								|| $priority > self::interfacePriorities[$interfaces_by_priority[$hostid]['type']])) {
 							$interfaces_by_priority[$hostid] = $interface;
 						}
 					}
@@ -1917,847 +1751,399 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 	}
 
 	/**
-	 * Expand functional macros in given map label.
+	 * Expand functional macros in given map link labels.
 	 *
-	 * @param string $label			label to expand
-	 * @param array  $replaceHosts	list of hosts in order which they appear in trigger expression if trigger label is given,
-	 * or single host when host label is given
+	 * @param array  $links
+	 * @param string $links[]['label']
+	 * @param array  $fields            A mapping between source and destination fields.
 	 *
-	 * @return string
+	 * @return array
 	 */
-	public function resolveMapLabelMacros($label, array $replaceHosts = []) {
-		$pattern = '/(?P<macros>{'.
-				'('.ZBX_PREG_HOST_FORMAT.($replaceHosts
-						? '|({('.self::PATTERN_HOST_INTERNAL.')'.self::PATTERN_MACRO_PARAM.'})' : '').'):'.
-				ZBX_PREG_ITEM_KEY_FORMAT.'\.'.
-				'(last|max|min|avg)\('.
-				'([0-9]+['.ZBX_TIME_SUFFIXES.']?)?'.
-				'\)}{1})/Uux';
-
-		if (preg_match_all($pattern, $label, $matches) !== false && array_key_exists('macros', $matches)) {
-			// $replaceHosts with key '0' is used for macros without reference.
-			if (array_key_exists(0, $replaceHosts)) {
-				$replaceHosts[''] = $replaceHosts[0];
-				unset($replaceHosts[0]);
-			}
-
-			// For each functional macro.
-			foreach ($matches['macros'] as $expr) {
-				$macro = $expr;
-
-				// Search for macros with all possible indexes.
-				foreach ($replaceHosts as $i => $host) {
-					$macroTmp = $macro;
-
-					// Replace only macro in first position.
-					$macro = preg_replace('/{({HOSTNAME'.$i.'}|{HOST\.HOST'.$i.'}):(.*)}/U',
-							'{'.$host['host'].':$2}', $macro
-					);
+	public function resolveMapLinkLabelMacros(array $links, array $fields): array {
+		$types = ['expr_macros' => true];
+		$macros = ['expr_macros' => []];
+		$macro_values = [];
 
-					// Only one simple macro possible inside functional macro.
-					if ($macro !== $macroTmp) {
-						break;
-					}
-				}
+		foreach ($links as $link) {
+			$matched_macros = self::extractMacros(array_intersect_key($link, $fields), $types);
 
-				// Try to create valid expression.
-				$expressionData = new C10TriggerExpression();
+			foreach ($matched_macros['expr_macros'] as $macro => $data) {
+				$macro_values[$macro] = UNRESOLVED_MACRO_STRING;
+			}
+			$macros['expr_macros'] += $matched_macros['expr_macros'];
+		}
 
-				if (!$expressionData->parse($macro) || !isset($expressionData->expressions[0])) {
-					continue;
-				}
+		$macro_values = self::getExpressionMacros($macros['expr_macros'], $macro_values);
 
-				// Look in DB for corresponding item.
-				$itemHost = $expressionData->expressions[0]['host'];
-				$key = $expressionData->expressions[0]['item'];
-				$function = $expressionData->expressions[0]['functionName'];
-				$options = [
-					'output' => ['itemid', 'value_type', 'units', 'lastvalue', 'lastclock'],
-					'webitems' => true,
-					'filter' => [
-						'host' => $itemHost,
-						'key_' => $key
-					]
-				];
+		foreach ($links as &$link) {
+			foreach ($fields as $from => $to) {
+				$link[$to] = strtr($link[$from], $macro_values);
+			}
+		}
+		unset($link);
 
-				if ($function === 'last') {
-					$options['selectValueMap'] = ['mappings'];
-				}
+		return $links;
+	}
 
-				$item = API::Item()->get($options);
+	/**
+	 * Expand functional macros in given map shape labels.
+	 *
+	 * @param string $map_name
+	 * @param array  $shapes
+	 * @param string $shapes[]['text']
+	 * @param array  $fields            A mapping between source and destination fields.
+	 *
+	 * @return array
+	 */
+	public function resolveMapShapeLabelMacros(string $map_name, array $shapes, array $fields): array {
+		$types = [
+			'macros' => [
+				'map' => ['{MAP.NAME}']
+			],
+			'expr_macros' => true
+		];
+		$macros = ['expr_macros' => []];
+		$macro_values = [];
 
-				$item = reset($item);
+		foreach ($shapes as $shape) {
+			$matched_macros = self::extractMacros(array_intersect_key($shape, $fields), $types);
 
-				// If no corresponding item found with functional macro key and host.
-				if (!$item) {
-					$label = str_replace($expr, UNRESOLVED_MACRO_STRING, $label);
+			foreach ($matched_macros['macros']['map'] as $macro) {
+				$macro_values[$macro] = $map_name;
+			}
 
-					continue;
-				}
+			foreach ($matched_macros['expr_macros'] as $macro => $data) {
+				$macro_values[$macro] = UNRESOLVED_MACRO_STRING;
+			}
+			$macros['expr_macros'] += $matched_macros['expr_macros'];
+		}
 
-				// Do function type (last, min, max, avg) related actions.
-				if ($function === 'last') {
-					$value = $item['lastclock']
-						? formatHistoryValue($item['lastvalue'], $item)
-						: UNRESOLVED_MACRO_STRING;
-				}
-				else {
-					$value = getItemFunctionalValue($item, $function,
-						$expressionData->expressions[0]['functionParamList'][0]
-					);
-				}
+		$macro_values = self::getExpressionMacros($macros['expr_macros'], $macro_values);
 
-				if (isset($value)) {
-					$label = str_replace($expr, $value, $label);
-				}
+		foreach ($shapes as &$shape) {
+			foreach ($fields as $from => $to) {
+				$shape[$to] = strtr($shape[$from], $macro_values);
 			}
 		}
+		unset($shape);
 
-		return $label;
+		return $shapes;
 	}
 
 	/**
 	 * Resolve supported macros used in map element label as well as in URL names and values.
 	 *
 	 * @param array        $selements[]
-	 * @param int          $selements[]['elementtype']          Map element type.
-	 * @param int          $selements[]['elementsubtype']       Map element subtype.
-	 * @param string       $selements[]['label']                Map element label.
-	 * @param array        $selements[]['urls']                 Map element urls.
-	 * @param string       $selements[]['urls'][]['name']       Map element url name.
-	 * @param string       $selements[]['urls'][]['url']        Map element url value.
-	 * @param int | array  $selements[]['elementid']            Element id linked to map element.
+	 * @param int          $selements[]['elementtype']
+	 * @param int          $selements[]['elementsubtype']
+	 * @param string       $selements[]['label']
+	 * @param array        $selements[]['urls']
+	 * @param string       $selements[]['urls'][]['name']
+	 * @param string       $selements[]['urls'][]['url']
+	 * @param int | array  $selements[]['elementid']
 	 * @param array        $options
-	 * @param bool         $options[resolve_element_label]      Resolve macros in map element label.
-	 * @param bool         $options[resolve_element_urls]       Resolve macros in map element url name and value.
+	 * @param bool         $options[resolve_element_label]  Resolve macros in map element label.
+	 * @param bool         $options[resolve_element_urls]   Resolve macros in map element url name and value.
 	 *
 	 * @return array
 	 */
 	public function resolveMacrosInMapElements(array $selements, array $options) {
 		$options += ['resolve_element_label' => false, 'resolve_element_urls' => false];
 
-		$supported_inventory_macros = $this->getSupportedHostInventoryMacrosMap();
+		$field_types = [];
+		if ($options['resolve_element_label']) {
+			$field_types[] = 'label';
+		}
+		if ($options['resolve_element_urls']) {
+			$field_types[] = 'urls';
+		}
 
-		// Macros supported by location.
-		$supported_macros = [
-			'host' => [
-				'label' => ['{HOSTNAME}', '{HOST.ID}', '{HOST.NAME}', '{HOST.HOST}', '{HOST.DESCRIPTION}'],
-				'urls' => ['{HOSTNAME}', '{HOST.ID}', '{HOST.NAME}', '{HOST.HOST}']
-			],
-			'map' => [
-				'label' => ['{MAP.ID}', '{MAP.NAME}'],
-				'urls' => ['{MAP.ID}', '{MAP.NAME}']
-			],
-			'trigger' => [
-				'label' => ['{TRIGGER.ID}'],
-				'urls' => ['{TRIGGER.ID}']
-			],
-			'triggers' => [
-				'label' => [
-					'{TRIGGER.EVENTS.ACK}', '{TRIGGER.EVENTS.PROBLEM.ACK}', '{TRIGGER.EVENTS.PROBLEM.UNACK}',
-					'{TRIGGER.EVENTS.UNACK}', '{TRIGGER.PROBLEM.EVENTS.PROBLEM.ACK}',
-					'{TRIGGER.PROBLEM.EVENTS.PROBLEM.UNACK}', '{TRIGGERS.UNACK}',
-					'{TRIGGERS.PROBLEM.UNACK}', '{TRIGGERS.ACK}', '{TRIGGERS.PROBLEM.ACK}'
-				]
-			],
-			'hostgroup' => [
-				'label' => ['{HOSTGROUP.ID}'],
-				'urls' => ['{HOSTGROUP.ID}']
-			],
-			'interface' => [
-				'label' => ['{IPADDRESS}', '{HOST.IP}', '{HOST.DNS}', '{HOST.CONN}'],
-				'urls' => ['{IPADDRESS}', '{HOST.IP}', '{HOST.DNS}', '{HOST.CONN}']
-			],
-			'inventory' => [
-				'label' => array_keys($supported_inventory_macros),
-				'urls' => array_keys($supported_inventory_macros)
-			]
+		$macro_values = [];
+		$macros = ['map' => [], 'triggers' => [], 'host' => [], 'interface' => [], 'inventory' => [], 'host_n' => [],
+			'interface_n' => [], 'inventory_n' => [], 'expr_macros' => [], 'expr_macros_host' => [],
+			'expr_macros_host_n' => []
 		];
 
-		// Define what macros are supported for each type of map elements.
-		$types_by_selement_type = [
-			SYSMAP_ELEMENT_TYPE_MAP => [
-				'macros' => [
-					'map' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['map']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['map']['urls'] : []
-					],
-					'triggers' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['triggers']['label'] : []
+		$inventory_macros = self::getSupportedHostInventoryMacrosMap();
+
+		$types_by_elementtype = [
+			'label' => [
+				SYSMAP_ELEMENT_TYPE_IMAGE => [
+					'expr_macros' => true
+				],
+				SYSMAP_ELEMENT_TYPE_MAP => [
+					'expr_macros' => true,
+					'macros' => [
+						'map' => ['{MAP.ID}', '{MAP.NAME}'],
+						'triggers' => self::aggr_triggers_macros
 					]
-				]
-			],
-			SYSMAP_ELEMENT_TYPE_HOST_GROUP => [
-				'macros' => [
-					'hostgroup' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['hostgroup']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['hostgroup']['urls'] : []
-					],
-					'triggers' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['triggers']['label'] : []
+				],
+				SYSMAP_ELEMENT_TYPE_HOST_GROUP => [
+					'expr_macros' => true,
+					'macros' => [
+						'hostgroup' => ['{HOSTGROUP.ID}'],
+						'triggers' => self::aggr_triggers_macros
 					]
-				]
-			],
-			SYSMAP_ELEMENT_TYPE_HOST => [
-				'macros' => [
-					'host' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['host']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['host']['urls'] : []
-					],
-					'triggers' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['triggers']['label'] : []
-					],
-					'interface' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['interface']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['interface']['urls'] : []
+				],
+				SYSMAP_ELEMENT_TYPE_HOST => [
+					'expr_macros_host' => true,
+					'macros' => [
+						'host' => ['{HOSTNAME}', '{HOST.ID}', '{HOST.NAME}', '{HOST.HOST}', '{HOST.DESCRIPTION}'],
+						'interface' => ['{IPADDRESS}', '{HOST.IP}', '{HOST.DNS}', '{HOST.CONN}'],
+						'inventory' => array_keys($inventory_macros),
+						'triggers' => self::aggr_triggers_macros
+					]
+				],
+				SYSMAP_ELEMENT_TYPE_TRIGGER => [
+					'expr_macros_host_n' => true,
+					'macros' => [
+						'trigger' => ['{TRIGGER.ID}'],
+						'triggers' => self::aggr_triggers_macros
 					],
-					'inventory' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['inventory']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['inventory']['urls'] : []
+					'macros_n' => [
+						'host' => ['{HOSTNAME}', '{HOST.ID}', '{HOST.NAME}', '{HOST.HOST}', '{HOST.DESCRIPTION}'],
+						'interface' => ['{IPADDRESS}', '{HOST.IP}', '{HOST.DNS}', '{HOST.CONN}'],
+						'inventory' => array_keys($inventory_macros)
 					]
 				]
 			],
-			SYSMAP_ELEMENT_TYPE_TRIGGER => [
-				'macros' => [
-					'trigger' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['trigger']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['trigger']['urls'] : []
-					],
-					'triggers' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['triggers']['label'] : []
+			'urls' => [
+				SYSMAP_ELEMENT_TYPE_MAP => [
+					'macros' => [
+						'map' => ['{MAP.ID}', '{MAP.NAME}']
 					]
 				],
-				'macros_n' => [
-					'host' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['host']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['host']['urls'] : []
-					],
-					'interface' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['interface']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['interface']['urls'] : []
+				SYSMAP_ELEMENT_TYPE_HOST_GROUP => [
+					'macros' => [
+						'hostgroup' => ['{HOSTGROUP.ID}']
+					]
+				],
+				SYSMAP_ELEMENT_TYPE_HOST => [
+					'macros' => [
+						'host' => ['{HOSTNAME}', '{HOST.ID}', '{HOST.NAME}', '{HOST.HOST}'],
+						'interface' => ['{IPADDRESS}', '{HOST.IP}', '{HOST.DNS}', '{HOST.CONN}'],
+						'inventory' => array_keys($inventory_macros)
+					]
+				],
+				SYSMAP_ELEMENT_TYPE_TRIGGER => [
+					'macros' => [
+						'trigger' => ['{TRIGGER.ID}']
 					],
-					'inventory' => [
-						'label' => $options['resolve_element_label'] ? $supported_macros['inventory']['label'] : [],
-						'urls' => $options['resolve_element_urls'] ? $supported_macros['inventory']['urls'] : []
+					'macros_n' => [
+						'host' => ['{HOSTNAME}', '{HOST.ID}', '{HOST.NAME}', '{HOST.HOST}'],
+						'interface' => ['{IPADDRESS}', '{HOST.IP}', '{HOST.DNS}', '{HOST.CONN}'],
+						'inventory' => array_keys($inventory_macros)
 					]
 				]
 			]
 		];
 
-		$selements_to_resolve = [
-			SYSMAP_ELEMENT_TYPE_HOST => [],
-			SYSMAP_ELEMENT_TYPE_MAP => [],
-			SYSMAP_ELEMENT_TYPE_TRIGGER => []
-		];
-
-		$elementid_field_by_type = [
-			SYSMAP_ELEMENT_TYPE_HOST => 'hostid',
-			SYSMAP_ELEMENT_TYPE_MAP => 'sysmapid',
-			SYSMAP_ELEMENT_TYPE_TRIGGER => 'triggerid',
-			SYSMAP_ELEMENT_TYPE_HOST_GROUP => 'groupid'
-		];
-
-		$supported_label_macros = [];
-		$supported_urls_macros = [];
-		$itemids_by_functionids = [];
-		$hosts_by_itemids = [];
-		$query_interfaces = false;
-		$query_inventories = false;
-		$query_trigger_hosts = false;
-		$triggers = [];
-		$maps = [];
-		$hosts = [];
-		$macros_by_selementid = [];
-
-		foreach ($types_by_selement_type as $selement_type => &$types) {
-			$supported_label_macros[$selement_type] = [];
-			$supported_urls_macros[$selement_type] = [];
-
-			foreach ($types as $macros_type_key => $supported_macros_types) {
-				if (!array_key_exists($macros_type_key, $supported_label_macros[$selement_type])) {
-					$supported_label_macros[$selement_type][$macros_type_key] = [];
-				}
-				if (!array_key_exists($macros_type_key, $supported_urls_macros[$selement_type])) {
-					$supported_urls_macros[$selement_type][$macros_type_key] = [];
-				}
-
-				foreach ($supported_macros_types as $macros_supported) {
-					if (array_key_exists('label', $macros_supported)) {
-						$supported_label_macros[$selement_type][$macros_type_key] = array_merge(
-							$supported_label_macros[$selement_type][$macros_type_key], $macros_supported['label']
-						);
-					}
-
-					if (array_key_exists('urls', $macros_supported)) {
-						$supported_urls_macros[$selement_type][$macros_type_key] = array_merge(
-							$supported_urls_macros[$selement_type][$macros_type_key], $macros_supported['urls']
-						);
-					}
-				}
-			}
-
-			foreach ($types as &$macro_types) {
-				$macro_types = array_map(function($macros_by_location) {
-					return array_keys(array_flip(call_user_func_array('array_merge', $macros_by_location)));
-				}, $macro_types);
-			}
-			unset($macro_types);
-		}
-		unset($types);
-
-		foreach ($selements as $selid => $sel) {
-			$selement_type = ($sel['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST_GROUP
-					&& $sel['elementsubtype'] == SYSMAP_ELEMENT_SUBTYPE_HOST_GROUP_ELEMENTS)
+		foreach ($selements as $key => $selement) {
+			$elementtype = ($selement['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST_GROUP
+					&& $selement['elementsubtype'] == SYSMAP_ELEMENT_SUBTYPE_HOST_GROUP_ELEMENTS)
 				? SYSMAP_ELEMENT_TYPE_HOST
-				: $sel['elementtype'];
-
-			if (!array_key_exists($selement_type, $types_by_selement_type)) {
-				continue;
-			}
+				: $selement['elementtype'];
 
-			// Collect strings to test for macros.
-			$texts = $options['resolve_element_label'] ? [$sel['label']] : [];
-			if ($options['resolve_element_urls']) {
-				foreach ($sel['urls'] as $url) {
-					$texts[] = $url['name'];
-					$texts[] = $url['url'];
+			foreach ($field_types as $field_type) {
+				if (!array_key_exists($elementtype, $types_by_elementtype[$field_type])) {
+					continue;
 				}
-			}
 
-			if (!$texts) {
-				continue;
-			}
-
-			// Extract macros from collected strings.
-			$matched_macros = self::extractMacros($texts, $types_by_selement_type[$selement_type]);
-
-			// Map extracted macros to map elements.
-			if (array_key_exists('macros', $matched_macros)) {
-				// Check if inventory or interface details was requested.
-				if ($selement_type == SYSMAP_ELEMENT_TYPE_HOST) {
-					if ($matched_macros['macros']['interface']) {
-						$query_interfaces = true;
-					}
-
-					if ($matched_macros['macros']['inventory']) {
-						$query_inventories = true;
-					}
+				$texts = [];
+				if ($field_type === 'label') {
+					$texts[] = $selement['label'];
 				}
-
-				foreach ($matched_macros['macros'] as $macros) {
-					foreach ($macros as $macro) {
-						$macros_by_selementid[$selid][$macro] = [
-							'macro' => substr($macro, 1, -1), // strip curly braces
-							'f_num' => 0
-						];
+				if ($field_type === 'urls') {
+					foreach ($selement['urls'] as $url) {
+						$texts[] = $url['name'];
+						$texts[] = $url['url'];
 					}
 				}
-			}
-
-			// Do the same with indexed macros.
-			if (array_key_exists('macros_n', $matched_macros)) {
-				if (!array_key_exists($selid, $macros_by_selementid)) {
-					$macros_by_selementid[$selid] = [];
-				}
 
-				foreach ($matched_macros['macros_n'] as $macro) {
-					$macros_by_selementid[$selid] += $macro;
-				}
-
-				// Check if inventory or interface details was requested.
-				if ($selement_type == SYSMAP_ELEMENT_TYPE_TRIGGER) {
-					if ($matched_macros['macros_n']['interface']) {
-						$query_trigger_hosts = true;
-						$query_interfaces = true;
-					}
+				// Extract macros from collected strings.
+				$matched_macros = self::extractMacros($texts, $types_by_elementtype[$field_type][$elementtype]);
 
-					if ($matched_macros['macros_n']['inventory']) {
-						$query_trigger_hosts = true;
-						$query_inventories = true;
-					}
+				if (array_key_exists('macros', $matched_macros)) {
+					if (array_key_exists('map', $matched_macros['macros'])) {
+						foreach ($matched_macros['macros']['map'] as $macro) {
+							switch ($macro) {
+								case '{MAP.ID}':
+									$macro_values[$key][$macro] = $selement['elements'][0]['sysmapid'];
+									break;
 
-					if ($matched_macros['macros_n']['host']) {
-						$query_trigger_hosts = true;
+								default:
+									$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+									$macros['map'][$selement['elements'][0]['sysmapid']][$key] = true;
+							}
+						}
 					}
-				}
-			}
-
-			/*
-			 * If macros are found, put elementid to list of elements to fetch API.
-			 * Since only supported host-group macro is {HOSTGROUP.ID}, it's useless to collect host group id-s in order
-			 * to fetch additional details from database.
-			 */
-			if ($sel['elementtype'] != SYSMAP_ELEMENT_TYPE_HOST_GROUP && array_key_exists($selid, $macros_by_selementid)
-					&& $macros_by_selementid[$selid]) {
-				if (array_key_exists('elementid', $sel)) {
-					$selements_to_resolve[$sel['elementtype']][$sel['elementid']] = $sel['elementid'];
-				}
-				elseif (($element = reset($sel['elements'])) !== false) {
-					$elementid = $element[$elementid_field_by_type[$sel['elementtype']]];
-					$selements_to_resolve[$sel['elementtype']][$elementid] = $elementid;
-				}
-			}
-		}
-
-		// Query details about resolvable maps.
-		if ($selements_to_resolve[SYSMAP_ELEMENT_TYPE_MAP]) {
-			$maps = API::Map()->get([
-				'output' => ['sysmapid', 'name'],
-				'sysmapids' => $selements_to_resolve[SYSMAP_ELEMENT_TYPE_MAP],
-				'preservekeys' => true
-			]);
-		}
-
-		// Get details about resolvable triggers.
-		if ($selements_to_resolve[SYSMAP_ELEMENT_TYPE_TRIGGER]) {
-			$triggers = API::Trigger()->get([
-				'output' => ['expression'],
-				'triggerids' => $selements_to_resolve[SYSMAP_ELEMENT_TYPE_TRIGGER],
-				'selectFunctions' => ['functionid', 'itemid'],
-				'selectItems' => ['itemid', 'hostid'],
-				'preservekeys' => true
-			]);
 
-			foreach ($triggers as $trigger) {
-				foreach ($trigger['items'] as $item) {
-					$hosts_by_itemids[$item['itemid']] = $item['hostid'];
-
-					if ($query_trigger_hosts) {
-						$selements_to_resolve[SYSMAP_ELEMENT_TYPE_HOST][$item['hostid']] = $item['hostid'];
+					if (array_key_exists('triggers', $matched_macros['macros'])) {
+						foreach ($matched_macros['macros']['triggers'] as $macro) {
+							$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+							$macros['triggers'][$key] = true;
+						}
 					}
-				}
-				foreach ($trigger['functions'] as $fn) {
-					$itemids_by_functionids[$fn['functionid']] = $fn['itemid'];
-				}
-			}
-		}
-
-		// Query details about resolvable hosts.
-		if ($selements_to_resolve[SYSMAP_ELEMENT_TYPE_HOST]) {
-			$hosts = API::Host()->get([
-				'output' => $query_inventories
-					? ['host', 'name', 'description', 'inventory_mode']
-					: ['host', 'name', 'description'],
-				'hostids' => $selements_to_resolve[SYSMAP_ELEMENT_TYPE_HOST],
-				'selectInterfaces' => $query_interfaces ? ['main', 'type', 'useip', 'ip', 'dns'] : null,
-				'selectInventory' => $query_inventories ? API_OUTPUT_EXTEND : null,
-				'preservekeys' => true
-			]);
 
-			// Find highest priority interface from available.
-			if ($query_interfaces) {
-				foreach ($hosts as &$host) {
-					$top_priority_interface = null;
-					$tmp_priority = 0;
-
-					foreach ($host['interfaces'] as $interface) {
-						if ($interface['main'] == INTERFACE_PRIMARY
-								&& $this->interfacePriorities[$interface['type']] > $tmp_priority) {
-							$tmp_priority = $this->interfacePriorities[$interface['type']];
-							$top_priority_interface = [
-								'conn' => $interface['useip'] ? $interface['ip'] : $interface['dns'],
-								'ip' => $interface['ip'],
-								'dns' => $interface['dns']
-							];
+					if (array_key_exists('hostgroup', $matched_macros['macros'])) {
+						foreach ($matched_macros['macros']['hostgroup'] as $macro) {
+							$macro_values[$key][$macro] = $selement['elements'][0]['groupid'];
 						}
 					}
 
-					$host['interface'] = $top_priority_interface;
-					unset($host['interfaces']);
-				}
-				unset($host);
-			}
-		}
-
-		foreach ($types_by_selement_type as &$types) {
-			$types = $this->transformToPositionTypes($types);
-		}
-		unset($types);
-
-		// Find value for each extracted macro.
-		foreach ($selements as $selid => &$sel) {
-			if (!array_key_exists($selid, $macros_by_selementid) || !$macros_by_selementid[$selid]) {
-				// Resolve functional macros like: {sampleHostName:log[{HOST.HOST}.log].last(0)}, if no host provided.
-				if ($options['resolve_element_label']) {
-					$sel['label'] = $this->resolveMapLabelMacros($sel['label']);
-				}
-
-				// Continue since there is nothing more to resolve.
-				continue;
-			}
-
-			$selement_type = ($sel['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST_GROUP
-					&& $sel['elementsubtype'] == SYSMAP_ELEMENT_SUBTYPE_HOST_GROUP_ELEMENTS)
-				? SYSMAP_ELEMENT_TYPE_HOST
-				: $sel['elementtype'];
-
-			// Get element id.
-			if (array_key_exists('elementid', $sel)) {
-				$elementid = $sel['elementid'];
-			}
-			elseif (($element = reset($sel['elements'])) !== false) {
-				$elementid = $element[$elementid_field_by_type[$sel['elementtype']]];
-			}
-			else {
-				continue;
-			}
-
-			$matched_macros = $macros_by_selementid[$selid];
-			$hosts_by_nr = [];
-			$trigger = null;
-			$host = null;
-			$map = null;
-			$hostgroup = null;
-
-			switch ($sel['elementtype']) {
-				case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
-					$hostgroup = [
-						'hostgroupid' => $elementid
-					];
-					break;
-
-				case SYSMAP_ELEMENT_TYPE_TRIGGER:
-					if (array_key_exists($elementid, $triggers)) {
-						$trigger = $triggers[$elementid];
-
-						/**
-						 * Get all function ids from expression and link host data against position in expression.
-						 *
-						 * Warning: although 'usermacros' and 'macros' are not used, they still are mandatory here to
-						 * ensure correct result parsing 'functionids'.
-						 *
-						 * For example, having a trigger like: '{host:item.change()}=1 or {$MACRO: "{1234} ..."}' gives
-						 * incorrect result of 'functionids' without requesting to parse macros and user macros as well.
-						 */
-						$matched_functionids = self::extractMacros([$trigger['expression']], [
-							'macros' => [
-								'trigger' => ['{TRIGGER.VALUE}']
-							],
-							'functionids' => true,
-							'usermacros' => true
-						]);
-
-						foreach (array_keys($matched_functionids['functionids']) as $functionid) {
-							$functionid = substr($functionid, 1, -1); // strip curly braces
-							$itemid = $itemids_by_functionids[$functionid];
-							$hostid = $hosts_by_itemids[$itemid];
-
-							if (array_key_exists($hostid, $hosts)) {
-								$hosts_by_nr[count($hosts_by_nr) + 1] = $hosts[$hostid];
+					if (array_key_exists('host', $matched_macros['macros'])) {
+						foreach ($matched_macros['macros']['host'] as $macro) {
+							if (array_key_exists('hostid', $selement['elements'][0])) {
+								switch ($macro) {
+									case '{HOST.ID}':
+										$macro_values[$key][$macro] = $selement['elements'][0]['hostid'];
+										break;
+
+									default:
+										$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+										$macros['host'][$selement['elements'][0]['hostid']][$key] = true;
+								}
+							}
+							else {
+								$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
 							}
 						}
+					}
 
-						// Add host reference for macro without numeric index.
-						if (array_key_exists(1, $hosts_by_nr)) {
-							$hosts_by_nr[0] = $hosts_by_nr[1];
+					if (array_key_exists('interface', $matched_macros['macros'])) {
+						foreach ($matched_macros['macros']['interface'] as $macro) {
+							$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+							if (array_key_exists('hostid', $selement['elements'][0])) {
+								$macros['interface'][$selement['elements'][0]['hostid']][$key] = true;
+							}
 						}
 					}
-					break;
 
-				case SYSMAP_ELEMENT_TYPE_MAP:
-					if (array_key_exists($elementid, $maps)) {
-						$map = $maps[$elementid];
+					if (array_key_exists('inventory', $matched_macros['macros'])) {
+						foreach ($matched_macros['macros']['inventory'] as $macro) {
+							$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+							if (array_key_exists('hostid', $selement['elements'][0])) {
+								$macros['inventory'][$selement['elements'][0]['hostid']][$key] = true;
+							}
+						}
 					}
-					break;
 
-				case SYSMAP_ELEMENT_TYPE_HOST:
-					if (array_key_exists($elementid, $hosts)) {
-						$host = $hosts[$elementid];
-						$hosts_by_nr = [0 => $host];
+					if (array_key_exists('trigger', $matched_macros['macros'])) {
+						foreach ($matched_macros['macros']['trigger'] as $macro) {
+							$macro_values[$key][$macro] = $selement['elements'][0]['triggerid'];
+						}
 					}
-					break;
-			}
-
-			foreach ($matched_macros as &$matched_macro) {
-				// Since trigger elements support indexed macros, $host must be rewritten with n-th host.
-				if ($sel['elementtype'] == SYSMAP_ELEMENT_TYPE_TRIGGER) {
-					$host = array_key_exists($matched_macro['f_num'], $hosts_by_nr)
-						? $hosts_by_nr[$matched_macro['f_num']]
-						: null;
 				}
 
-				switch ($matched_macro['macro']) {
-					case 'HOSTNAME': // deprecated
-					case 'HOST.NAME':
-						if ($host) {
-							$matched_macro['value'] = $host['name'];
-						}
-						break;
-
-					case 'HOST.ID':
-						if ($host) {
-							$matched_macro['value'] = $host['hostid'];
-						}
-						break;
-
-					case 'HOST.HOST':
-						if ($host) {
-							$matched_macro['value'] = $host['host'];
-						}
-						break;
-
-					case 'HOST.DESCRIPTION':
-						if ($host) {
-							$matched_macro['value'] = $host['description'];
+				if (array_key_exists('macros_n', $matched_macros)) {
+					if (array_key_exists('host', $matched_macros['macros_n'])) {
+						foreach ($matched_macros['macros_n']['host'] as $macro => $data) {
+							$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+							$macros['host_n'][$selement['elements'][0]['triggerid']][$key][$macro] = $data;
 						}
-						break;
+					}
 
-					case 'MAP.ID':
-						if ($map) {
-							$matched_macro['value'] = $map['sysmapid'];
+					if (array_key_exists('interface', $matched_macros['macros_n'])) {
+						foreach ($matched_macros['macros_n']['interface'] as $macro => $data) {
+							$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+							$macros['interface_n'][$selement['elements'][0]['triggerid']][$key][$macro] = $data;
 						}
-						break;
+					}
 
-					case 'MAP.NAME':
-						if ($map) {
-							$matched_macro['value'] = $map['name'];
+					if (array_key_exists('inventory', $matched_macros['macros_n'])) {
+						foreach ($matched_macros['macros_n']['inventory'] as $macro => $data) {
+							$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+							$macros['inventory_n'][$selement['elements'][0]['triggerid']][$key][$macro] = $data;
 						}
-						break;
+					}
+				}
 
-					case 'HOSTGROUP.ID':
-						if ($hostgroup) {
-							$matched_macro['value'] = $hostgroup['hostgroupid'];
-						}
-						break;
+				if (array_key_exists('expr_macros', $matched_macros)) {
+					foreach ($matched_macros['expr_macros'] as $macro => $data) {
+						$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
 
-					case 'HOST.IP':
-					case 'IPADDRESS': // deprecated
-						if ($host && $host['interface']) {
-							$matched_macro['value'] = $host['interface']['ip'];
+						if (!array_key_exists($macro, $macros['expr_macros'])) {
+							$macros['expr_macros'][$macro] = $data;
 						}
-						break;
+						$macros['expr_macros'][$macro]['links'][$macro][] = $key;
+					}
+				}
 
-					case 'HOST.DNS':
-						if ($host && $host['interface']) {
-							$matched_macro['value'] = $host['interface']['dns'];
+				if (array_key_exists('expr_macros_host', $matched_macros)) {
+					foreach ($matched_macros['expr_macros_host'] as $macro => $data) {
+						$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+						if ($data['host'] === '' || $data['host'][0] === '{') {
+							if (array_key_exists('hostid', $selement['elements'][0])) {
+								$macros['expr_macros_host'][$selement['elements'][0]['hostid']][$key][$macro] = $data;
+							}
 						}
-						break;
-
-					case 'HOST.CONN':
-						if ($host && $host['interface']) {
-							$matched_macro['value'] = $host['interface']['conn'];
+						else {
+							if (!array_key_exists($macro, $macros['expr_macros'])) {
+								$macros['expr_macros'][$macro] = $data;
+							}
+							$macros['expr_macros'][$macro]['links'][$macro][] = $key;
 						}
-						break;
-
-					case 'TRIGGER.EVENTS.ACK':
-						$matched_macro['value'] = get_events_unacknowledged($sel, null, null, true);
-						break;
-
-					case 'TRIGGER.EVENTS.PROBLEM.ACK':
-						$matched_macro['value'] = get_events_unacknowledged($sel, null, TRIGGER_VALUE_TRUE, true);
-						break;
-
-					case 'TRIGGER.EVENTS.PROBLEM.UNACK':
-						$matched_macro['value'] = get_events_unacknowledged($sel, null, TRIGGER_VALUE_TRUE);
-						break;
-
-					case 'TRIGGER.EVENTS.UNACK':
-						$matched_macro['value'] = get_events_unacknowledged($sel);
-						break;
-
-					case 'TRIGGER.PROBLEM.EVENTS.PROBLEM.ACK':
-						$matched_macro['value'] = get_events_unacknowledged($sel, TRIGGER_VALUE_TRUE, TRIGGER_VALUE_TRUE, true);
-						break;
-
-					case 'TRIGGER.PROBLEM.EVENTS.PROBLEM.UNACK':
-						$matched_macro['value'] = get_events_unacknowledged($sel, TRIGGER_VALUE_TRUE, TRIGGER_VALUE_TRUE);
-						break;
+					}
+				}
 
-					case 'TRIGGER.ID':
-						if ($trigger) {
-							$matched_macro['value'] = $trigger['triggerid'];
+				if (array_key_exists('expr_macros_host_n', $matched_macros)) {
+					foreach ($matched_macros['expr_macros_host_n'] as $macro => $data) {
+						$macro_values[$key][$macro] = UNRESOLVED_MACRO_STRING;
+						if ($data['host'] === '' || $data['host'][0] === '{') {
+							$macros['expr_macros_host_n'][$selement['elements'][0]['triggerid']][$key][$macro] = $data;
 						}
-						break;
-
-					case 'TRIGGERS.UNACK':
-						$matched_macro['value'] = get_triggers_unacknowledged($sel);
-						break;
-
-					case 'TRIGGERS.PROBLEM.UNACK':
-						$matched_macro['value'] = get_triggers_unacknowledged($sel, true);
-						break;
-
-					case 'TRIGGERS.ACK':
-						$matched_macro['value'] = get_triggers_unacknowledged($sel, null, true);
-						break;
-
-					case 'TRIGGERS.PROBLEM.ACK':
-						$matched_macro['value'] = get_triggers_unacknowledged($sel, true, true);
-						break;
-
-					default:
-						// Inventories:
-						if (array_key_exists('{'.$matched_macro['macro'].'}', $supported_inventory_macros) && $host
-								&& $host['inventory_mode'] != HOST_INVENTORY_DISABLED) {
-							$matched_macro['value']
-								= $host['inventory'][$supported_inventory_macros['{'.$matched_macro['macro'].'}']];
+						else {
+							if (!array_key_exists($macro, $macros['expr_macros'])) {
+								$macros['expr_macros'][$macro] = $data;
+							}
+							$macros['expr_macros'][$macro]['links'][$macro][] = $key;
 						}
-						break;
+					}
 				}
 			}
-			unset($matched_macro);
+		}
 
-			// Replace macros in selement label.
-			if ($options['resolve_element_label']) {
-				// Subtract unsupported macros from $types.
-				$types = $types_by_selement_type[$selement_type];
-				foreach (['macros', 'macros_n'] as $macros_type_key) {
-					if (array_key_exists($macros_type_key, $types)
-							&& array_key_exists($macros_type_key, $supported_label_macros[$selement_type])) {
-						$types[$macros_type_key] = array_intersect($types[$macros_type_key],
-							$supported_label_macros[$selement_type][$macros_type_key]
-						);
+		$macro_values = self::getMapMacros($macros['map'], $macro_values);
+		$macro_values = self::getAggrTriggerMacros($macros['triggers'], $macro_values, $selements);
+		$macro_values = self::getHostMacrosByHostId($macros['host'], $macro_values);
+		$macro_values = self::getInterfaceMacrosByHostId($macros['interface'], $macro_values);
+		$macro_values = self::getInventoryMacrosByHostId($macros['inventory'], $macro_values);
 
-						if (!$types[$macros_type_key]) {
-							unset($types[$macros_type_key]);
-						}
-					}
-				}
+		$trigger_hosts_by_f_num = self::getExpressionHosts(
+			array_keys($macros['host_n'] + $macros['interface_n'] + $macros['inventory_n'])
+		);
+		$macro_values = self::getHostNMacros($macros['host_n'], $macro_values, $trigger_hosts_by_f_num);
+		$macro_values = self::getInterfaceNMacros($macros['interface_n'], $macro_values, $trigger_hosts_by_f_num);
+		$macro_values = self::getInventoryNMacros($macros['inventory_n'], $macro_values, $trigger_hosts_by_f_num);
 
-				// Resolve functional macros like: {{HOST.HOST}:log[{HOST.HOST}.log].last(0)}.
-				$sel['label'] = $this->resolveMapLabelMacros($sel['label'], $hosts_by_nr);
+		$macro_values = self::getExpressionNMacros($macros['expr_macros_host_n'], $macros['expr_macros_host'],
+			$macros['expr_macros'], $macro_values
+		);
 
-				// Replace macros by resolved values in selement label.
-				$macros_position = $this->getMacroPositions($sel['label'], $types);
-				foreach (array_reverse($macros_position, true) as $pos => $macro) {
-					$value = array_key_exists('value', $matched_macros[$macro])
-						? $matched_macros[$macro]['value']
-						: UNRESOLVED_MACRO_STRING;
-					$sel['label'] = substr_replace($sel['label'], $value, $pos, strlen($macro));
-				}
+		foreach ($selements as $key => &$selement) {
+			if (!array_key_exists($key, $macro_values)) {
+				continue;
 			}
 
-			// Replace macros in selement URLs.
-			if ($options['resolve_element_urls']) {
-				// Subtract unsupported macros from $types.
-				$types = $types_by_selement_type[$selement_type];
-				foreach (['macros', 'macros_n'] as $macros_type_key) {
-					if (array_key_exists($macros_type_key, $types)
-							&& array_key_exists($macros_type_key, $supported_urls_macros[$selement_type])) {
-						$types[$macros_type_key] = array_intersect($types[$macros_type_key],
-							$supported_urls_macros[$selement_type][$macros_type_key]
-						);
-
-						if (!$types[$macros_type_key]) {
-							unset($types[$macros_type_key]);
-						}
-					}
+			foreach ($field_types as $field_type) {
+				if ($field_type === 'label') {
+					$selement['label'] = strtr($selement['label'], $macro_values[$key]);
 				}
-
-				foreach ($sel['urls'] as &$url) {
-					foreach (['name', 'url'] as $url_field) {
-						$macros_position = $this->getMacroPositions($url[$url_field], $types);
-						foreach (array_reverse($macros_position, true) as $pos => $macro) {
-							$value = array_key_exists('value', $matched_macros[$macro])
-								? $matched_macros[$macro]['value']
-								: UNRESOLVED_MACRO_STRING;
-
-							$url[$url_field] = substr_replace($url[$url_field], $value, $pos, strlen($macro));
-						}
+				else {
+					foreach ($selement['urls'] as &$url) {
+						$url['name'] = strtr($url['name'], $macro_values[$key]);
+						$url['url'] = strtr($url['url'], $macro_values[$key]);
 					}
+					unset($url);
 				}
-				unset($url);
 			}
 		}
-		unset($sel);
+		unset($selement);
 
 		return $selements;
 	}
 
 	/**
-	 * Function returns array holding of inventory macros as a keys and corresponding database fields as value.
-	 *
-	 * @static
-	 *
-	 * @return array
-	 */
-	private static function getSupportedHostInventoryMacrosMap() {
-		return [
-			'{INVENTORY.ALIAS}' => 'alias',
-			'{INVENTORY.ASSET.TAG}' => 'asset_tag',
-			'{INVENTORY.CHASSIS}' => 'chassis',
-			'{INVENTORY.CONTACT}' => 'contact',
-			'{PROFILE.CONTACT}' => 'contact', // deprecated
-			'{INVENTORY.CONTRACT.NUMBER}' => 'contract_number',
-			'{INVENTORY.DEPLOYMENT.STATUS}' => 'deployment_status',
-			'{INVENTORY.HARDWARE}' => 'hardware',
-			'{PROFILE.HARDWARE}' => 'hardware', // deprecated
-			'{INVENTORY.HARDWARE.FULL}' => 'hardware_full',
-			'{INVENTORY.HOST.NETMASK}' => 'host_netmask',
-			'{INVENTORY.HOST.NETWORKS}' => 'host_networks',
-			'{INVENTORY.HOST.ROUTER}' => 'host_router',
-			'{INVENTORY.HW.ARCH}' => 'hw_arch',
-			'{INVENTORY.HW.DATE.DECOMM}' => 'date_hw_decomm',
-			'{INVENTORY.HW.DATE.EXPIRY}' => 'date_hw_expiry',
-			'{INVENTORY.HW.DATE.INSTALL}' => 'date_hw_install',
-			'{INVENTORY.HW.DATE.PURCHASE}' => 'date_hw_purchase',
-			'{INVENTORY.INSTALLER.NAME}' => 'installer_name',
-			'{INVENTORY.LOCATION}' => 'location',
-			'{PROFILE.LOCATION}' => 'location', // deprecated
-			'{INVENTORY.LOCATION.LAT}' => 'location_lat',
-			'{INVENTORY.LOCATION.LON}' => 'location_lon',
-			'{INVENTORY.MACADDRESS.A}' => 'macaddress_a',
-			'{PROFILE.MACADDRESS}' => 'macaddress_a', // deprecated
-			'{INVENTORY.MACADDRESS.B}' => 'macaddress_b',
-			'{INVENTORY.MODEL}' => 'model',
-			'{INVENTORY.NAME}' => 'name',
-			'{PROFILE.NAME}' => 'name', // deprecated
-			'{INVENTORY.NOTES}' => 'notes',
-			'{PROFILE.NOTES}' => 'notes', // deprecated
-			'{INVENTORY.OOB.IP}' => 'oob_ip',
-			'{INVENTORY.OOB.NETMASK}' => 'oob_netmask',
-			'{INVENTORY.OOB.ROUTER}' => 'oob_router',
-			'{INVENTORY.OS}' => 'os',
-			'{PROFILE.OS}' => 'os', // deprecated
-			'{INVENTORY.OS.FULL}' => 'os_full',
-			'{INVENTORY.OS.SHORT}' => 'os_short',
-			'{INVENTORY.POC.PRIMARY.CELL}' => 'poc_1_cell',
-			'{INVENTORY.POC.PRIMARY.EMAIL}' => 'poc_1_email',
-			'{INVENTORY.POC.PRIMARY.NAME}' => 'poc_1_name',
-			'{INVENTORY.POC.PRIMARY.NOTES}' => 'poc_1_notes',
-			'{INVENTORY.POC.PRIMARY.PHONE.A}' => 'poc_1_phone_a',
-			'{INVENTORY.POC.PRIMARY.PHONE.B}' => 'poc_1_phone_b',
-			'{INVENTORY.POC.PRIMARY.SCREEN}' => 'poc_1_screen',
-			'{INVENTORY.POC.SECONDARY.CELL}' => 'poc_2_cell',
-			'{INVENTORY.POC.SECONDARY.EMAIL}' => 'poc_2_email',
-			'{INVENTORY.POC.SECONDARY.NAME}' => 'poc_2_name',
-			'{INVENTORY.POC.SECONDARY.NOTES}' => 'poc_2_notes',
-			'{INVENTORY.POC.SECONDARY.PHONE.A}' => 'poc_2_phone_a',
-			'{INVENTORY.POC.SECONDARY.PHONE.B}' => 'poc_2_phone_b',
-			'{INVENTORY.POC.SECONDARY.SCREEN}' => 'poc_2_screen',
-			'{INVENTORY.SERIALNO.A}' => 'serialno_a',
-			'{PROFILE.SERIALNO}' => 'serialno_a', // deprecated
-			'{INVENTORY.SERIALNO.B}' => 'serialno_b',
-			'{INVENTORY.SITE.ADDRESS.A}' => 'site_address_a',
-			'{INVENTORY.SITE.ADDRESS.B}' => 'site_address_b',
-			'{INVENTORY.SITE.ADDRESS.C}' => 'site_address_c',
-			'{INVENTORY.SITE.CITY}' => 'site_city',
-			'{INVENTORY.SITE.COUNTRY}' => 'site_country',
-			'{INVENTORY.SITE.NOTES}' => 'site_notes',
-			'{INVENTORY.SITE.RACK}' => 'site_rack',
-			'{INVENTORY.SITE.STATE}' => 'site_state',
-			'{INVENTORY.SITE.ZIP}' => 'site_zip',
-			'{INVENTORY.SOFTWARE}' => 'software',
-			'{PROFILE.SOFTWARE}' => 'software', // deprecated
-			'{INVENTORY.SOFTWARE.APP.A}' => 'software_app_a',
-			'{INVENTORY.SOFTWARE.APP.B}' => 'software_app_b',
-			'{INVENTORY.SOFTWARE.APP.C}' => 'software_app_c',
-			'{INVENTORY.SOFTWARE.APP.D}' => 'software_app_d',
-			'{INVENTORY.SOFTWARE.APP.E}' => 'software_app_e',
-			'{INVENTORY.SOFTWARE.FULL}' => 'software_full',
-			'{INVENTORY.TAG}' => 'tag',
-			'{PROFILE.TAG}' => 'tag', // deprecated
-			'{INVENTORY.TYPE}' => 'type',
-			'{PROFILE.DEVICETYPE}' => 'type', // deprecated
-			'{INVENTORY.TYPE.FULL}' => 'type_full',
-			'{INVENTORY.URL.A}' => 'url_a',
-			'{INVENTORY.URL.B}' => 'url_b',
-			'{INVENTORY.URL.C}' => 'url_c',
-			'{INVENTORY.VENDOR}' => 'vendor'
-		];
-	}
-
-	/**
 	 * Set every trigger items array elements order by item usage order in trigger expression and recovery expression.
 	 *
 	 * @param array  $triggers                            Array of triggers.
diff --git a/ui/include/classes/macros/CMacrosResolverGeneral.php b/ui/include/classes/macros/CMacrosResolverGeneral.php
index d0da9d33e39..7281a1204a0 100644
--- a/ui/include/classes/macros/CMacrosResolverGeneral.php
+++ b/ui/include/classes/macros/CMacrosResolverGeneral.php
@@ -21,21 +21,23 @@
 
 class CMacrosResolverGeneral {
 
-	const PATTERN_HOST_INTERNAL = 'HOST\.HOST|HOSTNAME';
-	const PATTERN_MACRO_PARAM = '[1-9]?';
-
 	/**
 	 * Interface priorities.
 	 *
 	 * @var array
 	 */
-	protected $interfacePriorities = [
+	protected const interfacePriorities = [
 		INTERFACE_TYPE_AGENT => 4,
 		INTERFACE_TYPE_SNMP => 3,
 		INTERFACE_TYPE_JMX => 2,
 		INTERFACE_TYPE_IPMI => 1
 	];
 
+	protected const aggr_triggers_macros = ['{TRIGGER.EVENTS.ACK}', '{TRIGGER.EVENTS.PROBLEM.ACK}',
+		'{TRIGGER.EVENTS.PROBLEM.UNACK}', '{TRIGGER.EVENTS.UNACK}', '{TRIGGER.PROBLEM.EVENTS.PROBLEM.ACK}',
+		'{TRIGGER.PROBLEM.EVENTS.PROBLEM.UNACK}', '{TRIGGERS.UNACK}', '{TRIGGERS.PROBLEM.UNACK}', '{TRIGGERS.ACK}',
+		'{TRIGGERS.PROBLEM.ACK}'];
+
 	/**
 	 * Work config name.
 	 *
@@ -244,18 +246,73 @@ class CMacrosResolverGeneral {
 	}
 
 	/**
+	 * Returns true if parsed expression is calculable.
+	 *
+	 * @param array $tokens
+	 *
+	 * @return bool
+	 */
+	private static function isCalculableExpression(array $tokens): bool {
+		if (count($tokens) != 1 || $tokens[0]['type'] != CExpressionParserResult::TOKEN_TYPE_HIST_FUNCTION) {
+			return false;
+		}
+
+		$expression_validator = new CExpressionValidator();
+
+		if (!$expression_validator->validate($tokens)) {
+			return false;
+		}
+
+		if (!in_array($tokens[0]['data']['function'], ['last', 'min', 'max', 'avg'])) {
+			return false;
+		}
+
+		$parameters = $tokens[0]['data']['parameters'];
+
+		// Time shift is not supported.
+		if (array_key_exists(1, $parameters) && ($parameters[1]['type'] != CHistFunctionParser::PARAM_TYPE_PERIOD
+				|| $parameters[1]['data']['sec_num'][0] === '#' || $parameters[1]['data']['time_shift'] !== '')) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
 	 * Extract macros from a string.
 	 *
 	 * @param array  $texts
 	 * @param array  $types
-	 * @param bool   $types['usermacros']
-	 * @param array  $types['macros'][][<macro_patterns>]
-	 * @param array  $types['macros_n'][][<macro_patterns>]
-	 * @param array  $types['macros_an'][][<macro_patterns>]
-	 * @param array  $types['macro_funcs_n'][][<macro_patterns>]
-	 * @param bool   $types['references']
-	 * @param bool   $types['lldmacros']
-	 * @param bool   $types['functionids']
+	 * @param bool   $types['usermacros']                         Extract user macros. For example, "{$MACRO}".
+	 * @param array  $types['macros'][][<macro_patterns>]         Extract macros. For example, "{HOST.HOST}".
+	 * @param array  $types['macros_n'][][<macro_patterns>]       Extract macros with optional numeric index.
+	 *                                                              For example, "{HOST.HOST<1-9>}".
+	 * @param array  $types['macros_an'][][<macro_patterns>]      Extract macros with optional numeric or alphabetic
+	 *                                                              index. For example, "{EVENT.TAGS.Service}".
+	 * @param array  $types['macro_funcs_n'][][<macro_patterns>]  Extract macros with optional numeric index and macro
+	 *                                                              function.
+	 *                                                              For example, "{{ITEM.VALUE<1-9>}.func(param)}".
+	 * @param bool   $types['references']                         Extract dollar-sign references. For example, "$5".
+	 * @param bool   $types['lldmacros']                          Extract low-level discovery macros.
+	 *                                                              For example, "{#LLD.MACRO}".
+	 * @param bool   $types['functionids']                        Extract numeric macros. For example, "{12345}".
+	 * @param bool   $types['expr_macros']                        Extract expression macros.
+	 *                                                              For example, "{?func(/host/key, param)}".
+	 * @param bool   $types['expr_macros_host']                   Extract expression macros with with the ability to
+	 *                                                              specify a {HOST.HOST} macro or an empty host name
+	 *                                                              instead of a hostname.
+	 *                                                              For example,
+	 *                                                                "{?func(/host/key, param)}",
+	 *                                                                "{?func(/{HOST.HOST}/key, param)}",
+	 *                                                                "{?func(//key, param)}".
+	 * @param bool   $types['expr_macros_host_n']                 Extract expression macros with with the ability to
+	 *                                                              specify a {HOST.HOST<1-9>} macro or an empty host
+	 *                                                              name instead of a hostname.
+	 *                                                              For example,
+	 *                                                                "{?func(/host/key, param)}",
+	 *                                                                "{?func(/{HOST.HOST}/key, param)}",
+	 *                                                                "{?func(/{HOST.HOST5}/key, param)}",
+	 *                                                                "{?func(//key, param)}".
 	 *
 	 * @return array
 	 */
@@ -269,6 +326,9 @@ class CMacrosResolverGeneral {
 		$extract_references = array_key_exists('references', $types);
 		$extract_lldmacros = array_key_exists('lldmacros', $types);
 		$extract_functionids = array_key_exists('functionids', $types);
+		$extract_expr_macros = array_key_exists('expr_macros', $types);
+		$extract_expr_macros_host = array_key_exists('expr_macros_host', $types);
+		$extract_expr_macros_host_n = array_key_exists('expr_macros_host_n', $types);
 
 		if ($extract_usermacros) {
 			$macros['usermacros'] = [];
@@ -340,6 +400,24 @@ class CMacrosResolverGeneral {
 			$functionid_parser = new CFunctionIdParser();
 		}
 
+		if ($extract_expr_macros) {
+			$macros['expr_macros'] = [];
+
+			$expr_macro_parser = new CExpressionMacroParser();
+		}
+
+		if ($extract_expr_macros_host) {
+			$macros['expr_macros_host'] = [];
+
+			$expr_macro_parser_host = new CExpressionMacroParser(['host_macro' => true, 'empty_host' => true]);
+		}
+
+		if ($extract_expr_macros_host_n) {
+			$macros['expr_macros_host_n'] = [];
+
+			$expr_macro_parser_host_n = new CExpressionMacroParser(['host_macro_n' => true, 'empty_host' => true]);
+		}
+
 		foreach ($texts as $text) {
 			for ($pos = 0; isset($text[$pos]); $pos++) {
 				if ($extract_usermacros && $user_macro_parser->parse($text, $pos) != CParser::PARSE_FAIL) {
@@ -439,6 +517,67 @@ class CMacrosResolverGeneral {
 					$pos += $functionid_parser->getLength() - 1;
 					continue;
 				}
+
+				if ($extract_expr_macros && $expr_macro_parser->parse($text, $pos) != CParser::PARSE_FAIL) {
+					$tokens = $expr_macro_parser
+						->getExpressionParser()
+						->getResult()
+						->getTokens();
+
+					if (self::isCalculableExpression($tokens)) {
+						$macros['expr_macros'][$expr_macro_parser->getMatch()] = [
+							'function' => $tokens[0]['data']['function'],
+							'host' => $tokens[0]['data']['parameters'][0]['data']['host'],
+							'key' => $tokens[0]['data']['parameters'][0]['data']['item'],
+							'sec_num' => array_key_exists(1, $tokens[0]['data']['parameters'])
+								? $tokens[0]['data']['parameters'][1]['data']['sec_num']
+								: ''
+						];
+						$pos += $expr_macro_parser->getLength() - 1;
+						continue;
+					}
+				}
+
+				if ($extract_expr_macros_host && $expr_macro_parser_host->parse($text, $pos) != CParser::PARSE_FAIL) {
+					$tokens = $expr_macro_parser_host
+						->getExpressionParser()
+						->getResult()
+						->getTokens();
+
+					if (self::isCalculableExpression($tokens)) {
+						$macros['expr_macros_host'][$expr_macro_parser_host->getMatch()] = [
+							'function' => $tokens[0]['data']['function'],
+							'host' => $tokens[0]['data']['parameters'][0]['data']['host'],
+							'key' => $tokens[0]['data']['parameters'][0]['data']['item'],
+							'sec_num' => array_key_exists(1, $tokens[0]['data']['parameters'])
+								? $tokens[0]['data']['parameters'][1]['data']['sec_num']
+								: ''
+						];
+						$pos += $expr_macro_parser_host->getLength() - 1;
+						continue;
+					}
+				}
+
+				if ($extract_expr_macros_host_n
+						&& $expr_macro_parser_host_n->parse($text, $pos) != CParser::PARSE_FAIL) {
+					$tokens = $expr_macro_parser_host_n
+						->getExpressionParser()
+						->getResult()
+						->getTokens();
+
+					if (self::isCalculableExpression($tokens)) {
+						$macros['expr_macros_host_n'][$expr_macro_parser_host_n->getMatch()] = [
+							'function' => $tokens[0]['data']['function'],
+							'host' => $tokens[0]['data']['parameters'][0]['data']['host'],
+							'key' => $tokens[0]['data']['parameters'][0]['data']['item'],
+							'sec_num' => array_key_exists(1, $tokens[0]['data']['parameters'])
+								? $tokens[0]['data']['parameters'][1]['data']['sec_num']
+								: ''
+						];
+						$pos += $expr_macro_parser_host_n->getLength() - 1;
+						continue;
+					}
+				}
 			}
 		}
 
@@ -694,8 +833,8 @@ class CMacrosResolverGeneral {
 
 		while ($row = DBfetch($result)) {
 			if (array_key_exists($row['functionid'], $interfaces)
-					&& $this->interfacePriorities[$interfaces[$row['functionid']]['type']]
-						> $this->interfacePriorities[$row['type']]) {
+					&& self::interfacePriorities[$interfaces[$row['functionid']]['type']]
+						> self::interfacePriorities[$row['type']]) {
 				continue;
 			}
 
@@ -1047,23 +1186,850 @@ class CMacrosResolverGeneral {
 	}
 
 	/**
-	 * Is type available.
+	 * Get expression macros like "{?avg(/host/key, 1d)}".
 	 *
-	 * @param string $type
+	 * @param array $macros
+	 * @param array $macros[<macro>]['function']
+	 * @param array $macros[<macro>]['host']
+	 * @param array $macros[<macro>]['key']
+	 * @param array $macros[<macro>]['sec_num']
+	 * @param array $macro_values
 	 *
-	 * @return bool
+	 * @return array
 	 */
-	protected function isTypeAvailable($type) {
-		return in_array($type, $this->configs[$this->config]['types']);
+	protected static function getExpressionMacros(array $macros, array $macro_values) {
+		if (!$macros) {
+			return $macro_values;
+		}
+
+		$function_data = [];
+
+		foreach ($macros as $macro => $data) {
+			if ($data['function'] === 'last') {
+				$function_data['last'][$data['host']][$data['key']][] = $macro;
+			}
+			else {
+				$function_data['other'][$data['host']][$data['key']][$data['function']][$data['sec_num']][] = $macro;
+			}
+		}
+
+		foreach ($function_data as $ftype => $hosts) {
+			foreach ($hosts as $host => $keys) {
+				if ($ftype === 'last') {
+					$db_items = API::Item()->get([
+						'output' => ['key_', 'value_type', 'units', 'lastvalue', 'lastclock'],
+						'selectValueMap' => ['mappings'],
+						'webitems' => true,
+						'filter' => [
+							'host' => $host,
+							'key_' => array_keys($keys)
+						]
+					]);
+
+					foreach ($db_items as $db_item) {
+						$value = $db_item['lastclock']
+							? formatHistoryValue($db_item['lastvalue'], $db_item)
+							: UNRESOLVED_MACRO_STRING;
+
+						foreach ($keys[$db_item['key_']] as $_macro) {
+							$macro_values[$_macro] = $value;
+						}
+					}
+				}
+				else {
+					$db_items = API::Item()->get([
+						'output' => ['itemid', 'key_', 'value_type', 'units'],
+						'webitems' => true,
+						'filter' => [
+							'host' => $host,
+							'key_' => array_keys($keys)
+						]
+					]);
+
+					foreach ($db_items as $db_item) {
+						foreach ($keys[$db_item['key_']] as $function => $sec_nums) {
+							foreach ($sec_nums as $sec_num => $_macros) {
+								$value = getItemFunctionalValue($db_item, $function, $sec_num);
+
+								foreach ($_macros as $_macro) {
+									$macro_values[$_macro] = $value;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $macro_values;
 	}
 
 	/**
-	 * Get source field.
+	 * Get map macros.
 	 *
-	 * @return string
+	 * @param array $maps
+	 * @param array $maps[<sysmapid>]
+	 * @param array $maps[<sysmapid>][<key>]
+	 * @param array $macro_values
+	 * @param array $macro_values[<key>]
+	 * @param array $macro_values[<key>][<macro>]
+	 *
+	 * @return array
+	 */
+	protected static function getMapMacros(array $maps, array $macro_values): array {
+		if (!$maps) {
+			return $macro_values;
+		}
+
+		$db_maps = API::Map()->get([
+			'output' => ['name'],
+			'sysmapids' => array_keys($maps),
+			'preservekeys' => true
+		]);
+
+		foreach ($maps as $mapid => $keys) {
+			if (!array_key_exists($mapid, $db_maps)) {
+				continue;
+			}
+
+			foreach (array_keys($keys) as $key) {
+				if (array_key_exists('{MAP.NAME}', $macro_values[$key])) {
+					$macro_values[$key]['{MAP.NAME}'] = $db_maps[$mapid]['name'];
+				}
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/*
+	 * Resolve aggregated macros like {TRIGGER.EVENTS.*}, {TRIGGER(S).PROBLEM.*} and {TRIGGERS.(UN)ACK}.
+	 *
+	 * @param array $selement
+	 * @param string $macro
+	 *
+	 * @return int
+	 */
+	private static function getTriggersMacroValue(array $selement, string $macro) {
+		switch ($macro) {
+			case '{TRIGGER.EVENTS.ACK}':
+				return get_events_unacknowledged($selement, null, null, true);
+
+			case '{TRIGGER.EVENTS.PROBLEM.ACK}':
+				return get_events_unacknowledged($selement, null, TRIGGER_VALUE_TRUE, true);
+
+			case '{TRIGGER.EVENTS.PROBLEM.UNACK}':
+				return get_events_unacknowledged($selement, null, TRIGGER_VALUE_TRUE);
+
+			case '{TRIGGER.EVENTS.UNACK}':
+				return get_events_unacknowledged($selement);
+
+			case '{TRIGGER.PROBLEM.EVENTS.PROBLEM.ACK}':
+				return get_events_unacknowledged($selement, TRIGGER_VALUE_TRUE, TRIGGER_VALUE_TRUE, true);
+
+			case '{TRIGGER.PROBLEM.EVENTS.PROBLEM.UNACK}':
+				return get_events_unacknowledged($selement, TRIGGER_VALUE_TRUE, TRIGGER_VALUE_TRUE);
+
+			case '{TRIGGERS.UNACK}':
+				return get_triggers_unacknowledged($selement);
+
+			case '{TRIGGERS.PROBLEM.UNACK}':
+				return get_triggers_unacknowledged($selement, true);
+
+			case '{TRIGGERS.ACK}':
+				return get_triggers_unacknowledged($selement, null, true);
+
+			case '{TRIGGERS.PROBLEM.ACK}':
+				return get_triggers_unacknowledged($selement, true, true);
+		}
+	}
+
+	/**
+	 * Get aggregated trigger macros.
+	 *
+	 * @param array $triggers
+	 * @param array $triggers[<key>]
+	 * @param array $macro_values
+	 * @param array $macro_values[<key>]
+	 * @param array $macro_values[<key>][<macro>]
+	 * @param array $selements
+	 * @param array $selements[<key>][]
+	 *
+	 * @return array
+	 */
+	protected static function getAggrTriggerMacros(array $triggers, array $macro_values, array $selements): array {
+		if (!$triggers) {
+			return $macro_values;
+		}
+
+		foreach (array_keys($triggers) as $key) {
+			foreach ($macro_values[$key] as $macro => &$value) {
+				if (in_array($macro, self::aggr_triggers_macros)) {
+					$value = self::getTriggersMacroValue($selements[$key], $macro);
+				}
+			}
+			unset($value);
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Get host macros.
+	 *
+	 * @param array $hosts
+	 * @param array $hosts[<hostid>]
+	 * @param array $hosts[<hostid>][<key>]
+	 * @param array $macro_values
+	 * @param array $macro_values[<key>]
+	 * @param array $macro_values[<key>][<macro>]
+	 *
+	 * @return array
+	 */
+	protected static function getHostMacrosByHostId(array $hosts, array $macro_values): array {
+		if (!$hosts) {
+			return $macro_values;
+		}
+
+		$db_hosts = API::Host()->get([
+			'output' => ['host', 'name', 'description'],
+			'hostids' => array_keys($hosts),
+			'preservekeys' => true
+		]);
+
+		$host_macros = ['{HOSTNAME}' => 'host', '{HOST.HOST}' => 'host', '{HOST.NAME}' => 'name',
+			'{HOST.DESCRIPTION}' => 'description'
+		];
+
+		foreach ($hosts as $hostid => $keys) {
+			if (!array_key_exists($hostid, $db_hosts)) {
+				continue;
+			}
+
+			foreach ($host_macros as $macro => $field) {
+				foreach (array_keys($keys) as $key) {
+					if (array_key_exists($macro, $macro_values[$key])) {
+						$macro_values[$key][$macro] = $db_hosts[$hostid][$field];
+					}
+				}
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Get interface macros.
+	 *
+	 * @param array $interfaces
+	 * @param array $interfaces[<hostid>]
+	 * @param array $interfaces[<hostid>][<key>]
+	 * @param array $macro_values
+	 * @param array $macro_values[<key>]
+	 * @param array $macro_values[<key>][<macro>]
+	 *
+	 * @return array
+	 */
+	protected static function getInterfaceMacrosByHostId(array $interfaces, array $macro_values): array {
+		if (!$interfaces) {
+			return $macro_values;
+		}
+
+		$db_interfaces = API::HostInterface()->get([
+			'output' => ['hostid', 'type', 'useip', 'ip', 'dns'],
+			'hostids' => array_keys($interfaces),
+			'filter' => ['main' => INTERFACE_PRIMARY]
+		]);
+
+		usort($db_interfaces, function ($a, $b) {
+			return self::interfacePriorities[$b['type']] <=> self::interfacePriorities[$a['type']];
+		});
+
+		$host_interfaces = [];
+
+		foreach ($db_interfaces as $db_interface) {
+			if (!array_key_exists($db_interface['hostid'], $host_interfaces)) {
+				$host_interfaces[$db_interface['hostid']] = $db_interface;
+			}
+		}
+
+		foreach ($host_interfaces as &$host_interface) {
+			$host_interface['conn'] = ($host_interface['useip'] == INTERFACE_USE_IP)
+				? $host_interface['ip']
+				: $host_interface['dns'];
+		}
+		unset($host_interface);
+
+		$interface_macros = ['{IPADDRESS}' => 'ip', '{HOST.IP}' => 'ip', '{HOST.DNS}' => 'dns',
+			'{HOST.CONN}' => 'conn'
+		];
+
+		foreach ($interfaces as $hostid => $keys) {
+			if (!array_key_exists($hostid, $host_interfaces)) {
+				continue;
+			}
+
+			foreach ($interface_macros as $macro => $field) {
+				foreach (array_keys($keys) as $key) {
+					if (array_key_exists($macro, $macro_values[$key])) {
+						$macro_values[$key][$macro] = $host_interfaces[$hostid][$field];
+					}
+				}
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Function returns array holding of inventory macros as a keys and corresponding database fields as value.
+	 *
+	 * @static
+	 *
+	 * @return array
+	 */
+	protected static function getSupportedHostInventoryMacrosMap(): array {
+		return [
+			'{INVENTORY.ALIAS}' => 'alias',
+			'{INVENTORY.ASSET.TAG}' => 'asset_tag',
+			'{INVENTORY.CHASSIS}' => 'chassis',
+			'{INVENTORY.CONTACT}' => 'contact',
+			'{PROFILE.CONTACT}' => 'contact', // deprecated
+			'{INVENTORY.CONTRACT.NUMBER}' => 'contract_number',
+			'{INVENTORY.DEPLOYMENT.STATUS}' => 'deployment_status',
+			'{INVENTORY.HARDWARE}' => 'hardware',
+			'{PROFILE.HARDWARE}' => 'hardware', // deprecated
+			'{INVENTORY.HARDWARE.FULL}' => 'hardware_full',
+			'{INVENTORY.HOST.NETMASK}' => 'host_netmask',
+			'{INVENTORY.HOST.NETWORKS}' => 'host_networks',
+			'{INVENTORY.HOST.ROUTER}' => 'host_router',
+			'{INVENTORY.HW.ARCH}' => 'hw_arch',
+			'{INVENTORY.HW.DATE.DECOMM}' => 'date_hw_decomm',
+			'{INVENTORY.HW.DATE.EXPIRY}' => 'date_hw_expiry',
+			'{INVENTORY.HW.DATE.INSTALL}' => 'date_hw_install',
+			'{INVENTORY.HW.DATE.PURCHASE}' => 'date_hw_purchase',
+			'{INVENTORY.INSTALLER.NAME}' => 'installer_name',
+			'{INVENTORY.LOCATION}' => 'location',
+			'{PROFILE.LOCATION}' => 'location', // deprecated
+			'{INVENTORY.LOCATION.LAT}' => 'location_lat',
+			'{INVENTORY.LOCATION.LON}' => 'location_lon',
+			'{INVENTORY.MACADDRESS.A}' => 'macaddress_a',
+			'{PROFILE.MACADDRESS}' => 'macaddress_a', // deprecated
+			'{INVENTORY.MACADDRESS.B}' => 'macaddress_b',
+			'{INVENTORY.MODEL}' => 'model',
+			'{INVENTORY.NAME}' => 'name',
+			'{PROFILE.NAME}' => 'name', // deprecated
+			'{INVENTORY.NOTES}' => 'notes',
+			'{PROFILE.NOTES}' => 'notes', // deprecated
+			'{INVENTORY.OOB.IP}' => 'oob_ip',
+			'{INVENTORY.OOB.NETMASK}' => 'oob_netmask',
+			'{INVENTORY.OOB.ROUTER}' => 'oob_router',
+			'{INVENTORY.OS}' => 'os',
+			'{PROFILE.OS}' => 'os', // deprecated
+			'{INVENTORY.OS.FULL}' => 'os_full',
+			'{INVENTORY.OS.SHORT}' => 'os_short',
+			'{INVENTORY.POC.PRIMARY.CELL}' => 'poc_1_cell',
+			'{INVENTORY.POC.PRIMARY.EMAIL}' => 'poc_1_email',
+			'{INVENTORY.POC.PRIMARY.NAME}' => 'poc_1_name',
+			'{INVENTORY.POC.PRIMARY.NOTES}' => 'poc_1_notes',
+			'{INVENTORY.POC.PRIMARY.PHONE.A}' => 'poc_1_phone_a',
+			'{INVENTORY.POC.PRIMARY.PHONE.B}' => 'poc_1_phone_b',
+			'{INVENTORY.POC.PRIMARY.SCREEN}' => 'poc_1_screen',
+			'{INVENTORY.POC.SECONDARY.CELL}' => 'poc_2_cell',
+			'{INVENTORY.POC.SECONDARY.EMAIL}' => 'poc_2_email',
+			'{INVENTORY.POC.SECONDARY.NAME}' => 'poc_2_name',
+			'{INVENTORY.POC.SECONDARY.NOTES}' => 'poc_2_notes',
+			'{INVENTORY.POC.SECONDARY.PHONE.A}' => 'poc_2_phone_a',
+			'{INVENTORY.POC.SECONDARY.PHONE.B}' => 'poc_2_phone_b',
+			'{INVENTORY.POC.SECONDARY.SCREEN}' => 'poc_2_screen',
+			'{INVENTORY.SERIALNO.A}' => 'serialno_a',
+			'{PROFILE.SERIALNO}' => 'serialno_a', // deprecated
+			'{INVENTORY.SERIALNO.B}' => 'serialno_b',
+			'{INVENTORY.SITE.ADDRESS.A}' => 'site_address_a',
+			'{INVENTORY.SITE.ADDRESS.B}' => 'site_address_b',
+			'{INVENTORY.SITE.ADDRESS.C}' => 'site_address_c',
+			'{INVENTORY.SITE.CITY}' => 'site_city',
+			'{INVENTORY.SITE.COUNTRY}' => 'site_country',
+			'{INVENTORY.SITE.NOTES}' => 'site_notes',
+			'{INVENTORY.SITE.RACK}' => 'site_rack',
+			'{INVENTORY.SITE.STATE}' => 'site_state',
+			'{INVENTORY.SITE.ZIP}' => 'site_zip',
+			'{INVENTORY.SOFTWARE}' => 'software',
+			'{PROFILE.SOFTWARE}' => 'software', // deprecated
+			'{INVENTORY.SOFTWARE.APP.A}' => 'software_app_a',
+			'{INVENTORY.SOFTWARE.APP.B}' => 'software_app_b',
+			'{INVENTORY.SOFTWARE.APP.C}' => 'software_app_c',
+			'{INVENTORY.SOFTWARE.APP.D}' => 'software_app_d',
+			'{INVENTORY.SOFTWARE.APP.E}' => 'software_app_e',
+			'{INVENTORY.SOFTWARE.FULL}' => 'software_full',
+			'{INVENTORY.TAG}' => 'tag',
+			'{PROFILE.TAG}' => 'tag', // deprecated
+			'{INVENTORY.TYPE}' => 'type',
+			'{PROFILE.DEVICETYPE}' => 'type', // deprecated
+			'{INVENTORY.TYPE.FULL}' => 'type_full',
+			'{INVENTORY.URL.A}' => 'url_a',
+			'{INVENTORY.URL.B}' => 'url_b',
+			'{INVENTORY.URL.C}' => 'url_c',
+			'{INVENTORY.VENDOR}' => 'vendor'
+		];
+	}
+
+	/**
+	 * Get inventory macros.
+	 *
+	 * @param array $hosts
+	 * @param array $hosts[<hostid>]
+	 * @param array $hosts[<hostid>][<key>]
+	 * @param array $macro_values
+	 * @param array $macro_values[<key>]
+	 * @param array $macro_values[<key>][<macro>]
+	 *
+	 * @return array
+	 */
+	protected static function getInventoryMacrosByHostId(array $hosts, array $macro_values): array {
+		if (!$hosts) {
+			return $macro_values;
+		}
+
+		$inventory_macros = self::getSupportedHostInventoryMacrosMap();
+
+		$db_hosts = API::Host()->get([
+			'output' => ['inventory_mode'],
+			'selectInventory' => array_values($inventory_macros),
+			'hostids' => array_keys($hosts),
+			'preservekeys' => true
+		]);
+
+		foreach ($hosts as $hostid => $keys) {
+			if (!array_key_exists($hostid, $db_hosts)
+					|| $db_hosts[$hostid]['inventory_mode'] == HOST_INVENTORY_DISABLED) {
+				continue;
+			}
+
+			foreach ($inventory_macros as $macro => $field) {
+				foreach (array_keys($keys) as $key) {
+					if (array_key_exists($macro, $macro_values[$key])) {
+						$macro_values[$key][$macro] = $db_hosts[$hostid]['inventory'][$field];
+					}
+				}
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Get a list of hosts for each selected trigger, in the order in which they located in the expression.
+	 * Returns an array of host IDs by trigger ID.
+	 *
+	 * @param array $triggerids
+	 * @param bool  $get_host_name  Returns host names instead of host IDs.
+	 *
+	 * @return array
 	 */
-	protected function getSource() {
-		return $this->configs[$this->config]['source'];
+	protected static function getExpressionHosts(array $triggerids, bool $get_host_name = false): array {
+		if (!$triggerids) {
+			return [];
+		}
+
+		$db_triggers = API::Trigger()->get([
+			'output' => ['expression'],
+			'selectFunctions' => ['functionid', 'itemid'],
+			'selectItems' => ['itemid', 'hostid'],
+			'selectHosts' => $get_host_name ? ['hostid', 'host'] : null,
+			'triggerids' => $triggerids,
+			'preservekeys' => true
+		]);
+
+		$trigger_hosts_by_f_num = [];
+		$expression_parser = new CExpressionParser(['usermacros' => true, 'collapsed_expression' => true]);
+
+		foreach ($db_triggers as $triggerid => $db_trigger) {
+			if ($expression_parser->parse($db_trigger['expression']) != CParser::PARSE_SUCCESS) {
+				continue;
+			}
+
+			$db_trigger['functions'] = array_column($db_trigger['functions'], 'itemid', 'functionid');
+			$db_trigger['items'] = array_column($db_trigger['items'], 'hostid', 'itemid');
+			if ($get_host_name) {
+				$db_trigger['hosts'] = array_column($db_trigger['hosts'], 'host', 'hostid');
+			}
+			$tokens = $expression_parser
+				->getResult()
+				->getTokensOfTypes([CExpressionParserResult::TOKEN_TYPE_FUNCTIONID_MACRO]);
+
+			foreach ($tokens as $f_num => $token) {
+				$functionid = substr($token['match'], 1, -1); // strip curly braces
+				$itemid = $db_trigger['functions'][$functionid];
+				$hostid = $db_trigger['items'][$itemid];
+				$value = $get_host_name ? $db_trigger['hosts'][$hostid] : $hostid;
+
+				// Add host reference for macro without numeric index.
+				if ($f_num == 0) {
+					$trigger_hosts_by_f_num[$triggerid][0] = $value;
+				}
+				$trigger_hosts_by_f_num[$triggerid][$f_num + 1] = $value;
+			}
+		}
+
+		return $trigger_hosts_by_f_num;
+	}
+
+	/**
+	 * Get host macros with references.
+	 *
+	 * @param array  $hosts_n
+	 * @param array  $hosts_n[<triggerid>]
+	 * @param array  $hosts_n[<triggerid>][<key>]
+	 * @param array  $hosts_n[<triggerid>][<key>][<macro>]
+	 * @param string $hosts_n[<triggerid>][<key>][<macro>]['macro']  Macro without curly braces and reference.
+	 * @param string $hosts_n[<triggerid>][<key>][<macro>]['f_num']  Reference number.
+	 * @param array  $macro_values
+	 * @param array  $macro_values[<key>]
+	 * @param array  $macro_values[<key>][<macro>]
+	 * @param array  $trigger_hosts_by_f_num
+	 * @param array  $trigger_hosts_by_f_num[<triggerid>]            An array of host IDs.
+	 *
+	 * @return array
+	 */
+	protected static function getHostNMacros(array $hosts_n, array $macro_values,
+			array $trigger_hosts_by_f_num): array {
+		if (!$hosts_n) {
+			return $macro_values;
+		}
+
+		$hostids = [];
+
+		foreach (array_intersect_key($trigger_hosts_by_f_num, $hosts_n) as $triggerid => $_hostids) {
+			$hostids += array_flip($_hostids);
+		}
+
+		$db_hosts = API::Host()->get([
+			'output' => ['host', 'name', 'description'],
+			'hostids' => array_keys($hostids),
+			'preservekeys' => true
+		]);
+
+		$host_macros = ['HOST.ID' => null, 'HOSTNAME' => 'host', 'HOST.HOST' => 'host', 'HOST.NAME' => 'name',
+			'HOST.DESCRIPTION' => 'description'
+		];
+
+		foreach ($hosts_n as $triggerid => $keys) {
+			if (!array_key_exists($triggerid, $trigger_hosts_by_f_num)) {
+				continue;
+			}
+
+			foreach ($keys as $key => $_macros) {
+				foreach ($macro_values[$key] as $macro => &$value) {
+					if (array_key_exists($macro, $_macros)) {
+						$data = $_macros[$macro];
+
+						if (!array_key_exists($data['macro'], $host_macros)) {
+							continue;
+						}
+
+						if (!array_key_exists($data['f_num'], $trigger_hosts_by_f_num[$triggerid])) {
+							continue;
+						}
+
+						$hostid = $trigger_hosts_by_f_num[$triggerid][$data['f_num']];
+
+						if ($data['macro'] === 'HOST.ID') {
+							$value = $hostid;
+						}
+						elseif (array_key_exists($hostid, $db_hosts)) {
+							$value = $db_hosts[$hostid][$host_macros[$data['macro']]];
+						}
+					}
+				}
+				unset($value);
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Get interface macros with references.
+	 *
+	 * @param array  $hosts_n
+	 * @param array  $hosts_n[<triggerid>]
+	 * @param array  $hosts_n[<triggerid>][<key>]
+	 * @param array  $hosts_n[<triggerid>][<key>][<macro>]
+	 * @param string $hosts_n[<triggerid>][<key>][<macro>]['macro']  Macro without curly braces and reference.
+	 * @param string $hosts_n[<triggerid>][<key>][<macro>]['f_num']  Reference number.
+	 * @param array  $macro_values
+	 * @param array  $macro_values[<key>]
+	 * @param array  $macro_values[<key>][<macro>]
+	 * @param array  $trigger_hosts_by_f_num
+	 * @param array  $trigger_hosts_by_f_num[<triggerid>]            An array of host IDs.
+	 *
+	 * @return array
+	 */
+	protected static function getInterfaceNMacros(array $hosts_n, array $macro_values,
+			array $trigger_hosts_by_f_num): array {
+		if (!$hosts_n) {
+			return $macro_values;
+		}
+
+		$hostids = [];
+
+		foreach (array_intersect_key($trigger_hosts_by_f_num, $hosts_n) as $triggerid => $_hostids) {
+			$hostids += array_flip($_hostids);
+		}
+
+		$db_interfaces = API::HostInterface()->get([
+			'output' => ['hostid', 'type', 'useip', 'ip', 'dns'],
+			'hostids' => array_keys($hostids),
+			'filter' => ['main' => INTERFACE_PRIMARY]
+		]);
+
+		usort($db_interfaces, function ($a, $b) {
+			return self::interfacePriorities[$b['type']] <=> self::interfacePriorities[$a['type']];
+		});
+
+		$host_interfaces = [];
+
+		foreach ($db_interfaces as $db_interface) {
+			if (!array_key_exists($db_interface['hostid'], $host_interfaces)) {
+				$host_interfaces[$db_interface['hostid']] = $db_interface;
+			}
+		}
+
+		foreach ($host_interfaces as &$host_interface) {
+			$host_interface['conn'] = ($host_interface['useip'] == INTERFACE_USE_IP)
+				? $host_interface['ip']
+				: $host_interface['dns'];
+		}
+		unset($host_interface);
+
+		$interface_macros = ['IPADDRESS' => 'ip', 'HOST.IP' => 'ip', 'HOST.DNS' => 'dns', 'HOST.CONN' => 'conn'];
+
+		foreach ($hosts_n as $triggerid => $keys) {
+			if (!array_key_exists($triggerid, $trigger_hosts_by_f_num)) {
+				continue;
+			}
+
+			foreach ($keys as $key => $_macros) {
+				foreach ($macro_values[$key] as $macro => &$value) {
+					if (array_key_exists($macro, $_macros)) {
+						$data = $_macros[$macro];
+
+						if (!array_key_exists($data['macro'], $interface_macros)) {
+							continue;
+						}
+
+						if (!array_key_exists($data['f_num'], $trigger_hosts_by_f_num[$triggerid])) {
+							continue;
+						}
+
+						$hostid = $trigger_hosts_by_f_num[$triggerid][$data['f_num']];
+
+						if (array_key_exists($hostid, $host_interfaces)) {
+							$value = $host_interfaces[$hostid][$interface_macros[$data['macro']]];
+						}
+					}
+				}
+				unset($value);
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Get inventory macros with references.
+	 *
+	 * @param array  $hosts_n
+	 * @param array  $hosts_n[<triggerid>]
+	 * @param array  $hosts_n[<triggerid>][<key>]
+	 * @param array  $hosts_n[<triggerid>][<key>][<macro>]
+	 * @param string $hosts_n[<triggerid>][<key>][<macro>]['macro']  Macro without curly braces and reference.
+	 * @param string $hosts_n[<triggerid>][<key>][<macro>]['f_num']  Reference number.
+	 * @param array  $macro_values
+	 * @param array  $macro_values[<key>]
+	 * @param array  $macro_values[<key>][<macro>]
+	 * @param array  $trigger_hosts_by_f_num
+	 * @param array  $trigger_hosts_by_f_num[<triggerid>]            An array of host IDs.
+	 *
+	 * @return array
+	 */
+	protected static function getInventoryNMacros(array $hosts_n, array $macro_values,
+			array $trigger_hosts_by_f_num): array {
+		if (!$hosts_n) {
+			return $macro_values;
+		}
+
+		$hostids = [];
+
+		foreach (array_intersect_key($trigger_hosts_by_f_num, $hosts_n) as $triggerid => $_hostids) {
+			$hostids += array_flip($_hostids);
+		}
+
+		$inventory_macros = self::getSupportedHostInventoryMacrosMap();
+
+		$db_hosts = API::Host()->get([
+			'output' => ['inventory_mode'],
+			'selectInventory' => array_values($inventory_macros),
+			'hostids' => array_keys($hostids),
+			'preservekeys' => true
+		]);
+
+		foreach ($hosts_n as $triggerid => $keys) {
+			if (!array_key_exists($triggerid, $trigger_hosts_by_f_num)) {
+				continue;
+			}
+
+			foreach ($keys as $key => $_macros) {
+				foreach ($macro_values[$key] as $macro => &$value) {
+					if (array_key_exists($macro, $_macros)) {
+						$data = $_macros[$macro];
+
+						if (!array_key_exists('{'.$data['macro'].'}', $inventory_macros)) {
+							continue;
+						}
+
+						if (!array_key_exists($data['f_num'], $trigger_hosts_by_f_num[$triggerid])) {
+							continue;
+						}
+
+						$hostid = $trigger_hosts_by_f_num[$triggerid][$data['f_num']];
+
+						if (array_key_exists($hostid, $db_hosts)
+								&& $db_hosts[$hostid]['inventory_mode'] != HOST_INVENTORY_DISABLED) {
+							$value = $db_hosts[$hostid]['inventory'][$inventory_macros['{'.$data['macro'].'}']];
+						}
+					}
+				}
+				unset($value);
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Get expression macros with and without {HOST.HOST<1-9>} references.
+	 *
+	 * @param array  $expr_macros_host_n
+	 * @param array  $expr_macros_host_n[<triggerid>]
+	 * @param array  $expr_macros_host_n[<triggerid>][<key>]
+	 * @param array  $expr_macros_host_n[<triggerid>][<key>][<macro>]
+	 * @param string $expr_macros_host_n[<triggerid>][<key>][<macro>]['host']
+	 * @param array  $expr_macros_host
+	 * @param array  $expr_macros_host[<hostid>]
+	 * @param array  $expr_macros_host[<hostid>][<key>]
+	 * @param array  $expr_macros_host[<hostid>][<key>][<macro>]
+	 * @param string $expr_macros_host[<hostid>][<key>][<macro>]['host']
+	 * @param array  $expr_macros
+	 * @param array  $expr_macros[<macro>]
+	 * @param string $expr_macros[<macro>]['host']
+	 * @param array  $expr_macros[<macro>]['links']
+	 * @param array  $expr_macros[<macro>]['links'][<macro>]         An array of keys.
+	 * @param array  $macro_values
+	 * @param array  $macro_values[<key>]
+	 * @param array  $macro_values[<key>][<macro>]
+	 * @param array  $trigger_hosts_by_f_num
+	 * @param array  $trigger_hosts_by_f_num[<triggerid>]            An array of host IDs.
+	 *
+	 * @return array
+	 */
+	protected static function getExpressionNMacros(array $expr_macros_host_n, array $expr_macros_host,
+			array $expr_macros, array $macro_values): array {
+		if (!$expr_macros_host_n && !$expr_macros_host && !$expr_macros) {
+			return $macro_values;
+		}
+
+		$trigger_hosts_by_f_num = self::getExpressionHosts(array_keys($expr_macros_host_n), true);
+		$macro_parser = new CMacroParser(['macros' => ['{HOST.HOST}'], 'ref_type' => CMacroParser::REFERENCE_NUMERIC]);
+
+		foreach ($expr_macros_host_n as $triggerid => $keys) {
+			if (!array_key_exists($triggerid, $trigger_hosts_by_f_num)) {
+				continue;
+			}
+
+			foreach ($keys as $key => $_macros) {
+				foreach ($_macros as $_macro => $data) {
+					if ($data['host'] === '') {
+						$reference = 0;
+						$pattern = '#//#';
+					}
+					else {
+						$macro_parser->parse($data['host']);
+						$reference = $macro_parser->getReference();
+						$pattern = '#/\{HOST\.HOST[1-9]?\}/#';
+					}
+
+					if (!array_key_exists($reference, $trigger_hosts_by_f_num[$triggerid])) {
+						continue;
+					}
+
+					$host = $trigger_hosts_by_f_num[$triggerid][$reference];
+
+					// Replace {HOST.HOST<1-9>} macro with real host name.
+					$macro = preg_replace($pattern, '/'.$host.'/', $_macro, 1);
+
+					if (!array_key_exists($macro, $expr_macros)) {
+						$expr_macros[$macro] = ['host' => $host] + $data;
+					}
+					$expr_macros[$macro]['links'][$_macro][] = $key;
+				}
+			}
+		}
+
+		$db_hosts = $expr_macros_host
+			? API::Host()->get([
+				'output' => ['host'],
+				'hostids' => array_keys($expr_macros_host),
+				'preservekeys' => true
+			])
+			: [];
+
+		foreach ($expr_macros_host as $hostid => $keys) {
+			if (!array_key_exists($hostid, $db_hosts)) {
+				continue;
+			}
+
+			foreach ($keys as $key => $_macros) {
+				foreach ($_macros as $_macro => $data) {
+					// Replace {HOST.HOST} macro with real host name.
+					$pattern = $data['host'] === '' ? '#//#' : '#/\{HOST\.HOST\}/#';
+					$macro = preg_replace($pattern, '/'.$db_hosts[$hostid]['host'].'/', $_macro, 1);
+
+					if (!array_key_exists($macro, $expr_macros)) {
+						$expr_macros[$macro] = ['host' => $db_hosts[$hostid]['host']] + $data;
+					}
+					$expr_macros[$macro]['links'][$_macro][] = $key;
+				}
+			}
+		}
+
+		$expr_macro_values = self::getExpressionMacros($expr_macros, []);
+
+		foreach ($expr_macros as $macro => $expr_macro) {
+			if (!array_key_exists($macro, $expr_macro_values)) {
+				continue;
+			}
+
+			foreach ($expr_macro['links'] as $_macro => $keys) {
+				foreach ($keys as $key) {
+					$macro_values[$key][$_macro] = $expr_macro_values[$macro];
+				}
+			}
+		}
+
+		return $macro_values;
+	}
+
+	/**
+	 * Is type available.
+	 *
+	 * @param string $type
+	 *
+	 * @return bool
+	 */
+	protected function isTypeAvailable($type) {
+		return in_array($type, $this->configs[$this->config]['types']);
 	}
 
 	/**
diff --git a/ui/include/classes/macros/CMacrosResolverHelper.php b/ui/include/classes/macros/CMacrosResolverHelper.php
index 9b7af0f5da5..86c3b7fc521 100644
--- a/ui/include/classes/macros/CMacrosResolverHelper.php
+++ b/ui/include/classes/macros/CMacrosResolverHelper.php
@@ -438,86 +438,77 @@ class CMacrosResolverHelper {
 	}
 
 	/**
-	 * Resolve positional macros and functional item macros, for example, {{HOST.HOST1}:key.func(param)}.
+	 * Resolve expression macros. For example, {?func(/host/key, param)} or {?func(/{HOST.HOST1}/key, param)}.
 	 *
 	 * @static
 	 *
-	 * @param type   $name					string in which macros should be resolved
-	 * @param array  $items					list of graph items
-	 * @param int    $items[n]['hostid']	graph n-th item corresponding host Id
-	 * @param string $items[n]['host']		graph n-th item corresponding host name
+	 * @param string $name
+	 * @param array  $items
+	 * @param string $items[]['hostid']
+	 * @param string $items[]['host']
 	 *
-	 * @return string	string with macros replaced with corresponding values
+	 * @return string  A graph name with resolved macros.
 	 */
 	public static function resolveGraphName($name, array $items) {
 		self::init();
 
-		$graph = self::$macrosResolver->resolve([
-			'config' => 'graphName',
-			'data' => [['name' => $name, 'items' => $items]]
-		]);
-		$graph = reset($graph);
-
-		return $graph['name'];
+		return self::$macrosResolver->resolveGraphNames([['name' => $name, 'items' => $items]])[0]['name'];
 	}
 
 	/**
-	 * Resolve positional macros and functional item macros, for example, {{HOST.HOST1}:key.func(param)}.
-	 * ! if same graph will be passed more than once only name for first entry will be resolved.
+	 * Resolve expression macros. For example, {?func(/host/key, param)} or {?func(/{HOST.HOST1}/key, param)}.
 	 *
 	 * @static
 	 *
-	 * @param array  $data					list or hashmap of graphs
-	 * @param int    $data[n]['graphid']	id of graph
-	 * @param string $data[n]['name']		name of graph
+	 * @param array  $graphs
+	 * @param string $graphs[]['graphid']
+	 * @param string $graphs[]['name']
 	 *
-	 * @return array	inputted data with resolved names
+	 * @return array	Inputted data with resolved graph name.
 	 */
-	public static function resolveGraphNameByIds(array $data) {
+	public static function resolveGraphNameByIds(array $graphs) {
 		self::init();
 
-		$graphIds = [];
-		$graphMap = [];
-		foreach ($data as $graph) {
-			// skip graphs without macros
-			if (strpos($graph['name'], '{') !== false) {
-				$graphMap[$graph['graphid']] = [
+		$_graphs = [];
+
+		foreach ($graphs as $graph) {
+			// Skip graphs without expression macros.
+			if (strpos($graph['name'], '{?') !== false) {
+				$_graphs[$graph['graphid']] = [
 					'graphid' => $graph['graphid'],
 					'name' => $graph['name'],
 					'items' => []
 				];
-				$graphIds[$graph['graphid']] = $graph['graphid'];
 			}
 		}
 
+		if (!$_graphs) {
+			return $graphs;
+		}
+
 		$items = DBfetchArray(DBselect(
-			'SELECT i.hostid,gi.graphid,h.host'.
+			'SELECT gi.graphid,h.host'.
 			' FROM graphs_items gi,items i,hosts h'.
 			' WHERE gi.itemid=i.itemid'.
 				' AND i.hostid=h.hostid'.
-				' AND '.dbConditionInt('gi.graphid', $graphIds).
+				' AND '.dbConditionInt('gi.graphid', array_keys($_graphs)).
 			' ORDER BY gi.sortorder'
 		));
 
 		foreach ($items as $item) {
-			$graphMap[$item['graphid']]['items'][] = ['hostid' => $item['hostid'], 'host' => $item['host']];
+			$_graphs[$item['graphid']]['items'][] = ['host' => $item['host']];
 		}
 
-		$graphMap = self::$macrosResolver->resolve([
-			'config' => 'graphName',
-			'data' => $graphMap
-		]);
+		$_graphs = self::$macrosResolver->resolveGraphNames($_graphs);
 
-		$resolvedGraph = reset($graphMap);
-		foreach ($data as &$graph) {
-			if ($resolvedGraph && $graph['graphid'] === $resolvedGraph['graphid']) {
-				$graph['name'] = $resolvedGraph['name'];
-				$resolvedGraph = next($graphMap);
+		foreach ($graphs as &$graph) {
+			if (array_key_exists($graph['graphid'], $_graphs)) {
+				$graph['name'] = $_graphs[$graph['graphid']]['name'];
 			}
 		}
 		unset($graph);
 
-		return $data;
+		return $graphs;
 	}
 
 	/**
@@ -577,18 +568,35 @@ class CMacrosResolverHelper {
 	}
 
 	/**
-	 * Expand functional macros in given map label.
+	 * Expand functional macros in given map link labels.
 	 *
-	 * @param string $label			label to expand
-	 * @param array  $replaceHosts	list of hosts in order which they appear in trigger expression if trigger label is
-	 * given, or single host when host label is given
+	 * @param array  $links
+	 * @param string $links[]['label']
+	 * @param array  $fields            A mapping between source and destination fields.
 	 *
-	 * @return string
+	 * @return array
+	 */
+	public static function resolveMapLinkLabelMacros(array $links, array $fields = ['label' => 'label']): array {
+		self::init();
+
+		return self::$macrosResolver->resolveMapLinkLabelMacros($links, $fields);
+	}
+
+	/**
+	 * Expand functional macros in given map shape labels.
+	 *
+	 * @param string $map_name
+	 * @param array  $shapes
+	 * @param string $shapes[]['text']
+	 * @param array  $fields            A mapping between source and destination fields.
+	 *
+	 * @return array
 	 */
-	public static function resolveMapLabelMacros($label, array $replaceHosts = []) {
+	public static function resolveMapShapeLabelMacros(string $map_name, array $shapes,
+			array $fields = ['text' => 'text']): array {
 		self::init();
 
-		return self::$macrosResolver->resolveMapLabelMacros($label, $replaceHosts);
+		return self::$macrosResolver->resolveMapShapeLabelMacros($map_name, $shapes, $fields);
 	}
 
 	/**
diff --git a/ui/include/classes/parsers/CExpressionMacroFunctionParser.php b/ui/include/classes/parsers/CExpressionMacroFunctionParser.php
index e1c74fc188f..dbd3caa343e 100644
--- a/ui/include/classes/parsers/CExpressionMacroFunctionParser.php
+++ b/ui/include/classes/parsers/CExpressionMacroFunctionParser.php
@@ -38,7 +38,12 @@ class CExpressionMacroFunctionParser extends CParser {
 	 * Set up necessary parsers.
 	 */
 	public function __construct() {
-		$this->expression_macro_parser = new CExpressionMacroParser();
+		$this->expression_macro_parser = new CExpressionMacroParser([
+			'usermacros' => true,
+			'lldmacros' => true,
+			'host_macro_n' => true,
+			'empty_host' => true
+		]);
 		$this->function_parser = new C10FunctionParser();
 	}
 
diff --git a/ui/include/classes/parsers/CExpressionMacroParser.php b/ui/include/classes/parsers/CExpressionMacroParser.php
index e36021d488f..c025f5f4981 100644
--- a/ui/include/classes/parsers/CExpressionMacroParser.php
+++ b/ui/include/classes/parsers/CExpressionMacroParser.php
@@ -35,14 +35,39 @@ class CExpressionMacroParser extends CParser {
 	private $error = '';
 
 	/**
+	 * An options array.
+	 *
+	 * Supported options:
+	 *   'usermacros' => false    Enable user macros usage in expression.
+	 *   'lldmacros' => false     Enable low-level discovery macros usage in expression.
+	 *   'host_macro' => false    Allow {HOST.HOST} macro as host name part in the query.
+	 *   'host_macro_n' => false  Allow {HOST.HOST} and {HOST.HOST<1-9>} macros as host name part in the query.
+	 *   'empty_host' => false    Allow empty hostname in the query string.
+	 *
+	 * @var array
+	 */
+	private $options = [
+		'usermacros' => false,
+		'lldmacros' => false,
+		'host_macro' => false,
+		'host_macro_n' => false,
+		'empty_host' => false
+	];
+
+	/**
 	 * Set up necessary parsers.
+	 *
+	 * @param array $options
 	 */
-	public function __construct() {
+	public function __construct(array $options = []) {
+		$this->options = $options + $this->options;
+
 		$this->expression_parser = new CExpressionParser([
-			'usermacros' => true,
-			'lldmacros' => true,
-			'host_macro_n' => true,
-			'empty_host' => true
+			'usermacros' => $this->options['usermacros'],
+			'lldmacros' => $this->options['lldmacros'],
+			'host_macro' => $this->options['host_macro'],
+			'host_macro_n' => $this->options['host_macro_n'],
+			'empty_host' => $this->options['empty_host']
 		]);
 	}
 
@@ -90,6 +115,7 @@ class CExpressionMacroParser extends CParser {
 
 		$this->length = $p - $pos;
 		$this->match = substr($source, $pos, $this->length);
+		$this->tokens = $this->expression_parser->getResult()->getTokens();
 
 		return (isset($source[$p]) ? CParser::PARSE_SUCCESS_CONT : CParser::PARSE_SUCCESS);
 	}
@@ -103,4 +129,12 @@ class CExpressionMacroParser extends CParser {
 		return $this->error;
 	}
 
+	/**
+	 * Returns the expression parser.
+	 *
+	 * @return CExpressionParser
+	 */
+	public function getExpressionParser(): CExpressionParser {
+		return $this->expression_parser;
+	}
 }
diff --git a/ui/include/classes/validators/CEventNameValidator.php b/ui/include/classes/validators/CEventNameValidator.php
index 048468bb5ba..8b65ecd38d6 100644
--- a/ui/include/classes/validators/CEventNameValidator.php
+++ b/ui/include/classes/validators/CEventNameValidator.php
@@ -33,7 +33,12 @@ class CEventNameValidator extends CValidator {
 	 */
 	public function validate($value) {
 		$p = 0;
-		$expr_macro = new CExpressionMacroParser();
+		$expr_macro = new CExpressionMacroParser([
+			'usermacros' => true,
+			'lldmacros' => true,
+			'host_macro_n' => true,
+			'empty_host' => true
+		]);
 		$expr_func_macro = new CExpressionMacroFunctionParser();
 
 		while (isset($value[$p])) {
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index 78d927ab99e..1e6a082023d 100644
--- a/ui/include/defines.inc.php
+++ b/ui/include/defines.inc.php
@@ -22,7 +22,7 @@ define('ZABBIX_VERSION',		'6.0.0alpha2');
 define('ZABBIX_API_VERSION',	'6.0.0');
 define('ZABBIX_EXPORT_VERSION',	'6.0');
 
-define('ZABBIX_DB_VERSION',		5050055);
+define('ZABBIX_DB_VERSION',		5050068);
 
 define('DB_VERSION_SUPPORTED',				0);
 define('DB_VERSION_LOWER_THAN_MINIMUM',		1);
@@ -153,8 +153,9 @@ define('ZBX_DB_MAX_ID', '9223372036854775807');
 define('ZBX_DB_MAX_INSERTS', 10000);
 
 // Default db and field character set (MYSQL & POSTGRESQL)
-define('ZBX_DB_DEFAULT_CHARSET', 'UTF8');
-define('ZBX_DB_MYSQL_DEFAULT_COLLATION', 'utf8_bin');
+define('ZBX_DB_POSTGRESQL_ALLOWED_CHARSET', 'UTF8');
+define('ZBX_DB_MYSQL_ALLOWED_CHARSETS', ['UTF8', 'UTF8MB3']);
+define('ZBX_DB_MYSQL_ALLOWED_COLLATIONS', ['utf8_bin', 'utf8mb3_bin']);
 
 // Default db defines for Oracle DB
 define('ORACLE_MAX_STRING_SIZE', 4000);
@@ -1233,37 +1234,6 @@ define('ZBX_PREG_HOST_FORMAT', ZBX_PREG_INTERNAL_NAMES);
 define('ZBX_PREG_MACRO_NAME_FORMAT', '(\{[A-Z\.]+\})');
 define('ZBX_PREG_EXPRESSION_LLD_MACROS', '(\{\#'.ZBX_PREG_MACRO_NAME_LLD.'\})');
 
-// !!! should be used with "x" modifier
-define('ZBX_PREG_ITEM_KEY_PARAMETER_FORMAT', '(
-	(?P>param) # match recursive parameter group
-	|
-	(\" # match quoted string
-		(
-			((\\\\)+?[^\\\\]) # match any amount of backslash with non-backslash ending
-			|
-			[^\"\\\\] # match any character except \ or "
-		)*? # match \" or any character except "
-	\")
-	|
-	[^\"\[\],][^,\]]*? #match unquoted string - any character except " [ ] and , at beginning and any character except , and ] afterwards
-	|
-	() # match empty and only empty part
-)');
-define('ZBX_PREG_ITEM_KEY_FORMAT', '([0-9a-zA-Z_\. \-]+? # match key
-(?P<param>( # name parameter group used in recursion
-	\[ # match opening bracket
-		(
-			\s*?'.ZBX_PREG_ITEM_KEY_PARAMETER_FORMAT .' # match spaces and parameter
-			(
-				\s*?,\s*? # match spaces, comma and spaces
-				'.ZBX_PREG_ITEM_KEY_PARAMETER_FORMAT .' # match parameter
-			)*? # match spaces, comma, spaces, parameter zero or more times
-			\s*? #matches spaces
-		)
-	\] # match closing bracket
-))*? # matches non comma separated brackets with parameters zero or more times
-)');
-
 define('TRIGGER_QUERY_PLACEHOLDER', '$'); // !!! Don't forget sync code with C !!!
 
 define('ZBX_USER_ONLINE_TIME', 600); // 10min
diff --git a/ui/js/class.cmap.js b/ui/js/class.cmap.js
index 9bc5cc4f9a2..324fa33500f 100644
--- a/ui/js/class.cmap.js
+++ b/ui/js/class.cmap.js
@@ -305,6 +305,7 @@ ZABBIX.apps.map = (function($) {
 							favobj: 'sysmap',
 							action: 'expand',
 							sysmapid: this.sysmapid,
+							name: this.data.name,
 							source: JSON.stringify(post)
 						},
 						success: function(data) {
@@ -383,12 +384,6 @@ ZABBIX.apps.map = (function($) {
 					}, this);
 
 					shape['text'] = this.shapes[key].getLabel();
-
-					if (this.data.expand_macros === '1' && typeof(shape['text']) === 'string' && shape['text'] !== '') {
-						// Additional macro that is supported in shapes is {MAP.NAME}
-						shape['text'] = shape['text'].replace(/\{MAP\.NAME\}/g, this.data.name);
-					}
-
 					shapes.push(shape);
 				}, this);
 
diff --git a/ui/jsLoader.php b/ui/jsLoader.php
index 96fbd9ed5b4..3b5382b7eb6 100644
--- a/ui/jsLoader.php
+++ b/ui/jsLoader.php
@@ -142,16 +142,21 @@ $tranStrings = [
 	],
 	'class.dashboard.js' => [
 		'Actions' => _('Actions'),
+		'Add page' => _('Add page'),
+		'Add widget' => _('Add widget'),
 		'Cannot add dashboard page: maximum number of %1$d dashboard pages has been added.' => _('Cannot add dashboard page: maximum number of %1$d dashboard pages has been added.'),
 		'Cannot add widget: not enough free space on the dashboard.' => _('Cannot add widget: not enough free space on the dashboard.'),
 		'Copy' => _('Copy'),
 		'Delete' => _('Delete'),
+		'Failed to create dashboard' => _('Failed to create dashboard'),
 		'Failed to paste dashboard page.' => _('Failed to paste dashboard page.'),
 		'Failed to paste widget.' => _('Failed to paste widget.'),
+		'Failed to update dashboard' => _('Failed to update dashboard'),
 		'Failed to update dashboard page properties.' => _('Failed to update dashboard page properties.'),
 		'Failed to update dashboard properties.' => _('Failed to update dashboard properties.'),
 		'Failed to update widget properties.' => _('Failed to update widget properties.'),
 		'Page %1$d' => _('Page %1$d'),
+		'Paste page' => _('Paste page'),
 		'Paste widget' => _('Paste widget'),
 		'Properties' => _('Properties'),
 		'Start slideshow' => _('Start slideshow'),
diff --git a/ui/locale/bg/LC_MESSAGES/frontend.po b/ui/locale/bg/LC_MESSAGES/frontend.po
index f88a8e6eb91..02737d53b02 100644
--- a/ui/locale/bg/LC_MESSAGES/frontend.po
+++ b/ui/locale/bg/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-01-12 23:52+0300\n"
 "Last-Translator: Fahri <fahri_hasan@hotmail.com>\n"
 "Language-Team: \n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr "(без прокси)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 или 1"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "И"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Достъпът отказан!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Потвърдено"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Потвърждавам"
 
@@ -499,7 +499,7 @@ msgstr "Потвърждавам"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Потвърдено"
@@ -528,20 +528,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -646,7 +648,7 @@ msgstr "Действие актуализирано"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -655,7 +657,7 @@ msgstr "Действие актуализирано"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Действия"
@@ -714,8 +716,8 @@ msgstr "Активно до"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -726,7 +728,6 @@ msgstr "Активно до"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -734,11 +735,13 @@ msgstr "Активно до"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -750,15 +753,17 @@ msgstr "Активно до"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -825,7 +830,7 @@ msgstr "Активно до"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Добави"
 
@@ -833,19 +838,19 @@ msgstr "Добави"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -862,7 +867,7 @@ msgstr "Добави хост"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -879,7 +884,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -887,7 +896,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -921,7 +930,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -930,12 +939,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Администратор"
@@ -945,6 +962,10 @@ msgstr "Администратор"
 msgid "Administration"
 msgstr "Администрация"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Разширени етикети"
@@ -1031,7 +1052,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Всички"
 
@@ -1040,8 +1061,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1049,7 +1070,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Във всички връзки трябва да са уточнени \"Име\" и \"URL\""
 
@@ -1083,7 +1104,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1096,7 +1117,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Позволени хостове"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1114,7 +1135,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1155,12 +1176,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1180,15 +1201,15 @@ msgstr "Грешка в приложението."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Прилагане"
 
@@ -1206,7 +1227,7 @@ msgstr "Приближаване"
 msgid "Apr"
 msgstr "Апр"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Април"
 
@@ -1234,6 +1255,10 @@ msgstr "Тип област"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Като обикновен текст"
@@ -1282,8 +1307,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1361,7 +1386,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Авг"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Август"
 
@@ -1391,7 +1416,7 @@ msgstr "Автентификация"
 msgid "Authentication algorithm"
 msgstr "Алгоритъм за автентификация"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1440,7 +1465,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Автоматичен вход"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1450,7 +1475,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1636,11 +1661,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Долен"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1721,7 +1746,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Изчислено"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1741,8 +1766,8 @@ msgstr "Обратно повикване"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1759,8 +1784,8 @@ msgstr "Обратно повикване"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -1790,7 +1815,7 @@ msgstr "Не може да се добави действие"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1801,7 +1826,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Не може да се добави зависимост от хост към шаблон."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1920,7 +1945,7 @@ msgid "Cannot add user"
 msgstr "Не може да се добави потребител"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1928,11 +1953,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Не може да се добави уеб сценарий"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2013,7 +2038,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Не може да се копира тригер \"%1$s:%2$s\", защото има множество хостове в израза."
@@ -2069,7 +2094,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Не може да се изтрие Zabbix вътрешен потребител \"%1$s\", опитайте с изключване на този потребител."
@@ -2490,7 +2515,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2660,7 +2685,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2722,7 +2747,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Не може да се преименува гост потребителя."
 
@@ -2781,7 +2806,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3204,6 +3234,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3345,7 +3376,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Проверките трябва да са уникални."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3387,11 +3418,11 @@ msgstr "Изчисти историята и динамиката на пром�
 msgid "Clear when unlinking"
 msgstr "Изчисти когато се прекрати връзката"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3421,7 +3452,7 @@ msgstr "Часовник"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Клониране"
 
@@ -3432,8 +3463,8 @@ msgstr "Клониране"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Затвори"
 
@@ -3463,8 +3494,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3481,7 +3512,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3549,6 +3580,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Условие"
 
@@ -3603,7 +3635,7 @@ msgstr "Условия"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Конфигурация"
 
@@ -3867,7 +3899,7 @@ msgstr "Информация за контакти"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3904,8 +3936,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3966,8 +3998,8 @@ msgstr "Координати"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Копирай"
 
@@ -4097,11 +4129,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4219,7 +4251,7 @@ msgstr "Създаване на карта"
 msgid "Create media type"
 msgstr "Създаване на метод на уведомление"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4235,7 +4267,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Създаване на скрипт"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4243,7 +4275,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Създаване на шаблон"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Създаване на тригер"
 
@@ -4463,7 +4495,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4493,7 +4525,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4663,7 +4695,7 @@ msgstr "Ден от седмицата"
 msgid "Days"
 msgstr "Дни"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Отстраняване на грешки"
 
@@ -4677,7 +4709,7 @@ msgstr "Режим за отстраняване на грешки"
 msgid "Dec"
 msgstr "Дек"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Декември"
 
@@ -4686,13 +4718,17 @@ msgstr "Декември"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -4762,8 +4798,8 @@ msgid "Delayed by"
 msgstr "Закъснение с"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4777,7 +4813,7 @@ msgstr "Закъснение с"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4809,8 +4845,8 @@ msgstr "Закъснение с"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -4839,7 +4875,7 @@ msgstr "Изтриване на текущото действие?"
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4884,7 +4920,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr "Изтриване на елемент на данните?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Изтриване на връзките между избраните елементи?"
 
@@ -4940,7 +4976,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Изтриване на избраните правила за откриване?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Изтриване на избраните елементи?"
 
@@ -5041,11 +5077,11 @@ msgstr "Изтриване на избраните скриптове?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5061,7 +5097,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Изтриване на избраните тригери?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Изтриване на избрания потребител?"
 
@@ -5112,7 +5148,7 @@ msgstr "Изтрито: Шаблон \"%1$s\"."
 msgid "Delimiter"
 msgstr "Разделител"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5126,7 +5162,7 @@ msgstr "Отказ"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5134,7 +5170,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Зависим"
 
@@ -5142,7 +5178,7 @@ msgstr "Зависим"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5170,7 +5206,7 @@ msgstr "Състояние на разгръщане"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5334,7 +5370,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5347,14 +5383,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5437,7 +5473,7 @@ msgid "Discovery by proxy"
 msgstr "Откриване чрез прокси"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Проверка за откриване"
 
@@ -5449,7 +5485,7 @@ msgstr "Проверки за откриване"
 msgid "Discovery list"
 msgstr "Списък за откриване"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Обект за откриване"
 
@@ -5549,7 +5585,7 @@ msgstr "Правило за откриване актуализирано"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5560,7 +5596,7 @@ msgstr "Правила за откриване"
 msgid "Discovery rules deleted"
 msgstr "Правила за откриване изтрити"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Статус на откриване"
@@ -5600,7 +5636,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Показване на %1$s от %2$s намерени"
@@ -5618,10 +5654,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Без изчисляване"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5636,7 +5668,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Желаете ли да замени условния израз?"
 
@@ -5692,7 +5724,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недостъпен"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5701,7 +5733,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Време на прекъсване"
@@ -5777,7 +5809,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5799,7 +5831,7 @@ msgstr "Динамичен елемент на данните"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Всеки URL адрес трябва да има уникално име. Моля, уверете се, че има само едно URL с това име "
 
@@ -5807,13 +5839,14 @@ msgstr "Всеки URL адрес трябва да има уникално им
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5825,8 +5858,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Редактиране"
 
@@ -5842,11 +5875,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Редактиране на тригер"
 
@@ -6121,7 +6154,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6143,12 +6176,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6207,7 +6240,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6231,7 +6264,7 @@ msgstr "Грешка"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Грешка в заявката за търсене за таблица \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6271,7 +6304,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Детайли за събитието"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Генериране на събитие"
 
@@ -6301,7 +6334,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6335,7 +6368,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Изключване"
 
@@ -6346,7 +6379,7 @@ msgstr "Изключване"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Изпълнение"
 
@@ -6392,7 +6425,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Изпълнение на скрипт"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Потвърждение на изпълнение"
 
@@ -6408,8 +6441,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6476,7 +6509,7 @@ msgstr "Експортиране в CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6530,7 +6563,7 @@ msgstr "Изрази"
 msgid "External check"
 msgstr "Външна проверка"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
@@ -6554,7 +6587,7 @@ msgid "Failed"
 msgstr "Неуспешно"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6563,24 +6596,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6588,7 +6621,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6612,7 +6645,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Фев"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Февруари"
 
@@ -6758,8 +6791,8 @@ msgstr "Запълване"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6837,6 +6870,10 @@ msgstr "Въведете в картата на мрежата"
 msgid "Fixed"
 msgstr "Фиксирано"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6902,14 +6939,14 @@ msgstr "Френски (fr_FR)"
 msgid "Fri"
 msgstr "Пт"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Петък"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6927,7 +6964,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Достъп до уеб интерфейс"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Съобщения в уеб интерфейс"
 
@@ -7009,7 +7046,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Като се има предвид, израза не е макро"
 
@@ -7027,7 +7064,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Отиди на"
 
@@ -7076,7 +7113,7 @@ msgstr "Градиентна линия"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7237,7 +7274,7 @@ msgstr "Графика с името \"%1$s\" вече съществува в �
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Графики"
 
@@ -7438,11 +7475,11 @@ msgstr "Помощ"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Скрит"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7487,14 +7524,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "История"
 
@@ -7558,7 +7595,7 @@ msgstr "Хоризонтално подравняване"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7566,8 +7603,7 @@ msgstr "Хоризонтално подравняване"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7579,7 +7615,7 @@ msgstr "Хоризонтално подравняване"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7659,7 +7695,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7667,7 +7703,7 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Хост група"
@@ -7698,7 +7734,7 @@ msgstr "Тип етикет на хост група"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7715,7 +7751,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7754,7 +7790,7 @@ msgstr "Хост интерфейс"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7902,7 +7938,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8139,14 +8175,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Ако смятате, че това съобщение е грешно, моля консултирайте се с администраторите за получаване на необходимите права."
@@ -8155,12 +8243,16 @@ msgstr "Ако смятате, че това съобщение е грешно,
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Изображение"
 
@@ -8290,7 +8382,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8303,11 +8395,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8333,7 +8425,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Включва"
 
@@ -8351,6 +8443,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8741,7 +8838,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Използва се неправилна функция"
 
@@ -8798,7 +8895,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "В тригер израза \"%2$s\" е зададен неправилен ключ за елемента на данните \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8829,7 +8926,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8969,10 +9066,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9279,9 +9376,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9353,6 +9450,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Индонезийски (id_ID)"
@@ -9364,12 +9465,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9442,7 +9543,7 @@ msgid "Insert"
 msgstr "Вмъкване"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9550,7 +9651,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9598,7 +9699,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9701,8 +9802,8 @@ msgstr "Невалидни параметри на метода."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9906,7 +10007,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Инвентаризация"
 
@@ -10096,7 +10197,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10257,7 +10358,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Яну"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Януари"
 
@@ -10279,7 +10380,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Юли"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Юли"
 
@@ -10287,7 +10388,7 @@ msgstr "Юли"
 msgid "Jun"
 msgstr "Юни"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Юни"
 
@@ -10321,7 +10422,7 @@ msgstr "Ключ"
 msgid "Key passphrase"
 msgstr "Ключ фраза за достъп"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Ключова дума"
 
@@ -10391,7 +10492,7 @@ msgstr "Разположение на етикет"
 msgid "Language"
 msgstr "Език"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10470,11 +10571,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Последна проверка"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Графика за последния час"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Графика за последния месец"
 
@@ -10512,7 +10613,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Последна стойност"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Графика за последната седмица"
 
@@ -10525,11 +10626,11 @@ msgstr "Графика за последната седмица"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Последни данни"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10640,7 +10741,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10718,12 +10819,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10851,7 +10952,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
@@ -11011,7 +11112,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11040,7 +11141,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Карта на мрежата"
 
@@ -11079,7 +11180,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11105,7 +11206,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11141,7 +11242,7 @@ msgstr "Карти на мрежата"
 msgid "Mar"
 msgstr "Мар"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Март"
 
@@ -11168,7 +11269,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11239,9 +11340,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11254,12 +11355,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Май"
 
@@ -11269,8 +11370,8 @@ msgid "May"
 msgstr "Май"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Уведомления"
 
@@ -11333,7 +11434,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Метод на уведомление актуализирано"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11406,8 +11507,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 #, fuzzy
 msgid "Message timeout"
 msgstr "Време преди изключване на съобщенията"
@@ -11426,7 +11527,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Съобщения"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Съобщения"
 
@@ -11454,6 +11555,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11469,11 +11575,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11619,7 +11720,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Пн"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -11659,11 +11760,11 @@ msgstr "Месец"
 msgid "Monthly"
 msgstr "Ежемесечно"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11679,6 +11780,14 @@ msgstr "Повече от 10 минути"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Повече от една графика с името \"%1$s\" в хост."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11688,11 +11797,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Множество събития с ПРОБЛЕМ"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Изключване на звука"
 
@@ -11700,6 +11809,18 @@ msgstr "Изключване на звука"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11794,25 +11915,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11955,6 +12077,10 @@ msgstr ""
 msgid "Never"
 msgstr "Никога"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11966,7 +12092,7 @@ msgstr "Ново състояние"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Нов елемент"
 
@@ -11990,7 +12116,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Нов регулярен израз"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12007,7 +12133,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12025,20 +12151,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12171,7 +12297,7 @@ msgstr "Няма подробности"
 msgid "No discovery rule IDs given."
 msgstr "Не уточнено ID на правило за откриване."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12233,7 +12359,7 @@ msgstr "Няма изображение"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Не е открит интерфейс"
 
@@ -12273,7 +12399,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12286,8 +12412,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Нямате право на достъп до системата."
 
@@ -12299,7 +12425,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12307,11 +12432,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12429,19 +12555,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12450,15 +12576,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12485,7 +12611,7 @@ msgstr "Не е уточнен файла с обществен ключ."
 msgid "No recipients for action operation message."
 msgstr "Няма получатели на съобщение в операция на действие."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12501,7 +12627,7 @@ msgstr "Не е избрана цел"
 msgid "No target selected."
 msgstr "Не е избрана цел."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12548,7 +12674,7 @@ msgstr "Нищо"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12580,15 +12706,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Не е позволено да зададете парола за потребителя \"гост\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12620,8 +12746,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Не се поддържа"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Бележка"
 
@@ -12651,7 +12777,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Ное"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Ноември"
 
@@ -12814,12 +12940,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Числен (с плаваща точка)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12834,18 +12960,17 @@ msgstr "Числен (цяло положително)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "ОК"
@@ -12872,7 +12997,7 @@ msgstr "OOB рутер"
 msgid "OOB subnet mask"
 msgstr "OOB маска на подмрежата"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "ИЛИ"
 
@@ -12900,13 +13025,13 @@ msgstr "Окт"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Октомври"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Изкл"
 
@@ -12918,7 +13043,7 @@ msgstr "Изкл"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ок"
@@ -12937,7 +13062,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Вкл"
 
@@ -12945,7 +13070,7 @@ msgstr "Вкл"
 msgid "On status change triggers blink for"
 msgstr "Мигане на тригери при промяна на състоянието "
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Веднъж"
 
@@ -12962,7 +13087,7 @@ msgid "One time only"
 msgstr "Само един път"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Еднократна недостъпност"
 
@@ -12974,26 +13099,14 @@ msgstr "Само Супер Администраторите могат да с�
 msgid "Only Super Admins can create media types."
 msgstr "Само Супер Администраторите могат да създават методи на уведомление."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Само Супер Администраторите могат да изтриват методи на уведомление."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Само Супер Администраторите могат да изтриват потребителски групи."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Само Супер Администраторите могат да редактират методи на уведомление."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13034,11 +13147,11 @@ msgid_plural "Only selected problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13071,7 +13184,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13096,7 +13209,7 @@ msgstr "Операцията няма група за да функционир�
 msgid "Operation has no template to operate."
 msgstr "Операцията няма шаблон за да функционира."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13121,27 +13234,27 @@ msgstr "Операции"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Оператор"
 
@@ -13166,7 +13279,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13183,8 +13296,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13231,9 +13344,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Оригинал"
 
@@ -13485,7 +13598,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМ"
@@ -13532,7 +13645,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13555,13 +13668,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Параметър"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13592,9 +13707,7 @@ msgstr "Родителски елементи на данните"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13683,15 +13796,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13765,19 +13882,20 @@ msgid "Periods"
 msgstr "Периоди"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Права за достъп"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права за достъп може да бъдат назначен само за потребителски групи."
 
@@ -13799,12 +13917,12 @@ msgstr "Поставяне на алгоритъм"
 msgid "Plain text"
 msgstr "Обикновен текст"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Възпроизвеждане"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Възпроизвеждане на звук"
 
@@ -13834,7 +13952,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Моля, изберете два елемента"
 
@@ -13963,7 +14081,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14022,7 +14140,7 @@ msgstr "Защита фраза за достъп"
 msgid "Privacy protocol"
 msgstr "Протокол за поверителност"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14042,12 +14160,12 @@ msgid "Privilege level"
 msgstr "Ниво на привилегия"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14077,7 +14195,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Показване на проблем"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14095,7 +14213,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Проблем на"
 
@@ -14108,8 +14226,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14122,14 +14240,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Проблем, ако всички деца имат проблеми"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Проблем, ако най-малко едно дете има проблем"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14146,7 +14256,7 @@ msgstr "Проблем, ако най-малко едно дете има про
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Проблеми"
 
@@ -14180,12 +14290,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14207,7 +14317,7 @@ msgstr "Проксита"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14270,7 +14380,7 @@ msgstr "Име на прокси"
 msgid "Proxy updated"
 msgstr "Прокси актуализирано"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14364,8 +14474,8 @@ msgstr "Четене"
 msgid "Read only"
 msgstr "Само за четене"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14373,8 +14483,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14427,7 +14537,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14435,7 +14545,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Възстановяване"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14470,7 +14580,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14531,7 +14641,7 @@ msgstr "Регулярни изрази"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14563,6 +14673,7 @@ msgstr "Отдалечена команда"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14572,7 +14683,7 @@ msgstr "Отдалечена команда"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14580,13 +14691,13 @@ msgstr "Отдалечена команда"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14596,8 +14707,8 @@ msgstr "Отдалечена команда"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14674,8 +14785,8 @@ msgstr "Отдалечена команда"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Премахни"
 
@@ -14715,7 +14826,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14744,7 +14855,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14752,7 +14863,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Смени"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Смени зависимостите"
 
@@ -14859,7 +14970,7 @@ msgstr "Необходими кодове за състояние"
 msgid "Required string"
 msgstr "Необходим низ"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Нулиране"
@@ -14893,7 +15004,7 @@ msgstr "Потвърждаване на нулиране"
 msgid "Reset defaults"
 msgstr "Възстанови по подразбиране"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Решено"
 
@@ -15091,8 +15202,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15150,12 +15261,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Руски (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Нд"
@@ -15166,10 +15277,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15382,7 +15491,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Сб"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Събота"
 
@@ -15555,7 +15664,7 @@ msgstr "Скрипт актуализиран"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Скриптове"
 
@@ -15625,8 +15734,8 @@ msgid "Security name"
 msgstr "Име на сигурност"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15634,7 +15743,7 @@ msgstr "Име на сигурност"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Изберете"
 
@@ -15670,19 +15779,19 @@ msgstr "Избрани елементи"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15707,7 +15816,7 @@ msgstr "Изпратете само до"
 msgid "Send to"
 msgstr "Изпрати до"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15740,7 +15849,7 @@ msgstr "Разделен"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Септември"
 
@@ -15772,34 +15881,29 @@ msgid "Server time"
 msgstr "Време на сървъра"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Услуга"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15807,7 +15911,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15836,7 +15940,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Времето за стартиране на услугата трябва да бъде по-малко от крайното време."
 
@@ -15852,11 +15956,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Интервали от време за услуга"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Тип услуга"
 
@@ -15865,7 +15969,7 @@ msgstr "Тип услуга"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Услуга актуализирана"
 
@@ -15874,16 +15978,16 @@ msgstr "Услуга актуализирана"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Услуги"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Услугите образуват кръгова зависимост."
 
@@ -15895,9 +15999,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Сесията е прекратена, моля влезте повторно в системата."
 
@@ -15921,10 +16025,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15965,7 +16077,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16011,7 +16123,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16102,7 +16214,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16153,7 +16265,7 @@ msgstr "Покажи предупреждение, ако Zabbix сървъра
 msgid "Show working time"
 msgstr "Покажи работното време"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Показан"
 
@@ -16262,7 +16374,7 @@ msgstr "Пропуснато копиране на графика \"%1$s\" в х
 msgid "Slovak (sk_SK)"
 msgstr "Словашки (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Заспиване"
 
@@ -16308,7 +16420,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Ред на сортиране (0->999)"
 
@@ -16382,7 +16494,7 @@ msgstr "Започни в"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16430,12 +16542,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16446,17 +16560,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16480,13 +16601,10 @@ msgstr ""
 msgid "Status"
 msgstr "Състояние"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Изчисляване на състояние"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Алгоритъм за изчисляване на състояние"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16517,6 +16635,10 @@ msgstr "Само състояние"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16548,8 +16670,8 @@ msgstr "Стъпка с име \\\"%1$s\\\" вече съществува."
 msgid "Steps"
 msgstr "Стъпки"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Спри"
 
@@ -16561,7 +16683,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16593,7 +16715,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16626,7 +16748,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Подкарта"
 
@@ -16642,7 +16764,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Успешен одит"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16655,7 +16777,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Нед"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -16747,12 +16869,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -16788,8 +16910,8 @@ msgstr "Таблица \"%1$s\" няма поле с име \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Етикет"
@@ -16829,14 +16951,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16844,10 +16965,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17011,7 +17132,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17296,12 +17417,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Чет"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "До"
 
@@ -17311,13 +17432,13 @@ msgstr "До"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17398,7 +17519,7 @@ msgstr "Времева маркировка"
 msgid "To"
 msgstr "Към"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "За да зададете интерфейс за хост изберете един тип елемент на данните за всички елементи на данните"
 
@@ -17520,13 +17641,13 @@ msgstr "Динамика на промените"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Тригер"
 
@@ -17545,7 +17666,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Тригер \"%1$s\" зависи от тригер \"%2$s\", който не съществува."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17629,7 +17750,7 @@ msgstr "Преглед на тригери"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17696,15 +17817,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Важност на тригер "
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17756,7 +17877,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Вто"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -17769,7 +17890,7 @@ msgstr "Турски (tr_TR)"
 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\" инвентарни данни за хост, това ще доведе до конфликт."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17784,15 +17905,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17859,7 +17981,7 @@ msgid "UNKNOWN"
 msgstr "НЕИЗВЕСТЕН"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17869,7 +17991,7 @@ msgstr "НЕИЗВЕСТЕН"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17915,7 +18037,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17963,7 +18085,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18010,7 +18132,8 @@ msgstr "Деблокиране на избраните потребители?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18029,7 +18152,8 @@ msgstr "Единици за измерване"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18040,9 +18164,9 @@ msgstr "Единици за измерване"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -18061,12 +18185,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Неизвестен елемент на данните за хост, няма такъв елемент на данните в избрания хост"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Неизвестен хост, няма такъв хост в системата"
 
@@ -18113,7 +18237,7 @@ msgstr "Прекратяване на връзката от шаблон"
 msgid "Unlink from templates"
 msgstr "Прекратяване на връзката от шаблони"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Включване на звука"
 
@@ -18194,27 +18318,28 @@ msgstr "Достъпен"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18283,7 +18408,7 @@ msgid "Upper level maps"
 msgstr "Ниво на горните карти"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 #, fuzzy
 msgid "Uptime"
@@ -18333,37 +18458,37 @@ msgstr "Използва се в действия"
 msgid "User"
 msgstr "Потребител"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18380,13 +18505,13 @@ msgstr "Потребител добавен"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Потребителят не може да добави себе си към изключена група или група с изключен GUI достъп."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18411,32 +18536,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Потребителска група"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Потребителска група \"%1$s\" се използва в скрипт \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18467,7 +18592,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18475,14 +18600,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Потребителски групи"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Не е позполено на потребителя да изтрие себе си."
 
@@ -18531,7 +18656,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18565,7 +18690,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18586,12 +18711,12 @@ msgstr "Потребител актуализиран"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18636,7 +18761,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18903,23 +19028,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19126,8 +19251,8 @@ msgstr "Вертикално подравняване"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19154,7 +19279,12 @@ msgstr "Видимо име"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Видимото име не може да бъде празно, ако липсва име на хост."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
@@ -19171,11 +19301,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Съжаляваме, достигнат е максималния възможен брой от елементи."
 
@@ -19191,7 +19321,7 @@ msgstr "Съжаляваме, достигнат е максималния въ�
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Уеб"
 
@@ -19261,7 +19391,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Сря"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Сряда"
 
@@ -19272,6 +19402,10 @@ msgstr "Сряда"
 msgid "Weekly"
 msgstr "Ежеседмично"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19289,7 +19423,7 @@ msgstr "Когато е активен"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19502,8 +19636,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19545,19 +19679,19 @@ msgstr "Ежегодно"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19626,19 +19760,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Вие нямате права за извършване на тази операция."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Вие нямате права за създаване на потребители."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19759,7 +19889,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19878,7 +20008,6 @@ msgstr "агент"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20174,9 +20303,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20256,7 +20385,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20303,7 +20432,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "д"
@@ -20502,13 +20631,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "ч"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "чч"
 
@@ -20556,7 +20685,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20782,12 +20911,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "м"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -20891,8 +21020,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "мм"
 
@@ -20987,7 +21116,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21054,7 +21183,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "на"
@@ -21122,7 +21251,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21249,7 +21378,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "кратко описание"
 
@@ -21335,7 +21464,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21345,8 +21474,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21427,7 +21556,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21490,7 +21619,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21517,7 +21646,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21611,7 +21740,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21631,7 +21760,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "стойност"
 
@@ -21778,7 +21907,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "г"
diff --git a/ui/locale/ca/LC_MESSAGES/frontend.po b/ui/locale/ca/LC_MESSAGES/frontend.po
index f22244a307d..3d1d3b49e07 100644
--- a/ui/locale/ca/LC_MESSAGES/frontend.po
+++ b/ui/locale/ca/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-03-19 18:10+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dia"
 msgstr[1] "%1$d dies"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -222,17 +222,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Queda %1$s intent"
 msgstr[1] "Queden %1$s intents"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segon"
 msgstr[1] "%1$s segons"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -307,7 +307,7 @@ msgstr ""
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -457,40 +457,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr ""
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr ""
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr ""
@@ -527,20 +527,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -645,7 +647,7 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -654,7 +656,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr ""
@@ -713,8 +715,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -725,7 +727,6 @@ msgstr ""
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -733,11 +734,13 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -749,15 +752,17 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -824,7 +829,7 @@ msgstr ""
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr ""
 
@@ -832,19 +837,19 @@ msgstr ""
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -861,7 +866,7 @@ msgstr ""
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -878,7 +883,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -886,7 +895,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -920,7 +929,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -929,12 +938,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr ""
@@ -944,6 +961,10 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr ""
@@ -1030,7 +1051,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr ""
 
@@ -1039,8 +1060,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1048,7 +1069,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1082,7 +1103,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1095,7 +1116,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr ""
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1113,7 +1134,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1154,12 +1175,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1179,15 +1200,15 @@ msgstr ""
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr ""
 
@@ -1205,7 +1226,7 @@ msgstr ""
 msgid "Apr"
 msgstr ""
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr ""
 
@@ -1233,6 +1254,10 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr ""
@@ -1281,8 +1306,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1360,7 +1385,7 @@ msgstr ""
 msgid "Aug"
 msgstr ""
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr ""
 
@@ -1390,7 +1415,7 @@ msgstr ""
 msgid "Authentication algorithm"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1439,7 +1464,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1449,7 +1474,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1634,11 +1659,11 @@ msgstr ""
 msgid "Bottom"
 msgstr ""
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1719,7 +1744,7 @@ msgstr ""
 msgid "Calculated"
 msgstr ""
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1739,8 +1764,8 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1757,8 +1782,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr ""
 
@@ -1788,7 +1813,7 @@ msgstr ""
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1799,7 +1824,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
@@ -1918,7 +1943,7 @@ msgid "Cannot add user"
 msgstr ""
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1926,11 +1951,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2011,7 +2036,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
@@ -2066,7 +2091,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
@@ -2480,7 +2505,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2650,7 +2675,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2712,7 +2737,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2771,7 +2796,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3193,6 +3223,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3334,7 +3365,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3376,11 +3407,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3410,7 +3441,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr ""
 
@@ -3421,8 +3452,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr ""
 
@@ -3452,8 +3483,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3470,7 +3501,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3538,6 +3569,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr ""
 
@@ -3592,7 +3624,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr ""
 
@@ -3855,7 +3887,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3892,8 +3924,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3954,8 +3986,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr ""
 
@@ -4085,11 +4117,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4206,7 +4238,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4222,7 +4254,7 @@ msgstr ""
 msgid "Create script"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4230,7 +4262,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr ""
 
@@ -4450,7 +4482,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4480,7 +4512,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4650,7 +4682,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr ""
 
@@ -4664,7 +4696,7 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr ""
 
@@ -4673,13 +4705,17 @@ msgstr ""
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr ""
 
@@ -4749,8 +4785,8 @@ msgid "Delayed by"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4764,7 +4800,7 @@ msgstr ""
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4796,8 +4832,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr ""
 
@@ -4826,7 +4862,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4870,7 +4906,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4926,7 +4962,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5027,11 +5063,11 @@ msgstr ""
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5047,7 +5083,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5098,7 +5134,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5112,7 +5148,7 @@ msgstr ""
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5120,7 +5156,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr ""
 
@@ -5128,7 +5164,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5156,7 +5192,7 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5320,7 +5356,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5333,14 +5369,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5423,7 +5459,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5435,7 +5471,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5534,7 +5570,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5545,7 +5581,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5585,7 +5621,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5603,10 +5639,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr ""
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5621,7 +5653,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5677,7 +5709,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5686,7 +5718,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr ""
@@ -5762,7 +5794,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5784,7 +5816,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5792,13 +5824,14 @@ msgstr ""
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5810,8 +5843,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr ""
 
@@ -5827,11 +5860,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr ""
 
@@ -6106,7 +6139,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6128,12 +6161,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6192,7 +6225,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6216,7 +6249,7 @@ msgstr ""
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6255,7 +6288,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr ""
 
@@ -6285,7 +6318,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6319,7 +6352,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr ""
 
@@ -6330,7 +6363,7 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr ""
 
@@ -6376,7 +6409,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6392,8 +6425,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6460,7 +6493,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6514,7 +6547,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6538,7 +6571,7 @@ msgid "Failed"
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6547,24 +6580,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6572,7 +6605,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6596,7 +6629,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr ""
 
@@ -6742,8 +6775,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6821,6 +6854,10 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6886,14 +6923,14 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr ""
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6911,7 +6948,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -6993,7 +7030,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -7011,7 +7048,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr ""
 
@@ -7060,7 +7097,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7221,7 +7258,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr ""
 
@@ -7421,11 +7458,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7470,14 +7507,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr ""
 
@@ -7541,7 +7578,7 @@ msgstr ""
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7549,8 +7586,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7562,7 +7598,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7642,7 +7678,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7650,7 +7686,7 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr ""
@@ -7681,7 +7717,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7698,7 +7734,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7737,7 +7773,7 @@ msgstr ""
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7885,7 +7921,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8117,14 +8153,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8133,12 +8221,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr ""
 
@@ -8268,7 +8360,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8281,11 +8373,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8311,7 +8403,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr ""
 
@@ -8329,6 +8421,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8719,7 +8816,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr ""
 
@@ -8776,7 +8873,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8807,7 +8904,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8947,10 +9044,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9257,9 +9354,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9331,6 +9428,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9342,12 +9443,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9420,7 +9521,7 @@ msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9528,7 +9629,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9576,7 +9677,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9679,8 +9780,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9884,7 +9985,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr ""
 
@@ -10074,7 +10175,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10235,7 +10336,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr ""
 
@@ -10257,7 +10358,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr ""
 
@@ -10265,7 +10366,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr ""
 
@@ -10299,7 +10400,7 @@ msgstr ""
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr ""
 
@@ -10369,7 +10470,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10448,11 +10549,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr ""
 
@@ -10490,7 +10591,7 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr ""
 
@@ -10503,11 +10604,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10618,7 +10719,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10696,12 +10797,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10829,7 +10930,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10989,7 +11090,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11018,7 +11119,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -11057,7 +11158,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11083,7 +11184,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11119,7 +11220,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr ""
 
@@ -11146,7 +11247,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11217,9 +11318,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11232,12 +11333,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr ""
 
@@ -11247,8 +11348,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11309,7 +11410,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11382,8 +11483,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11401,7 +11502,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11429,6 +11530,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11444,11 +11550,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11594,7 +11695,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr ""
 
@@ -11634,11 +11735,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11654,6 +11755,14 @@ msgstr ""
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr ""
@@ -11663,11 +11772,11 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr ""
 
@@ -11675,6 +11784,18 @@ msgstr ""
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr ""
@@ -11769,25 +11890,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11930,6 +12052,10 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11941,7 +12067,7 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr ""
 
@@ -11965,7 +12091,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11982,7 +12108,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12000,20 +12126,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12146,7 +12272,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12208,7 +12334,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12248,7 +12374,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12261,8 +12387,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12274,7 +12400,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12282,11 +12407,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12404,19 +12530,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12425,15 +12551,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12460,7 +12586,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12476,7 +12602,7 @@ msgstr ""
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12523,7 +12649,7 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12555,15 +12681,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12595,8 +12721,8 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
 
@@ -12626,7 +12752,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr ""
 
@@ -12789,12 +12915,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr ""
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12809,18 +12935,17 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr ""
@@ -12847,7 +12972,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr ""
 
@@ -12875,13 +13000,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr ""
 
@@ -12893,7 +13018,7 @@ msgstr ""
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr ""
@@ -12912,7 +13037,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr ""
 
@@ -12920,7 +13045,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr ""
 
@@ -12937,7 +13062,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
@@ -12949,26 +13074,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13009,11 +13122,11 @@ msgid_plural "Only selected problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13046,7 +13159,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13071,7 +13184,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13096,27 +13209,27 @@ msgstr ""
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13141,7 +13254,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13158,8 +13271,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13206,9 +13319,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr ""
 
@@ -13460,7 +13573,7 @@ msgstr ""
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr ""
@@ -13507,7 +13620,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13530,13 +13643,15 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13567,9 +13682,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13658,15 +13771,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13740,19 +13857,20 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13774,12 +13892,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr ""
 
@@ -13809,7 +13927,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr ""
 
@@ -13938,7 +14056,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13996,7 +14114,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14016,12 +14134,12 @@ msgid "Privilege level"
 msgstr ""
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14051,7 +14169,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14069,7 +14187,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -14082,8 +14200,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14096,14 +14214,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr ""
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr ""
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14120,7 +14230,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14154,12 +14264,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14181,7 +14291,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14244,7 +14354,7 @@ msgstr ""
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14338,8 +14448,8 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14347,8 +14457,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14401,7 +14511,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14409,7 +14519,7 @@ msgstr ""
 msgid "Recovery"
 msgstr ""
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14444,7 +14554,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14505,7 +14615,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14537,6 +14647,7 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14546,7 +14657,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14554,13 +14665,13 @@ msgstr ""
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14570,8 +14681,8 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14648,8 +14759,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr ""
 
@@ -14689,7 +14800,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14718,7 +14829,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14726,7 +14837,7 @@ msgstr ""
 msgid "Replace"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14833,7 +14944,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
@@ -14867,7 +14978,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr ""
 
@@ -15065,8 +15176,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15124,12 +15235,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15140,10 +15251,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr ""
 
@@ -15356,7 +15465,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr ""
 
@@ -15529,7 +15638,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr ""
 
@@ -15599,8 +15708,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15608,7 +15717,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr ""
 
@@ -15644,19 +15753,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15681,7 +15790,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15714,7 +15823,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr ""
 
@@ -15746,34 +15855,29 @@ msgid "Server time"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15781,7 +15885,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15809,7 +15913,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15825,11 +15929,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -15838,7 +15942,7 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr ""
 
@@ -15847,16 +15951,16 @@ msgstr ""
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15868,9 +15972,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -15894,10 +15998,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15938,7 +16050,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15984,7 +16096,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16075,7 +16187,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16126,7 +16238,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr ""
 
@@ -16235,7 +16347,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16281,7 +16393,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16355,7 +16467,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16403,12 +16515,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16419,17 +16533,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16453,12 +16574,9 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr ""
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
@@ -16490,6 +16608,10 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16521,8 +16643,8 @@ msgstr ""
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr ""
 
@@ -16534,7 +16656,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16566,7 +16688,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16599,7 +16721,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16615,7 +16737,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16628,7 +16750,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr ""
 
@@ -16720,12 +16842,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16761,8 +16883,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16802,14 +16924,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16817,10 +16938,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16984,7 +17105,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17269,12 +17390,12 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr ""
 
@@ -17284,13 +17405,13 @@ msgstr ""
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17371,7 +17492,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17493,13 +17614,13 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr ""
 
@@ -17518,7 +17639,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17602,7 +17723,7 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17669,15 +17790,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17729,7 +17850,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr ""
 
@@ -17742,7 +17863,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17757,15 +17878,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17832,7 +17954,7 @@ msgid "UNKNOWN"
 msgstr ""
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17842,7 +17964,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr ""
 
@@ -17888,7 +18010,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr ""
 
@@ -17936,7 +18058,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17983,7 +18105,8 @@ msgstr ""
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18002,7 +18125,8 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18013,9 +18137,9 @@ msgstr ""
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18034,12 +18158,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -18086,7 +18210,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18167,27 +18291,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18256,7 +18381,7 @@ msgid "Upper level maps"
 msgstr ""
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr ""
@@ -18305,37 +18430,37 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18352,13 +18477,13 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18383,32 +18508,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18439,7 +18564,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18447,14 +18572,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18503,7 +18628,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18537,7 +18662,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18558,12 +18683,12 @@ msgstr ""
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18608,7 +18733,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18875,23 +19000,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19098,8 +19223,8 @@ msgstr ""
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19126,7 +19251,12 @@ msgstr ""
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19143,11 +19273,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19163,7 +19293,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr ""
 
@@ -19232,7 +19362,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr ""
 
@@ -19243,6 +19373,10 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19260,7 +19394,7 @@ msgstr ""
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19473,8 +19607,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19516,19 +19650,19 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19596,19 +19730,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr ""
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19729,7 +19859,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19848,7 +19978,6 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20144,9 +20273,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20226,7 +20355,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20273,7 +20402,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20472,13 +20601,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20526,7 +20655,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20752,12 +20881,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20861,8 +20990,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -20957,7 +21086,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21024,7 +21153,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr ""
@@ -21092,7 +21221,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21219,7 +21348,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr ""
 
@@ -21304,7 +21433,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21314,8 +21443,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21396,7 +21525,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21459,7 +21588,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21486,7 +21615,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21580,7 +21709,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21600,7 +21729,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr ""
 
@@ -21747,7 +21876,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/cs/LC_MESSAGES/frontend.po b/ui/locale/cs/LC_MESSAGES/frontend.po
index 9af2ef077fa..939729a104c 100644
--- a/ui/locale/cs/LC_MESSAGES/frontend.po
+++ b/ui/locale/cs/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2018-09-24 07:57+0300\n"
 "Last-Translator: Lukáš <iam@lukasmaly.net>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d den"
 msgstr[1] "%1$d dní"
 msgstr[2] "%1$d dní"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] "%1$s zpráv"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] "%1$s z %2$s prvků v hlásí problém"
 msgstr[1] "%1$s z %2$s prvků v hlásí problém"
 msgstr[2] "%1$s z %2$s prvků v hlásí problém"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -236,10 +236,10 @@ msgstr[0] "Zůstává %1$s pokus"
 msgstr[1] "Zůstávají %1$s pokusy"
 msgstr[2] "Zůstává %1$s pokusů"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s sekunda"
 msgstr[1] "%1$s sekundy"
 msgstr[2] "%1$s sekund"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s symbolů zůstává"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Závažnost, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, pouze ke čtení"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -325,7 +325,7 @@ msgstr "(bez proxy)"
 msgid "0 - use default port"
 msgstr "0 - použit předvolený port"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 nebo 1"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "PŘIDEJ PŘEPIS"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "A"
 
@@ -410,7 +410,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -478,40 +478,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Přístup odmítnut"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Přístup odepřen!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Potvrzeno"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Přijmout"
 
@@ -519,7 +519,7 @@ msgstr "Přijmout"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Přijato"
@@ -548,20 +548,22 @@ msgstr "Potvrzené VYŘEŠENÉ události"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -668,7 +670,7 @@ msgstr "Akce byla aktualizována"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -677,7 +679,7 @@ msgstr "Akce byla aktualizována"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Akce"
@@ -736,8 +738,8 @@ msgstr "Aktivní do"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -748,7 +750,6 @@ msgstr "Aktivní do"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -756,11 +757,13 @@ msgstr "Aktivní do"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -772,15 +775,17 @@ msgstr "Aktivní do"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -847,7 +852,7 @@ msgstr "Aktivní do"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Přidat"
 
@@ -855,19 +860,19 @@ msgstr "Přidat"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Přidat nový widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Přidat podřízený prvek"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -884,7 +889,7 @@ msgstr "Přidat hostitele"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Přidat více map"
 
@@ -901,7 +906,11 @@ msgstr ""
 msgid "Add new override"
 msgstr "Přidej nový přepis"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -909,7 +918,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -943,7 +952,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Přidat widget"
 
@@ -952,12 +961,20 @@ msgstr "Přidat widget"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Přidáno, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -967,6 +984,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrace"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Rozšířené štítky"
@@ -1053,7 +1074,7 @@ msgstr "Přidej prvky mapy"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Vše"
 
@@ -1062,8 +1083,8 @@ msgid "All dashboards"
 msgstr "Všechny panely"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Všechny skupiny"
 
@@ -1071,7 +1092,7 @@ msgstr "Všechny skupiny"
 msgid "All hosts"
 msgstr "Všechny hosty"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Veškeré odkazy by měly mít zadáno \"Jméno\" a \"URL\""
 
@@ -1105,7 +1126,7 @@ msgstr "Všechny šablony"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1118,7 +1139,7 @@ msgstr "Povolit manuální zavření"
 msgid "Allowed hosts"
 msgstr "Povolení hosté"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1136,7 +1157,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1177,12 +1198,12 @@ msgstr "A/Nebo"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1202,15 +1223,15 @@ msgstr "Chyba aplikace."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Použít"
 
@@ -1228,7 +1249,7 @@ msgstr "Blížící se"
 msgid "Apr"
 msgstr "Dub"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Duben"
 
@@ -1256,6 +1277,10 @@ msgstr "Typ oblasti"
 msgid "Arithmetic"
 msgstr "Aritmetický"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Jako prostý text"
@@ -1308,8 +1333,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1387,7 +1412,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Srp"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Srpen"
 
@@ -1417,7 +1442,7 @@ msgstr "Autentizace"
 msgid "Authentication algorithm"
 msgstr "Autentizační algoritmus"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "Ověření selhalo: %1$s."
@@ -1466,7 +1491,7 @@ msgstr "Auto"
 msgid "Auto-login"
 msgstr "Automatické přihlášení"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Možnosti automatického přihlášení a automatického odhlášení nelze provozovat simultánně."
 
@@ -1476,7 +1501,7 @@ msgstr "Automatické odhlášení"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1661,11 +1686,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Dole"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Předložit"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Přenést dopředu"
 
@@ -1746,7 +1771,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Vypočítaná"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Kalendář"
 
@@ -1766,8 +1791,8 @@ msgstr "Odvolat"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1784,8 +1809,8 @@ msgstr "Odvolat"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1815,7 +1840,7 @@ msgstr "Nelze přidat akci"
 msgid "Cannot add correlation"
 msgstr "Nelze přidat korelaci"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1826,7 +1851,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Nemohu předat závislost z hosta na šablonu."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Není možné předat závislost ze spouštěče \"%1$s:%2$s\" na neexistující spouštěč \"%3$s:%4$s\"."
@@ -1946,7 +1971,7 @@ msgid "Cannot add user"
 msgstr "Nelze přidat uživatele"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1954,11 +1979,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Není možné přidat webový scénář"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2042,7 +2067,7 @@ msgstr[0] "Nelze kopírovat spouštěč"
 msgstr[1] "Nelze kopírovat spoušťěče"
 msgstr[2] "Nelze kopírovat spoušťěče"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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 hostů."
@@ -2098,7 +2123,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Není možné smazat interního Zabbix uživatele \"%1$s\", zkuste ho vypnout."
@@ -2553,7 +2578,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Nelze rozšířit makra."
 
@@ -2725,7 +2750,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2787,7 +2812,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Není možné číst odpověď, zkontrolujte spojení se Zabbix serverem \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Není možné přejmenovat uživatele guest."
 
@@ -2846,7 +2871,12 @@ msgstr "Nelze nastavit inventární pole pro zakázaný inventář."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3274,6 +3304,7 @@ msgid "Change per second"
 msgstr "Změna za sekundu"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Změň závažnost"
 
@@ -3415,7 +3446,7 @@ msgstr "Zkontroluje výkonnost služby UDP. Odpověď 0 - služba je nedostupná
 msgid "Checks should be unique."
 msgstr "Kontroly musí byt jedinečné."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3457,11 +3488,11 @@ msgstr "Vyčistit historii a trendy"
 msgid "Clear when unlinking"
 msgstr "Pročistit při odpojování"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "Kliknout a roztáhnout do požadované velikosti."
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "Kliknout pro zobrazení či úpravu"
 
@@ -3491,7 +3522,7 @@ msgstr "Hodiny"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Vytvořit kopii"
 
@@ -3502,8 +3533,8 @@ msgstr "Vytvořit kopii"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Zavřít"
 
@@ -3533,8 +3564,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Zhroucení"
 
@@ -3551,7 +3582,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3619,6 +3650,7 @@ msgstr "Souběžné relace"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Podmínka"
 
@@ -3673,7 +3705,7 @@ msgstr "Podmínky"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Nastavení"
 
@@ -3936,7 +3968,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3973,8 +4005,8 @@ msgstr "Obsahuje"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4035,8 +4067,8 @@ msgstr "Poloha"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Kopírovat"
 
@@ -4170,11 +4202,11 @@ msgstr "Vytvořit korelaci"
 msgid "Create dashboard"
 msgstr "Vytvořit dashboard"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "Vytvořit závislé pravidlo nálezu"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Vytvořte závislou položku"
 
@@ -4291,7 +4323,7 @@ msgstr "Vytvořit mapu"
 msgid "Create media type"
 msgstr "Vytvořit typ média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Vytvořit nové"
 
@@ -4307,7 +4339,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Vytvořit skript"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4315,7 +4347,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Vytvořit šablonu"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Vytvořit spouštěč"
 
@@ -4536,7 +4568,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Vlastnosti dashboardu"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Sdílení dashboardu"
 
@@ -4566,7 +4598,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Dashboardy"
 
@@ -4736,7 +4768,7 @@ msgstr "Den v týdnu"
 msgid "Days"
 msgstr "Dní"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Ladící výstup"
 
@@ -4750,7 +4782,7 @@ msgstr "Ladící mód"
 msgid "Dec"
 msgstr "Pro"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Prosinec"
 
@@ -4759,13 +4791,17 @@ msgstr "Prosinec"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Výchozí"
 
@@ -4835,8 +4871,8 @@ msgid "Delayed by"
 msgstr "Zpožděno o"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4850,7 +4886,7 @@ msgstr "Zpožděno o"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4882,8 +4918,8 @@ msgstr "Zpožděno o"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Smazat"
 
@@ -4912,7 +4948,7 @@ msgstr "Smazat aktuální akci?"
 msgid "Delete current correlation?"
 msgstr "Smazat aktuální korelaci?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Smazat dashboard?"
 
@@ -4956,7 +4992,7 @@ msgstr "Smazat prototyp položky?"
 msgid "Delete item?"
 msgstr "Smazat položku?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Smazat propojení mezi označenými elementy?"
 
@@ -5012,7 +5048,7 @@ msgstr "Odstranit vybrané dashboardy?"
 msgid "Delete selected discovery rules?"
 msgstr "Smazat vybraná pravidla nálezu?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Smazat vybrané prvky?"
 
@@ -5113,11 +5149,11 @@ msgstr "Smazat vybrané skripty?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Smazat vybrané tvary?"
 
@@ -5133,7 +5169,7 @@ msgstr "Smazat označené prototypy spouštěčů?"
 msgid "Delete selected triggers?"
 msgstr "Smazat vybrané spouštěče?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Smazat vybraného uživatele?"
 
@@ -5184,7 +5220,7 @@ msgstr "Smazané: Šablona \"%1$s\"."
 msgid "Delimiter"
 msgstr "Oddělovač"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5198,7 +5234,7 @@ msgstr "Zakázat"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5206,7 +5242,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Závislosti"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Závisející"
 
@@ -5214,7 +5250,7 @@ msgstr "Závisející"
 msgid "Dependent item"
 msgstr "Závislá položka"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5242,7 +5278,7 @@ msgstr "Stav nasazení"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5406,7 +5442,7 @@ msgstr "Zakázat označené scénáře?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5419,14 +5455,14 @@ msgstr "Zakázat označené scénáře?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5509,7 +5545,7 @@ msgid "Discovery by proxy"
 msgstr "Průzkum podle proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Kontrola průzkumu"
 
@@ -5521,7 +5557,7 @@ msgstr "Kontroly objevování"
 msgid "Discovery list"
 msgstr "Objevovací seznam"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objekt objevování"
 
@@ -5624,7 +5660,7 @@ msgstr "Pravidlo nálezu aktualizováno"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5635,7 +5671,7 @@ msgstr "Pravidla nálezu"
 msgid "Discovery rules deleted"
 msgstr "Pravidla nálezu byla smazána"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stav nálezu"
@@ -5675,7 +5711,7 @@ msgstr "Zobrazit skládaný graf"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zobrazeno %1$s z %2$s nalezených"
@@ -5693,10 +5729,6 @@ msgstr "Zobrazení možností"
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Nevypočítávat"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5711,7 +5743,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Přejete si změnit podmínkový výraz?"
 
@@ -5767,7 +5799,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nedostupné"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5776,7 +5808,7 @@ msgid "Download the configuration file"
 msgstr "Stáhnout konfigurační soubor"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Prostoj"
@@ -5852,7 +5884,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Duplicitní userid \"%1$s\" u uživatele mapy \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5874,7 +5906,7 @@ msgstr "Dynamická položka"
 msgid "Dynamic items"
 msgstr "Dynamické položky"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Každá URL by měla mít jedinečné jméno. Prosím ujistěte se, že existuje jen jedna URL s takovýmto jménem"
 
@@ -5882,13 +5914,14 @@ msgstr "Každá URL by měla mít jedinečné jméno. Prosím ujistěte se, že
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5900,8 +5933,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Upravit"
 
@@ -5917,11 +5950,11 @@ msgstr "Aktualizovat mapu"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Upravit prvek stromu"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Editovat spouštěč"
 
@@ -6196,7 +6229,7 @@ msgstr "Zapnout pasti"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6218,12 +6251,12 @@ msgstr "Zapnout pasti"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6282,7 +6315,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6306,7 +6339,7 @@ msgstr "Chyba"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Chyba ve vyhledávacím požadavku nad tabulkou \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Chybná zpráva"
 
@@ -6345,7 +6378,7 @@ msgstr "Pravidla korelace události"
 msgid "Event details"
 msgstr "Detaily události"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Generování události"
 
@@ -6375,7 +6408,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Pár značky události"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Typ události"
 
@@ -6410,7 +6443,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Vyjma"
 
@@ -6421,7 +6454,7 @@ msgstr "Vyjma"
 msgid "Exclude host groups"
 msgstr "Vyloučit skupiny hostů"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Vykonat"
 
@@ -6467,7 +6500,7 @@ msgstr "Provedené"
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Potvrzení vykonání"
 
@@ -6483,8 +6516,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Rozbalit"
 
@@ -6551,7 +6584,7 @@ msgstr "Exportovat do CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6605,7 +6638,7 @@ msgstr "Výrazy"
 msgid "External check"
 msgstr "Vnější kontrola"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Pá"
@@ -6629,7 +6662,7 @@ msgid "Failed"
 msgstr "Selhalo"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Nepodařilo se vytvořit dashboard"
 
@@ -6638,24 +6671,24 @@ msgstr "Nepodařilo se vytvořit dashboard"
 msgid "Failed to parse URL."
 msgstr "Adresa URL nebyla úspěšně analyzována."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Nepodařilo se aktualizovat dashboard"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6663,7 +6696,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Nepodařilo se aktualizovat šablony."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6687,7 +6720,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Ún"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Únor"
 
@@ -6833,8 +6866,8 @@ msgstr "Oblast"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6912,6 +6945,10 @@ msgstr "Přizpůsobit mapě"
 msgid "Fixed"
 msgstr "Pevná"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6977,14 +7014,14 @@ msgstr "Francouzsky (fr_FR)"
 msgid "Fri"
 msgstr "Pá"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Pátek"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -7002,7 +7039,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Frontend přístup"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Povolit frontend zprávy"
 
@@ -7084,7 +7121,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Zadaný výraz není makro"
 
@@ -7102,7 +7139,7 @@ msgstr "Globální hodnota"
 msgid "Go back to %1$s"
 msgstr "Vrátit zpět na %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Jdi na"
 
@@ -7151,7 +7188,7 @@ msgstr "Přechodová linka"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7313,7 +7350,7 @@ msgstr "Graf se jménem \"%1$s\" již existuje v grafech, nebo prototypech graf�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafy"
 
@@ -7514,11 +7551,11 @@ msgstr "Nápověda"
 msgid "Hexadecimal to decimal"
 msgstr "Z hexadecimální do desítkové"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Skryta"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Skrýt debug"
 
@@ -7563,14 +7600,14 @@ msgstr "Označ celý řádek"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Historie"
 
@@ -7634,7 +7671,7 @@ msgstr "Vodorovné zarovnání"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7642,8 +7679,7 @@ msgstr "Vodorovné zarovnání"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7655,7 +7691,7 @@ msgstr "Vodorovné zarovnání"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7738,7 +7774,7 @@ msgstr[2] "Hosty povoleny"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7746,7 +7782,7 @@ msgstr[2] "Hosty povoleny"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Skupina hostitele"
@@ -7777,7 +7813,7 @@ msgstr "Typ popisku skupiny"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Skupina hostů s ID \"%1$s\" není dostupná."
@@ -7794,7 +7830,7 @@ msgstr "Skupina hostů s ID \"%1$s\" není dostupná."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7833,7 +7869,7 @@ msgstr "Rozhraní hosta"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7982,7 +8018,7 @@ msgstr "Host se stejným viditelným jménem \"%1$s\" již existuje."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8214,14 +8250,68 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Identifikace systému. Vrací řetězec"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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í."
@@ -8230,12 +8320,16 @@ msgstr "Pokud si myslíte, že tato zpráva je špatně, prosím kontaktuje vaš
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Obrázek"
 
@@ -8365,7 +8459,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8378,11 +8472,11 @@ msgstr "Nepřístupná mapa"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "Nedostupná šablona"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "Nedostupný spouštěč"
 
@@ -8408,7 +8502,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Včetně"
 
@@ -8426,6 +8520,11 @@ msgstr "Zahrnují podskupiny"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statistika příchozího provozu na síťovém rozhraní. Vráti celé číslo"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8816,7 +8915,7 @@ msgstr "Nesprávné nastavení filtru pro akci \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Použití nesprávné funkce"
 
@@ -8873,7 +8972,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Neplatný klíč položky \"%1$s\" poskytnutý pro spouštěč \"%2$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Nesprávný typ hodnoty položky"
 
@@ -8904,7 +9003,7 @@ msgstr "Neplatné ID typu média."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Neplatná metoda \"%1$s.%2$s\"."
@@ -9044,10 +9143,10 @@ msgstr "Neplatné user ID specifikované pro mapu \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Neplatná uživatelská skupina ID specifikovaná pro mapu \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9354,9 +9453,9 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9428,6 +9527,10 @@ msgstr "Neplatná hodnota používaná pro pole PSK. To by mělo obsahovat sudý
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Neplatná hodnota použitá pro proxy stav \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonésky (id_ID)"
@@ -9439,12 +9542,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9517,7 +9620,7 @@ msgid "Insert"
 msgstr "Vložit"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Vložit výraz"
 
@@ -9625,7 +9728,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9673,7 +9776,7 @@ msgstr "Neplatné datum."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Neplatná emailová adresa \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Neplatná emailová adresa pro typ médií s ID \"%1$s\"."
@@ -9776,8 +9879,8 @@ msgstr "Neplatné parametry metody."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9981,7 +10084,7 @@ msgstr "Neplatná časová perioda."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventář"
 
@@ -10175,7 +10278,7 @@ msgstr "Položka prototypu aktualizována"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10336,7 +10439,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Led"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Leden"
 
@@ -10358,7 +10461,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Čvc"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Červenec"
 
@@ -10366,7 +10469,7 @@ msgstr "Červenec"
 msgid "Jun"
 msgstr "Čer"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Červen"
 
@@ -10400,7 +10503,7 @@ msgstr "Klíč"
 msgid "Key passphrase"
 msgstr "Fráze klíče"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Klíčové slovo"
 
@@ -10470,7 +10573,7 @@ msgstr "Umístění popisku"
 msgid "Language"
 msgstr "Jazyk"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10555,11 +10658,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Poslední kontrola"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Graf za poslední hodinu"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Graf za poslední měsíc"
 
@@ -10597,7 +10700,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Poslední hodnota"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Graf za poslední týden"
 
@@ -10610,11 +10713,11 @@ msgstr "Graf za poslední týden"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Poslední hodnoty"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Poslední hodnoty"
 
@@ -10725,7 +10828,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10803,12 +10906,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Seznam skupinových sdílení"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Seznam uživatelských sdílení"
@@ -10936,7 +11039,7 @@ msgstr "Nízko úrovňové pravidlo nálezu v \"not supported\" stavu"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Po"
@@ -11096,7 +11199,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11125,7 +11228,7 @@ msgstr "Manuál zavřen"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11164,7 +11267,7 @@ msgstr "Umístění štítku prvku na mapě"
 msgid "Map element label type"
 msgstr "Typ štítku na mapě"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11190,7 +11293,7 @@ msgstr "Vlastník mapy nemůže být prázdný."
 msgid "Map shape"
 msgstr "Tvar mapy"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Aktualizace mapy selhala."
 
@@ -11226,7 +11329,7 @@ msgstr "Mapy"
 msgid "Mar"
 msgstr "Bře"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Březen"
 
@@ -11253,7 +11356,7 @@ msgstr "Maska"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11324,9 +11427,9 @@ msgstr "Maximální počet otevřených souborů podporovaný OS. Vráti celé �
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Maximální počet procesů podporovaný OS. Vráti celé číslo"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11340,12 +11443,12 @@ msgstr[0] "Maximální časová perioda na zobrazení je %1$s den."
 msgstr[1] "Maximální časová perioda na zobrazení je %1$s dní."
 msgstr[2] "Maximální časová perioda na zobrazení je %1$s dní."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Překročena maximální celková délka emailové adresy pro typ médií s ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Kvě"
 
@@ -11355,8 +11458,8 @@ msgid "May"
 msgstr "Květen"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Média"
 
@@ -11420,7 +11523,7 @@ msgstr "Test typu média byl úspěšný."
 msgid "Media type updated"
 msgstr "Typ média byl aktualizován"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Typ media s ID \"%1$s\" není dostupný."
@@ -11493,8 +11596,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Časový limit zprávy"
 
@@ -11512,7 +11615,7 @@ msgstr "Zpráva/Příkaz"
 msgid "Messages"
 msgstr "Zprávy"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Zprávy"
 
@@ -11540,6 +11643,11 @@ msgstr "Min"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11555,11 +11663,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11710,7 +11813,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Po"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Pondělí"
 
@@ -11750,11 +11853,11 @@ msgstr "Měsíc"
 msgid "Monthly"
 msgstr "Měsíčně"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Více výběrů bylo nalezeno..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11770,6 +11873,14 @@ msgstr "Více jak 10 minut"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Víc jak jeden graf se jménem \"%1$s\" pro host."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11779,11 +11890,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Násobek"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Multiple PROBLEM události"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Ztlumit"
 
@@ -11791,6 +11902,18 @@ msgstr "Ztlumit"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11885,25 +12008,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12046,6 +12170,10 @@ msgstr ""
 msgid "Never"
 msgstr "Nikdy"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12057,7 +12185,7 @@ msgstr "Nová podmínka"
 msgid "New dashboard"
 msgstr "Nový dashboard"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nový prvek"
 
@@ -12081,7 +12209,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nový regulární výraz"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12098,7 +12226,7 @@ msgid "New triggers"
 msgstr "Nové spouštěče"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12116,20 +12244,20 @@ msgstr "Další krok"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12262,7 +12390,7 @@ msgstr "Bez podrobností"
 msgid "No discovery rule IDs given."
 msgstr "Žádné stanovené ID pravidla nálezu"
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12324,7 +12452,7 @@ msgstr "Žádný obrázek"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Nenalezené žádné rozhraní"
 
@@ -12364,7 +12492,7 @@ msgstr "Nenalezena žádná makra."
 msgid "No maps added."
 msgstr "Žádné mapy nebyly přidané."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Žádné výběry nenalezené"
 
@@ -12377,8 +12505,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Žádný typ operace vzhledem ke korelaci \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Žádné oprávnění pro přístup do systému."
 
@@ -12390,7 +12518,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12398,11 +12525,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12520,19 +12648,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12541,15 +12669,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12576,7 +12704,7 @@ msgstr "Žádný specifikovaný soubor s veřejným klíčem."
 msgid "No recipients for action operation message."
 msgstr "Žádný příjemce pro operaci odeslání zprávy."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Žádná obnova"
 
@@ -12592,7 +12720,7 @@ msgstr "Není vybrán cíl"
 msgid "No target selected."
 msgstr "Není vybraný cíl."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12639,7 +12767,7 @@ msgstr "Žádná"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12671,15 +12799,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Není povolené nastavení hesla pro uživatele \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12711,8 +12839,8 @@ msgstr "Žádné zděděné položky"
 msgid "Not supported"
 msgstr "Nepodporováno"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Poznámka"
 
@@ -12742,7 +12870,7 @@ msgstr "Upozorni všechny zapojené"
 msgid "Nov"
 msgstr "Lis"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Listopad"
 
@@ -12905,12 +13033,12 @@ msgstr "Číselné systémy"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Číslo (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Číselné (celá čísla)"
 
@@ -12925,18 +13053,17 @@ msgstr "Číslo (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12963,7 +13090,7 @@ msgstr "OOB směrovač"
 msgid "OOB subnet mask"
 msgstr "OOB síťová maska"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "NEBO"
 
@@ -12991,13 +13118,13 @@ msgstr "Říj"
 msgid "Octal to decimal"
 msgstr "Z osmičková na desítkovou"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Říjen"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -13009,7 +13136,7 @@ msgstr "Vypnuté"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -13028,7 +13155,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Na"
 
@@ -13036,7 +13163,7 @@ msgstr "Na"
 msgid "On status change triggers blink for"
 msgstr "Při změně stavu spouštěč blikat po dobu"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Jednou"
 
@@ -13053,7 +13180,7 @@ msgid "One time only"
 msgstr "Pouze jednou"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Jednorázový downtime"
 
@@ -13065,26 +13192,14 @@ msgstr "Jen super administrátoři mohou vytvořit skupiny."
 msgid "Only Super Admins can create media types."
 msgstr "Jen super administrátoři mohou vytvořit typy médií."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Jenom super administrátoři mohou zakládat skupiny uživatelů."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Jen super administrátoři mohou mazat typy médií."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Jen super administrátoři mohou smazat uživatelské skupiny."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Jen super administrátoři mohou upravovat typy médií."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Jenom super administrátoři mohou aktualizovat skupiny uživatelů."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Jen kontroly typu Zabbix agent, SNMPv1, SNMPv2 nebo SNMPv3 mohou být unikátní."
@@ -13126,11 +13241,11 @@ msgstr[0] "Pouze vybraný problém"
 msgstr[1] "Pouze vybrané problémy"
 msgstr[2] "Pouze vybrané problémy"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13163,7 +13278,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informace operačního systému. Návratová hodnota řetězec"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13188,7 +13303,7 @@ msgstr "Operace nemá skupinu na vykonání."
 msgid "Operation has no template to operate."
 msgstr "Operace nemá šablonu na vykonání."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13213,27 +13328,27 @@ msgstr "Operace"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operátor"
 
@@ -13258,7 +13373,7 @@ msgstr "Možnosti"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13275,8 +13390,8 @@ msgstr "Nebo"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13323,9 +13438,9 @@ msgstr "Nebo"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Původní"
 
@@ -13577,7 +13692,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLÉM"
@@ -13624,7 +13739,7 @@ msgstr "PSK identita"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK je příliš krátký. Minimum je %1$s hexadecimalních čísel."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13647,13 +13762,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametr"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13684,9 +13801,7 @@ msgstr "Nadřazená položka"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13775,15 +13890,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Vložit"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Vlož bez externích odkazů"
 
@@ -13857,19 +13976,20 @@ msgid "Periods"
 msgstr "Periody"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Oprávnění může být přiřazené jen uživatelské skupině, ne uživateli."
 
@@ -13891,12 +14011,12 @@ msgstr "Algoritmus umísťování"
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Přehrát"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Přehrávat zvuk"
 
@@ -13926,7 +14046,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Prosím, zadej název hostitele nebo host IP addresu a číslo portu Zabbix serveru, stejně jako jméno instalace (volitelné)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Vyberte, prosím, dva prvky"
 
@@ -14055,7 +14175,7 @@ msgid "Previous month"
 msgstr "Předchozí měsíc"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14113,7 +14233,7 @@ msgstr "Fráze utajení"
 msgid "Privacy protocol"
 msgstr "Protokol utajení"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privátní"
@@ -14133,12 +14253,12 @@ msgid "Privilege level"
 msgstr "Úroveň oprávnění"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14168,7 +14288,7 @@ msgstr "Problém vytvořen"
 msgid "Problem display"
 msgstr "Zobrazit problémy"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Problém výrazu"
@@ -14186,7 +14306,7 @@ msgstr "Problém není potlačen"
 msgid "Problem is suppressed"
 msgstr "Problém je potlačen"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problém na"
 
@@ -14199,8 +14319,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Problém vyřešen"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14213,14 +14333,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problém, když všechny podřazené mají problém"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problém, když alespoň jeden podřazený má problém"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14237,7 +14349,7 @@ msgstr "Problém, když alespoň jeden podřazený má problém"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problémy"
 
@@ -14271,12 +14383,12 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus na JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14298,7 +14410,7 @@ msgstr "Proxy"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14362,7 +14474,7 @@ msgstr "Název proxy"
 msgid "Proxy updated"
 msgstr "Proxy byla aktualizována"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Veřejný"
@@ -14456,8 +14568,8 @@ msgstr "Čtení"
 msgid "Read only"
 msgstr "Pouze čtení"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14465,8 +14577,8 @@ msgstr "Pouze pro čtení"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14519,7 +14631,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14527,7 +14639,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Obnovení"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14562,7 +14674,7 @@ msgstr "Obdélník"
 msgid "Refresh"
 msgstr "Obnov"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Interval obnovy"
 
@@ -14624,7 +14736,7 @@ msgstr "Regulární výrazy"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14656,6 +14768,7 @@ msgstr "Vzdálený příkaz"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14665,7 +14778,7 @@ msgstr "Vzdálený příkaz"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14673,13 +14786,13 @@ msgstr "Vzdálený příkaz"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14689,8 +14802,8 @@ msgstr "Vzdálený příkaz"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14767,8 +14880,8 @@ msgstr "Vzdálený příkaz"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -14808,7 +14921,7 @@ msgstr "Odstraň, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14837,7 +14950,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14845,7 +14958,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Nahradit"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Nahradit závislosti"
 
@@ -14952,7 +15065,7 @@ msgstr "Požadovaný stavový kód"
 msgid "Required string"
 msgstr "Požadovaný řetězec"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reset"
@@ -14986,7 +15099,7 @@ msgstr "Potvrzení obnovení"
 msgid "Reset defaults"
 msgstr "Obnovit původní hodnoty"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Vyřešené"
 
@@ -15184,8 +15297,8 @@ msgstr "Pravé Y"
 msgid "Right trim"
 msgstr "Správná úprava"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15243,12 +15356,12 @@ msgstr "Spustí specifikovaný příkaz na hostovi. Vráti text jako výsledek s
 msgid "Russian (ru_RU)"
 msgstr "Rusky (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "So"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Ne"
@@ -15259,10 +15372,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15475,7 +15586,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "So"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -15652,7 +15763,7 @@ msgstr "Skript byl aktualizován"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Skripty"
 
@@ -15722,8 +15833,8 @@ msgid "Security name"
 msgstr "Bezpečnostní jméno"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15731,7 +15842,7 @@ msgstr "Bezpečnostní jméno"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Vybrat"
 
@@ -15767,19 +15878,19 @@ msgstr "Označené elementy"
 msgid "Selected items only"
 msgstr "Pouze vybrané položky"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Vybrané, %1$s v pozici %2$d z %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Vybrané, %1$s, pouze ke čtení, v pozici %2$d of %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Pošli zpět"
 
@@ -15804,7 +15915,7 @@ msgstr "Poslat pouze na"
 msgid "Send to"
 msgstr "Poslat na"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Odeslat nazpátek"
 
@@ -15837,7 +15948,7 @@ msgstr "Odděleně"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Září"
 
@@ -15869,34 +15980,29 @@ msgid "Server time"
 msgstr "Čas na serveru"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Služba"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15904,7 +16010,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Služba vytvořená"
 
@@ -15934,7 +16040,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Čas startu služby musí být menší než její konec."
 
@@ -15950,11 +16056,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Servisní časy"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Typ služby"
 
@@ -15963,7 +16069,7 @@ msgstr "Typ služby"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Služba byla aktualizována"
 
@@ -15972,16 +16078,16 @@ msgstr "Služba byla aktualizována"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Služby"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Služby tvoří kruhovou závislost."
 
@@ -15993,9 +16099,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sezení ukončené, prosím přihlaste se znovu."
 
@@ -16019,10 +16125,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Nastavení hostitelského inventáře"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16063,7 +16177,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16109,7 +16223,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Sdílení"
 
@@ -16200,7 +16314,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16251,7 +16365,7 @@ msgstr "Zobrazit varování když je Zabbix server vypnutý"
 msgid "Show working time"
 msgstr "Zobrazit praconí dobu"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Sobraz"
 
@@ -16360,7 +16474,7 @@ msgstr "Přeskočení kopírování grafu \"%1$s\" na host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovensky (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Odložit"
 
@@ -16406,7 +16520,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Seřadit spouštěče podle"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Řazení (0->999)"
 
@@ -16480,7 +16594,7 @@ msgstr "Začátek v"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16528,12 +16642,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16544,17 +16660,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16578,13 +16701,10 @@ msgstr ""
 msgid "Status"
 msgstr "Stav"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Výpočet stavu"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritmus výpočtu stavu"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16615,6 +16735,10 @@ msgstr "Pouze stav"
 msgid "Status problem"
 msgstr "Problém stavu"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16646,8 +16770,8 @@ msgstr "Krok s jménem \"%1$s\" již existuje."
 msgid "Steps"
 msgstr "Kroky"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Zastavit"
 
@@ -16659,7 +16783,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16691,7 +16815,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16724,7 +16848,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Subjekt"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Podmapa"
 
@@ -16740,7 +16864,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Úspěšný audit"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "Zpráva úspěšná"
 
@@ -16753,7 +16877,7 @@ msgstr "Součet příchozích a odchozích statistik provozu na síťové rozhra
 msgid "Sun"
 msgstr "Ne"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Neděle"
 
@@ -16845,12 +16969,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Systém uptime v sekundách. Vráti celé číslo"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Čt"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16886,8 +17010,8 @@ msgstr "Tabulka \"%1$s\" neobsahuje pole se jménem \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Označení"
@@ -16927,14 +17051,13 @@ msgstr "Hodnota značky"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16942,10 +17065,10 @@ msgstr "Hodnota značky"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17109,7 +17232,7 @@ msgstr "Šablona se stejným viditelným jménem \"%1$s\" již existuje."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17396,12 +17519,12 @@ msgstr "Škrtící"
 msgid "Thu"
 msgstr "Čt"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Do"
 
@@ -17411,13 +17534,13 @@ msgstr "Do"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17498,7 +17621,7 @@ msgstr "Časové razítko"
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Na nastavení rozhraní hosta označte jeden typ položky pro všechny položky"
 
@@ -17620,13 +17743,13 @@ msgstr "Trendy"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Spouštěč"
 
@@ -17645,7 +17768,7 @@ msgstr "Spouštěč \"%1$s\" patří do šablony s různými vazbami."
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Spouštěč \"%1$s\" závisí na jiném spouštěči \"%2$s\", který neexistuje."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17732,7 +17855,7 @@ msgstr "Přehled spouštěčů"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17800,15 +17923,15 @@ msgstr "Prototypy spouštěčů smazané"
 msgid "Trigger prototypes updated"
 msgstr "Prototypy spouštěčů aktualizované"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Závažnost spouštěče"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Status spouštěče \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Status spouštěče \"Problém\""
 
@@ -17860,7 +17983,7 @@ msgstr "Úprava"
 msgid "Tue"
 msgstr "Út"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Úterý"
 
@@ -17873,7 +17996,7 @@ msgstr "Turecky (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Dvě položky (\"%1$s\" a \"%2$s\") není možné naplnit stejným inventárním polem \"%3$s\", vedlo by to ke sporu."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "Dva prvky mapy by měly být vybrány"
 
@@ -17888,15 +18011,16 @@ msgstr "Dva prvky mapy by měly být vybrány"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17963,7 +18087,7 @@ msgid "UNKNOWN"
 msgstr "NEZNÁMÝ"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17973,7 +18097,7 @@ msgstr "NEZNÁMÝ"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -18019,7 +18143,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL musí mít \"jméno\" a \"url\" v mapě \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URL"
 
@@ -18067,7 +18191,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Nelze přepsat existující konfigurační soubor."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18114,7 +18238,8 @@ msgstr "Odblokovat vybrané uživatele?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18133,7 +18258,8 @@ msgstr "Jednotky"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18144,9 +18270,9 @@ msgstr "Jednotky"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Neznámý"
@@ -18165,12 +18291,12 @@ msgstr "Neznáma chyba"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Zadaná položka ve vybraném hostiteli neexistuje"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Zadaný hostitel v systému neexistuje"
 
@@ -18217,7 +18343,7 @@ msgstr "Odpojit od šablony"
 msgid "Unlink from templates"
 msgstr "Odpojit od šablon"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Povolit zvuky"
 
@@ -18299,27 +18425,28 @@ msgstr "Dostupný"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18388,7 +18515,7 @@ msgid "Upper level maps"
 msgstr "Mapa nejvyšší úrovně"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Doba provozu"
@@ -18437,37 +18564,37 @@ msgstr "Používané v akcích"
 msgid "User"
 msgstr "Uživatel"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "User \"%1$s\" nemůže být bez skupiny uživatelů."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "Uživatel \"%1$s\" je majitel obrazovky \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Uživatel \"%1$s\" je vlastníkem mapy \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "Uživatel \"%1$s\" je použit v akci \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18484,13 +18611,13 @@ msgstr "Uživatel byl přidán"
 msgid "User agent string"
 msgstr "Uživatelský řetězec agenta"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Uživatel nemůže sám sebe přidat do vypnuté skupiny nebo do skupiny s vypnutým GUI přístupem."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18516,32 +18643,32 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Skupina uživatelů"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Uživatelská skupina \"%1$s\" již existuje."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Skupina uživatelů \"%1$s\" je použita v akci \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, 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 pro správu o nefunkční databáze."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Uživatelská skupina \"%1$s\" je použitá v skriptu \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18574,7 +18701,7 @@ msgstr[2] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Skupina uživatelů ID \"%1$s\" není dostupná."
@@ -18582,14 +18709,14 @@ msgstr "Skupina uživatelů ID \"%1$s\" není dostupná."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Skupiny uživatelů"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Uživatel nemá dovolené smazat sám sebe."
 
@@ -18639,7 +18766,7 @@ msgstr[2] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18673,7 +18800,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Uživatelské sdílení má chybějící parametr: %1$s v mapě \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18695,12 +18822,12 @@ msgstr "Uživatel byl aktualizován"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Uživatel s ID \"%1$s\" není dostupný."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18745,7 +18872,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19012,23 +19139,23 @@ msgstr "Validace"
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19235,8 +19362,8 @@ msgstr "Svislé zarovnání"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamsky (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19263,7 +19390,12 @@ msgstr "Zobrazované jméno"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Zobrazované jméno nemůže být prázdné když jméno hostu chybí."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "St"
@@ -19280,11 +19412,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Varování"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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."
 
@@ -19300,7 +19432,7 @@ msgstr "Je nám líto, maximální počet elementů na zapamatování byl již d
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19371,7 +19503,7 @@ msgstr ""
 msgid "Wed"
 msgstr "St"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Středa"
 
@@ -19382,6 +19514,10 @@ msgstr "Středa"
 msgid "Weekly"
 msgstr "Týdně"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Vítejte"
@@ -19399,7 +19535,7 @@ msgstr "Kdy je aktivní"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19612,8 +19748,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19655,19 +19791,19 @@ msgstr "Ročně"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19735,19 +19871,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nemáte oprávnění na vykonání této operace."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Nemáte oprávnění na vytváření uživatelů."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Nemáte oprávnění pro přístup k této stránce."
@@ -19868,7 +20000,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "boolean je očekávám"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19987,7 +20119,6 @@ msgstr "agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20283,9 +20414,9 @@ msgstr "nemůže být změněno"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20365,7 +20496,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "zacyklená provázanost položek není povolena"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20412,7 +20543,7 @@ msgstr "count() - Počet úspěšně přijatých hodnot V (za které ručí oper
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20611,13 +20742,13 @@ msgstr "globálně nastavené údržby"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20665,7 +20796,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "včetně podskupin"
 
@@ -20891,12 +21022,12 @@ msgstr "základní pravidlo nálezu"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21000,8 +21131,8 @@ msgstr "min() - Minimální hodnota pro periodu T"
 msgid "minimum length is %1$s characters"
 msgstr "minimální délka je %1$s znaků"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -21096,7 +21227,7 @@ msgstr ""
 msgid "name"
 msgstr "název"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "nový"
 
@@ -21163,7 +21294,7 @@ msgstr "now() - Počet sekund od Období"
 msgid "number"
 msgstr "číslo"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "z"
@@ -21231,7 +21362,7 @@ msgstr "výstup"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21358,7 +21489,7 @@ msgstr "vybrané"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "krátký popis"
 
@@ -21443,7 +21574,7 @@ msgstr "sum() - Souhrn hodnot za periodu T"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "zadaná pověření nejsou jedinečná"
 
@@ -21453,8 +21584,8 @@ msgstr "zadaná pověření nejsou jedinečná"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21535,7 +21666,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "časový posun"
 
@@ -21598,7 +21729,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "pište zde pro vyhledávání"
 
@@ -21625,7 +21756,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21719,7 +21850,7 @@ msgstr "nepodporované číslo verze"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21739,7 +21870,7 @@ msgstr "nepodporované číslo verze"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "hodnota"
 
@@ -21886,7 +22017,7 @@ msgstr "špatný typ vyhledávacího pravidla"
 msgid "wrong item type"
 msgstr "špatný typ položky"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "r"
diff --git a/ui/locale/de/LC_MESSAGES/frontend.po b/ui/locale/de/LC_MESSAGES/frontend.po
index e88b930e222..b6a817d6606 100644
--- a/ui/locale/de/LC_MESSAGES/frontend.po
+++ b/ui/locale/de/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2014-09-24 14:37+0300\n"
 "Last-Translator: maxhq <jens@jebecs.de>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d Tag"
 msgstr[1] "%1$d Tage"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] "%1$s Nachrichten"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s von %2$s Elementen in problematischem Zustand"
 msgstr[1] "%1$s von %2$s Elementen in problematischem Zustand"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, fuzzy, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Noch %1$s Versuch"
 msgstr[1] "Noch %1$s Versuche"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s Sekunde"
 msgstr[1] "%1$s Sekunden"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s Symbole übrig"
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Schweregrad, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, schreibgeschützt"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr "(kein Proxy)"
 msgid "0 - use default port"
 msgstr "0 - nutze Standard Port"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 oder 1"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "UND"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Zugriff verweigert"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Zugriff verweigert!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Bestätigt"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Bestätigen"
 
@@ -499,7 +499,7 @@ msgstr "Bestätigen"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bestätigt"
@@ -528,20 +528,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -647,7 +649,7 @@ msgstr "Aktion geändert"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -656,7 +658,7 @@ msgstr "Aktion geändert"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Aktionen"
@@ -715,8 +717,8 @@ msgstr "Aktiv bis"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -727,7 +729,6 @@ msgstr "Aktiv bis"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -735,11 +736,13 @@ msgstr "Aktiv bis"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -751,15 +754,17 @@ msgstr "Aktiv bis"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -826,7 +831,7 @@ msgstr "Aktiv bis"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -834,19 +839,19 @@ msgstr "Hinzufügen"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Neues Widget hinzufügen"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Untergeordnetes Element hinzufügen"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -863,7 +868,7 @@ msgstr "Host hinzufügen"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Füge mehrere Karten hinzu"
 
@@ -880,7 +885,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -888,7 +897,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -922,7 +931,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Widget hinzufügen"
 
@@ -931,12 +940,20 @@ msgstr "Widget hinzufügen"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Hinzugefügt, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -946,6 +963,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administration"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Erweiterte Beschriftungen"
@@ -1032,7 +1053,7 @@ msgstr "Kartenelemente ausrichten"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Alle"
 
@@ -1041,8 +1062,8 @@ msgid "All dashboards"
 msgstr "Alle Dashboards"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Alle Gruppen"
 
@@ -1050,7 +1071,7 @@ msgstr "Alle Gruppen"
 msgid "All hosts"
 msgstr "Alle Rechner"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Alle Verknüpfungen sollten Angaben für \"Name\" und \"URL\" haben"
 
@@ -1084,7 +1105,7 @@ msgstr "Alle Vorlagen"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1097,7 +1118,7 @@ msgstr "Erlaube manuelles Schließen"
 msgid "Allowed hosts"
 msgstr "Zugelassene Hosts"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1115,7 +1136,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1156,12 +1177,12 @@ msgstr "Und/Oder"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1182,15 +1203,15 @@ msgstr "Programmfehler."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Verwenden"
 
@@ -1208,7 +1229,7 @@ msgstr "Kommend"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "April"
 
@@ -1237,6 +1258,10 @@ msgstr "Bereichstyp"
 msgid "Arithmetic"
 msgstr "Arithmetik"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "als Klartext"
@@ -1287,8 +1312,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1366,7 +1391,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "August"
 
@@ -1396,7 +1421,7 @@ msgstr "Authentifizierung"
 msgid "Authentication algorithm"
 msgstr "Authentifizierungs-Algorithmus"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "Authentifizierung fehlgeschlagen: %1$s."
@@ -1445,7 +1470,7 @@ msgstr "Automatisch"
 msgid "Auto-login"
 msgstr "Automatisches Anmelden"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Automatisches An-und Abmelden kann nicht gleichzeitig aktiviert werden."
 
@@ -1455,7 +1480,7 @@ msgstr "Automatisches Abmelden"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1641,11 +1666,11 @@ msgstr "Beide Passwörter müssen gleich sein."
 msgid "Bottom"
 msgstr "Unten"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Ebene nach vorn"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "In den Vordergrund"
 
@@ -1726,7 +1751,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Berechnet"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -1746,8 +1771,8 @@ msgstr "Rückruf"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1764,8 +1789,8 @@ msgstr "Rückruf"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1795,7 +1820,7 @@ msgstr "Kann Aktion nicht hinzufügen"
 msgid "Cannot add correlation"
 msgstr "Korrelation kann nicht hinzugefügt werden"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1806,7 +1831,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Abhängigkeit von einem Host zu einer Vorlage nicht möglich."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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."
@@ -1925,7 +1950,7 @@ msgid "Cannot add user"
 msgstr "Kann Benutzer nicht hinzufügen"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr "Kann Benutzergruppe nicht hinzufügen"
 
@@ -1933,11 +1958,11 @@ msgstr "Kann Benutzergruppe nicht hinzufügen"
 msgid "Cannot add web scenario"
 msgstr "Kann Web-Szenario nicht hinzufügen"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2019,7 +2044,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "Kann Auslöser nicht kopieren"
 msgstr[1] "Kann Auslöser nicht kopieren"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Kann den Auslöser \"%1$s:%2$s\" nicht kopieren, weil er mehrere Hosts im Ausdruck hat."
@@ -2074,7 +2099,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2491,7 +2516,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Kann Macros nicht auflösen"
 
@@ -2661,7 +2686,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2723,7 +2748,7 @@ msgstr ""
 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Gastbenutzer kann nicht umbenannt werden."
 
@@ -2782,7 +2807,12 @@ msgstr "Kann Inventarfeld nicht setzen wegen deaktivierter Inventarfunktion."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr "Kann für dieses Gerät keine akustische Meldung unterstützen."
 
@@ -3204,6 +3234,7 @@ msgid "Change per second"
 msgstr "Änderung pro Sekunde"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Schweregrad ändern"
 
@@ -3345,7 +3376,7 @@ msgstr "Überprüft die Performanz eines UDP Dienstes. Rückgabe 0 - Dienst ist
 msgid "Checks should be unique."
 msgstr "Prüfungen sollten einzigartig sein."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3387,11 +3418,11 @@ msgstr "Verlauf und Trends leeren"
 msgid "Clear when unlinking"
 msgstr "Leeren, wenn getrennt wird"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "Klicke und ziehe zur gewünschten Grösse"
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "Klicke zum Betrachten oder Bearbeiten"
 
@@ -3421,7 +3452,7 @@ msgstr "Uhr"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Klonen"
 
@@ -3432,8 +3463,8 @@ msgstr "Klonen"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Schließen"
 
@@ -3463,8 +3494,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Einklappen"
 
@@ -3481,7 +3512,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3549,6 +3580,7 @@ msgstr "Aktuelle Sitzungen"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Voraussetzung"
 
@@ -3603,7 +3635,7 @@ msgstr "Voraussetzungen"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -3866,7 +3898,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3903,8 +3935,8 @@ msgstr "Enthält"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3965,8 +3997,8 @@ msgstr "Koordinaten"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Kopieren"
 
@@ -4098,11 +4130,11 @@ msgstr "Erstelle Korrelation"
 msgid "Create dashboard"
 msgstr "Dashboard erstellen"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "Erzeuge abhängige Suchlaufregel"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Abhängiges Element erstellen"
 
@@ -4219,7 +4251,7 @@ msgstr "Neue Karte"
 msgid "Create media type"
 msgstr "Neuer Medientyp"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Erstelle neues"
 
@@ -4235,7 +4267,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Neues Skript"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4243,7 +4275,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Neue Vorlage"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Neuer Auslöser"
 
@@ -4465,7 +4497,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Dashboard Eigenschaften"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Dashboard Teilen"
 
@@ -4495,7 +4527,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Dashboards"
 
@@ -4666,7 +4698,7 @@ msgstr "Wochentag"
 msgid "Days"
 msgstr "Tage"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debug"
 
@@ -4680,7 +4712,7 @@ msgstr "Debug-Modus"
 msgid "Dec"
 msgstr "Dez"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Dezember"
 
@@ -4689,13 +4721,17 @@ msgstr "Dezember"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Standard"
 
@@ -4765,8 +4801,8 @@ msgid "Delayed by"
 msgstr "Verspätung"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4780,7 +4816,7 @@ msgstr "Verspätung"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4812,8 +4848,8 @@ msgstr "Verspätung"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Löschen"
 
@@ -4842,7 +4878,7 @@ msgstr "Aktuelle Aktion löschen?"
 msgid "Delete current correlation?"
 msgstr "Aktuelle Korrelation löschen?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Dashboard löschen?"
 
@@ -4886,7 +4922,7 @@ msgstr "Datenpunkt Prototyp löschen?"
 msgid "Delete item?"
 msgstr "Datenpunkt löschen?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Verknüpfung zwischen ausgewählten Elementen löschen?"
 
@@ -4942,7 +4978,7 @@ msgstr "Ausgewählte Dashboards löschen?"
 msgid "Delete selected discovery rules?"
 msgstr "Ausgewählte Suchläufe löschen?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Ausgewählte Elemente löschen?"
 
@@ -5043,11 +5079,11 @@ msgstr "Ausgewählte Skripte löschen?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Ausgewählten Formen löschen?"
 
@@ -5063,7 +5099,7 @@ msgstr "Ausgewählte Auslöser Prototypen löschen?"
 msgid "Delete selected triggers?"
 msgstr "Ausgewählte Auslöser löschen?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Ausgewählten Benutzer löschen?"
 
@@ -5114,7 +5150,7 @@ msgstr "Gelöscht: Vorlage \"%1$s\"."
 msgid "Delimiter"
 msgstr "Trennzeichen"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5128,7 +5164,7 @@ msgstr "Verweigern"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5136,7 +5172,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "ABHÄNGIGKEIT"
 
@@ -5144,7 +5180,7 @@ msgstr "ABHÄNGIGKEIT"
 msgid "Dependent item"
 msgstr "Abhängiger Datenpunkt"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5172,7 +5208,7 @@ msgstr "Verteilungsstatus"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5336,7 +5372,7 @@ msgstr "Ausgewählte Web Szenarios löschen?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5349,14 +5385,14 @@ msgstr "Ausgewählte Web Szenarios löschen?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5440,7 +5476,7 @@ msgid "Discovery by proxy"
 msgstr "Suchlauf durch Proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Suchlaufprüfung"
 
@@ -5452,7 +5488,7 @@ msgstr "Suchlaufprüfungen"
 msgid "Discovery list"
 msgstr "Suchlaufliste"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Suchlaufobjekt"
 
@@ -5553,7 +5589,7 @@ msgstr "Suchlaufregel aktualisiert"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5564,7 +5600,7 @@ msgstr "Suchläufe"
 msgid "Discovery rules deleted"
 msgstr "Suchlaufregel gelöscht"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Suchlaufstatus"
@@ -5604,7 +5640,7 @@ msgstr "Gestapeltes Diagramm angezeigt"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zeige %1$s von %2$s gefundenen"
@@ -5622,10 +5658,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Nicht berechnen"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5640,7 +5672,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Wollen Sie den bedingten Ausdruck ersetzen?"
 
@@ -5696,7 +5728,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nicht erreichbar"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5705,7 +5737,7 @@ msgid "Download the configuration file"
 msgstr "Konfigurationsdatei herunterladen"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Downtime"
@@ -5781,7 +5813,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5803,7 +5835,7 @@ msgstr "Dynamisches Element"
 msgid "Dynamic items"
 msgstr "Dynamische Datenpunkte"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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"
 
@@ -5811,13 +5843,14 @@ msgstr "Jede URL sollte einzigartig sein. Bitte überprüfen Sie, dass nur eine
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5829,8 +5862,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -5846,11 +5879,11 @@ msgstr "Karte anpassen"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Baum-Element bearbeiten"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Bearbeite Auslöser"
 
@@ -6128,7 +6161,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6150,12 +6183,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6214,7 +6247,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6238,7 +6271,7 @@ msgstr "Fehler"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Fehler bei der Suchanfrage für Tabelle \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Fehlermeldung"
 
@@ -6277,7 +6310,7 @@ msgstr "Regeln für Ereigniskorrelation"
 msgid "Event details"
 msgstr "Ereignisdetails"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Ereigniserzeugung"
 
@@ -6307,7 +6340,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Ereignis Marker"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Ereignistyp"
 
@@ -6341,7 +6374,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Ausschließen"
 
@@ -6352,7 +6385,7 @@ msgstr "Ausschließen"
 msgid "Exclude host groups"
 msgstr "Host-Gruppen ausschließen"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Ausführen"
 
@@ -6398,7 +6431,7 @@ msgstr "Ausgeführt"
 msgid "Executed script"
 msgstr "Ausgeführtes Skript"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Ausführbestätigung"
 
@@ -6414,8 +6447,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Erweitern"
 
@@ -6482,7 +6515,7 @@ msgstr "Exportieren als CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6536,7 +6569,7 @@ msgstr "Ausdrücke"
 msgid "External check"
 msgstr "Externe Überprüfung"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Fr"
@@ -6560,7 +6593,7 @@ msgid "Failed"
 msgstr "Gescheitert"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Fehler bei Dashboard-Erstellung"
 
@@ -6569,24 +6602,24 @@ msgstr "Fehler bei Dashboard-Erstellung"
 msgid "Failed to parse URL."
 msgstr "Fehler beim Parsen der URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Fehler beim Aktualisieren des Dashboards"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6594,7 +6627,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Fehler beim Aktualisieren der Vorlage."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6619,7 +6652,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Februar"
 
@@ -6765,8 +6798,8 @@ msgstr "Gefüllt"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6844,6 +6877,10 @@ msgstr "An Karte anpassen"
 msgid "Fixed"
 msgstr "Fest"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6909,14 +6946,14 @@ msgstr "Französisch (fr_FR)"
 msgid "Fri"
 msgstr "Fr"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Freitag"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6934,7 +6971,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Zugriff auf Oberfläche"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Benachrichtigung in Oberfläche"
 
@@ -7017,7 +7054,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Übergebene Expression ist kein Makro"
 
@@ -7035,7 +7072,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr "Zurück zu %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Gehe zu"
 
@@ -7084,7 +7121,7 @@ msgstr "Linie (Gradient)"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7245,7 +7282,7 @@ msgstr "Diagramm namens \"%1$s\" existiert bereits (ggf. als Diagrammprototyp)."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Diagramme"
 
@@ -7447,11 +7484,11 @@ msgstr "Hilfe"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadezimal in dezimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Debug ausblenden"
 
@@ -7497,14 +7534,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Verlauf"
 
@@ -7568,7 +7605,7 @@ msgstr "Horizontale Ausrichtung"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7576,8 +7613,7 @@ msgstr "Horizontale Ausrichtung"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7589,7 +7625,7 @@ msgstr "Horizontale Ausrichtung"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7670,7 +7706,7 @@ msgstr[1] "Hosts aktiviert"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7678,7 +7714,7 @@ msgstr[1] "Hosts aktiviert"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Hostgruppe"
@@ -7709,7 +7745,7 @@ msgstr "Beschriftung Hostgruppe"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Host-Gruppe mit ID \"%1$s\" ist nicht verfügbar."
@@ -7726,7 +7762,7 @@ msgstr "Host-Gruppe mit ID \"%1$s\" ist nicht verfügbar."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7765,7 +7801,7 @@ msgstr "Hostschnittstelle"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7913,7 +7949,7 @@ msgstr "Host mit identischen, sichtbarem Namen \"%1$s\" bereits vorhanden."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8145,14 +8181,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Identifikation des Systems. Rückgabewert Zeichenfolge"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8161,12 +8249,16 @@ msgstr "Fragen Sie bitte ihren Administrator um die nötigen Berechtigungen, fal
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Bild"
 
@@ -8296,7 +8388,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8309,11 +8401,11 @@ msgstr "Unerreichbare Karte"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8339,7 +8431,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Einfügen"
 
@@ -8357,6 +8449,11 @@ msgstr "Untergruppen enthalten"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Eingehenden Traffic-Statistiken auf Netzwerk-Schnittstelle. Gibt Ganzzahl zurück"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8747,7 +8844,7 @@ msgstr "Falsche Filterbedingung Typ für die Aktion \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Unzulässige Funktion verwendet"
 
@@ -8804,7 +8901,7 @@ 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."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Falscher Datenpunkt Wertetyp"
 
@@ -8835,7 +8932,7 @@ msgstr "Falsche Medientyp-ID."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Falsche Methode \"%1$s.%2$s\"."
@@ -8975,10 +9072,10 @@ msgstr "Falsche Benutzer-ID für Karte \"%1$s\" angegeben."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Falsche Gruppen-ID für Karte \"%1$s\" angegeben."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9285,9 +9382,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9359,6 +9456,10 @@ msgstr "Falscher Wert für PSK Feld verwendet. Der PSK sollte aus einer geraden
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Falscher Wert benutzt für Proxystatus \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonesisch (id_ID)"
@@ -9370,12 +9471,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9448,7 +9549,7 @@ msgid "Insert"
 msgstr "Einfügen"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Ausdruck einfügen"
 
@@ -9556,7 +9657,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9604,7 +9705,7 @@ msgstr "Ungültiges Datum."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Ungültige E-Mail Adresse \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Ungültige E-Mail Adresse \"%1$s\" für Medientyp mit ID \"%1$s\"."
@@ -9707,8 +9808,8 @@ msgstr "Ungültige Methoden-Parameter."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9912,7 +10013,7 @@ msgstr "Ungültige Zeitspanne."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -10102,7 +10203,7 @@ msgstr "Datenpunkt-Prototypen aktualisiert"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10263,7 +10364,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Januar"
 
@@ -10285,7 +10386,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Juli"
 
@@ -10293,7 +10394,7 @@ msgstr "Juli"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Juni"
 
@@ -10327,7 +10428,7 @@ msgstr "Schlüssel"
 msgid "Key passphrase"
 msgstr "Schlüssel-Passwort"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Schlüsselwort"
 
@@ -10398,7 +10499,7 @@ msgstr "Beschriftungsposition"
 msgid "Language"
 msgstr "Sprache"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr "Sprache \"%1$s\" ist nicht unterstützt."
@@ -10477,11 +10578,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Letzte Überprüfung"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Diagramm der letzten Stunde"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Diagramm des letzten Monats"
 
@@ -10519,7 +10620,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Aktueller Wert"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Diagramm der letzten Woche"
 
@@ -10532,11 +10633,11 @@ msgstr "Diagramm der letzten Woche"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Aktuelle Daten"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Aktuellste Werte"
 
@@ -10647,7 +10748,7 @@ msgid "Link new templates"
 msgstr "Neue Vorlagen verbinden"
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10725,12 +10826,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Liste der Benutzergruppen Freigaben"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Liste der Benutzer Freigaben"
@@ -10858,7 +10959,7 @@ msgstr "Suchlauf-Regel im Zustand \"nicht unterstützt\""
 msgid "M"
 msgstr "Mo"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Mo"
@@ -11018,7 +11119,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11047,7 +11148,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Karte"
 
@@ -11086,7 +11187,7 @@ msgstr "Ort der Beschriftung des Tafel-Elements"
 msgid "Map element label type"
 msgstr "Tafel-Element Beschriftungstyp"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr "Tafel ist aktualisiert! Zur Tafel-Liste zurück gehen?"
 
@@ -11112,7 +11213,7 @@ msgstr "Kartenbesitzer darf nicht leer sein."
 msgid "Map shape"
 msgstr "Tafelform"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Karten Aktualisierung fehlgeschlagen."
 
@@ -11148,7 +11249,7 @@ msgstr "Karten"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "März"
 
@@ -11176,7 +11277,7 @@ msgstr "Maske"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11247,9 +11348,9 @@ msgstr "Maximal vom OS unterstützte Anzahl offener Dateien. Gibt Ganzzahl zurü
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11262,12 +11363,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "Maximal darstellbare Zeitspanne ist %1$s Tag."
 msgstr[1] "Maximal darstellbare Zeitspanne ist %1$s Tage."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mai"
 
@@ -11277,8 +11378,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Medien"
 
@@ -11339,7 +11440,7 @@ msgstr "Test des Medientyps erfolgreich."
 msgid "Media type updated"
 msgstr "Medientyp geändert"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Medientyp der ID \"%1$s\" ist nicht verfügbar."
@@ -11412,8 +11513,8 @@ msgstr "Nachrichtenvorlage"
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Nachrichten-Timeout"
 
@@ -11431,7 +11532,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Nachrichtensystem"
 
@@ -11459,6 +11560,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11474,11 +11580,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11624,7 +11725,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Mo"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Montag"
 
@@ -11664,11 +11765,11 @@ msgstr "Monat"
 msgid "Monthly"
 msgstr "Monatlich"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Mehrere Übereinstimmungen gefunden..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11684,6 +11785,14 @@ msgstr "Mehr als 10 Minuten"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Es existiert mehr als ein Diagramm namens \"%1$s\" auf dem Host."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11693,11 +11802,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Mehrfach"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Mehrere PROBLEM-Ereignisse"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Stumm"
 
@@ -11705,6 +11814,18 @@ msgstr "Stumm"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11799,25 +11920,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11960,6 +12082,10 @@ msgstr ""
 msgid "Never"
 msgstr "Niemals"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11971,7 +12097,7 @@ msgstr "Neue Bedingung"
 msgid "New dashboard"
 msgstr "Neues dashboard"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Neues Element"
 
@@ -11995,7 +12121,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Neuer regulärer Ausdruck"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12012,7 +12138,7 @@ msgid "New triggers"
 msgstr "Neue Auslöser"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12030,20 +12156,20 @@ msgstr "Nächster Schritt"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12176,7 +12302,7 @@ msgstr "Keine Details"
 msgid "No discovery rule IDs given."
 msgstr "Keine Suchlauf-IDs festgelegt."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12238,7 +12364,7 @@ msgstr "Kein Bild"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Keine Schnittstelle gefunden"
 
@@ -12278,7 +12404,7 @@ msgstr "Keine Makros gefunden."
 msgid "No maps added."
 msgstr "Keine Karten hinzugefügt."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -12291,8 +12417,8 @@ msgstr "Keine neuen Module entdeckt"
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Keine Berechtigung zum Zugriff auf die Oberfläche."
 
@@ -12304,7 +12430,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12312,11 +12437,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12434,19 +12560,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12455,15 +12581,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12490,7 +12616,7 @@ msgstr "Keine Datei mit öffentlichem Schlüssel angegeben."
 msgid "No recipients for action operation message."
 msgstr "Keine Empfänger für die Nachricht der Aktionsoperation."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Keine Aktualisierung"
 
@@ -12506,7 +12632,7 @@ msgstr "Kein Ziel ausgewählt"
 msgid "No target selected."
 msgstr "Kein Ziel ausgewählt."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12553,7 +12679,7 @@ msgstr "Kein"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12585,15 +12711,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nicht erlaubt, Passwort für Benutzer \"guest\" zu setzen."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12626,8 +12752,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nicht unterstützt"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Notiz"
 
@@ -12658,7 +12784,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "November"
 
@@ -12821,12 +12947,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numerisch (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Numerisch (Ganzzahl)"
 
@@ -12841,18 +12967,17 @@ msgstr "Numerisch (kein Vorzeichen)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12879,7 +13004,7 @@ msgstr "OOB-Router"
 msgid "OOB subnet mask"
 msgstr "OOB-Subnetz-Maske"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "ODER"
 
@@ -12907,13 +13032,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr "Oktal zu Dezimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Oktober"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Aus"
 
@@ -12925,7 +13050,7 @@ msgstr "Aus"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12944,7 +13069,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "An"
 
@@ -12952,7 +13077,7 @@ msgstr "An"
 msgid "On status change triggers blink for"
 msgstr "Ändert sich der Zustand, blinken Auslöser"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Einmal"
 
@@ -12969,7 +13094,7 @@ msgid "One time only"
 msgstr "Einmalig"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Einmalige Downtime"
 
@@ -12981,26 +13106,14 @@ msgstr "Nur Super-Admins können Hostgruppen erstellen."
 msgid "Only Super Admins can create media types."
 msgstr "Nur Super-Admins können Medientypen erstellen."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Nur Super-Admins können Benutzergruppen erstellen."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Nur Super-Admins können Medientypen löschen."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Nur Super-Admins können Benutzergruppen löschen."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Nur Super-Admins können Medientypen bearbeiten."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Nur Super-Admins können Benutzergruppen aktualisieren."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Nur Zabbix Agent, SNMPv1, SNMPv2 und SNMPv3 Checks können einzigartig gemacht werden."
@@ -13041,11 +13154,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Nur ausgewähltes Problem"
 msgstr[1] "Nur ausgewählte Probleme"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13079,7 +13192,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informationen zum Betriebssystem. Rüchgabewert Zeichenfolge"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13104,7 +13217,7 @@ msgstr "Operation hat keine zugeordneten Gruppen zur Ausführung."
 msgid "Operation has no template to operate."
 msgstr "Operation hat keine zugeordneten Vorlagen zur Ausführung."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13129,27 +13242,27 @@ msgstr "Operationen"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
@@ -13174,7 +13287,7 @@ msgstr "Einstellungen"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13191,8 +13304,8 @@ msgstr "Oder"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13239,9 +13352,9 @@ msgstr "Oder"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Original"
 
@@ -13495,7 +13608,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEM"
@@ -13542,7 +13655,7 @@ msgstr "PSK-Identität"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK ist zu kurz. Es sind mindestens %1$s Hex-Ziffern."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13565,13 +13678,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13603,9 +13718,7 @@ msgstr "Übergeordnete Elemente"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13694,15 +13807,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Einfügen"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Ohne externe Links einfügen"
 
@@ -13776,19 +13893,20 @@ msgid "Periods"
 msgstr "Zeitspannen"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Berechtigungen können nur Benutzergruppen zugewiesen werden."
 
@@ -13810,12 +13928,12 @@ msgstr "Platzierungs-Algorithmus"
 msgid "Plain text"
 msgstr "Klartext"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Abspielen"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Geräusch abspielen"
 
@@ -13845,7 +13963,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Bitte zwei Elemente auswählen"
 
@@ -13974,7 +14092,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14032,7 +14150,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privat"
@@ -14053,12 +14171,12 @@ msgid "Privilege level"
 msgstr "Berechtigungsebene"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14088,7 +14206,7 @@ msgstr "Problem erzeugt"
 msgid "Problem display"
 msgstr "Problemdarstellung"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Problemausdruck"
@@ -14106,7 +14224,7 @@ msgstr "Problem ist nicht unterdrückt"
 msgid "Problem is suppressed"
 msgstr "Problem ist unterdrückt"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problem auf"
 
@@ -14119,8 +14237,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Problem gelöst"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14133,14 +14251,6 @@ msgstr ""
 msgid "Problem update"
 msgstr "Problemaktualisierung"
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problem, wenn alle untergeordneten Dienste Probleme haben"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problem, wenn mindestens ein untergeordneter Dienst Probleme hat"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14157,7 +14267,7 @@ msgstr "Problem, wenn mindestens ein untergeordneter Dienst Probleme hat"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Probleme"
 
@@ -14191,12 +14301,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Boats"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14218,7 +14328,7 @@ msgstr "Proxys"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14281,7 +14391,7 @@ msgstr "Name des Proxys"
 msgid "Proxy updated"
 msgstr "Proxy geändert"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Öffentlich"
@@ -14375,8 +14485,8 @@ msgstr "Lesen"
 msgid "Read only"
 msgstr "Nur lesen"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14384,8 +14494,8 @@ msgstr "Nur lesen"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14438,7 +14548,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14446,7 +14556,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Wiederherstellung"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14481,7 +14591,7 @@ msgstr "Rechteck"
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14542,7 +14652,7 @@ msgstr "Reguläre Ausdrücke"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14574,6 +14684,7 @@ msgstr "Befehl ausführen"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14583,7 +14694,7 @@ msgstr "Befehl ausführen"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14591,13 +14702,13 @@ msgstr "Befehl ausführen"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14607,8 +14718,8 @@ msgstr "Befehl ausführen"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14685,8 +14796,8 @@ msgstr "Befehl ausführen"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -14726,7 +14837,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14755,7 +14866,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14763,7 +14874,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Abhängigkeiten ersetzen"
 
@@ -14870,7 +14981,7 @@ msgstr "Geforderter HTTP-Statuscode"
 msgid "Required string"
 msgstr "Geforderte Zeichenkette"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -14904,7 +15015,7 @@ msgstr "Bestätigung zurücksetzen"
 msgid "Reset defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Wiederhergestellt"
 
@@ -15103,8 +15214,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15163,13 +15274,13 @@ msgid "Russian (ru_RU)"
 msgstr "Russisch (ru_RU)"
 
 # Samstag
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Sa"
 
 # Sonntag
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "So"
@@ -15180,10 +15291,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15396,7 +15505,7 @@ msgstr "Serifenlos"
 msgid "Sat"
 msgstr "Sa"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -15569,7 +15678,7 @@ msgstr "Skript geändert"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Skripte"
 
@@ -15639,8 +15748,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15648,7 +15757,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Auswählen"
 
@@ -15684,19 +15793,19 @@ msgstr "Ausgewählte Elemente"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Nach hinten senden"
 
@@ -15721,7 +15830,7 @@ msgstr "Schicke nur an"
 msgid "Send to"
 msgstr "Empfänger"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Zurücksenden"
 
@@ -15754,7 +15863,7 @@ msgstr "Getrennt"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "September"
 
@@ -15786,34 +15895,29 @@ msgid "Server time"
 msgstr "Serverzeit"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Dienst"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15821,7 +15925,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Dienst erstellt"
 
@@ -15850,7 +15954,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Startzeitpunkt des Dienstes muss vor dem Endzeitpunkt liegen."
 
@@ -15866,11 +15970,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Servicezeiten"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Servicetyp"
 
@@ -15879,7 +15983,7 @@ msgstr "Servicetyp"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Dienst geändert"
 
@@ -15888,16 +15992,16 @@ msgstr "Dienst geändert"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Dienste"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Dienste bilden eine zirkläre Abhängigkeit."
 
@@ -15909,9 +16013,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sitzung beendet, bitte neu anmelden."
 
@@ -15935,10 +16039,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15979,7 +16091,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16025,7 +16137,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Teilen"
 
@@ -16117,7 +16229,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16168,7 +16280,7 @@ msgstr "Warnung zeigen, wenn der Zabbix-Server nicht läuft"
 msgid "Show working time"
 msgstr "Zeige Arbeitszeit"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Angezeigt"
 
@@ -16278,7 +16390,7 @@ msgstr "Kopieren des Diagramms \"%1$s\" zum Host \"%2$s\" übersprungen."
 msgid "Slovak (sk_SK)"
 msgstr "Slovakisch (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Dösen"
 
@@ -16324,7 +16436,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sortierreihenfolge (0->999)"
 
@@ -16399,7 +16511,7 @@ msgstr "Start bei"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16447,12 +16559,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16463,17 +16577,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16497,13 +16618,10 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Statusberechnung"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Berechnungsalgorithmus"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16534,6 +16652,10 @@ msgstr "Status des Elements"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16565,8 +16687,8 @@ msgstr ""
 msgid "Steps"
 msgstr "Schritte"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Halt"
 
@@ -16578,7 +16700,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16611,7 +16733,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16644,7 +16766,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Subjekt"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Unter-Karte"
 
@@ -16661,7 +16783,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Erfolgreiche Anmeldung"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16674,7 +16796,7 @@ msgstr ""
 msgid "Sun"
 msgstr "So"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -16767,13 +16889,13 @@ msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
 # Donnerstag
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Do"
 
 # Dienstag
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Di"
@@ -16809,8 +16931,8 @@ msgstr "Tabelle \"%1$s\" hat keine Spalte namens \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Kennzeichnung"
@@ -16850,14 +16972,13 @@ msgstr "Maker-Wert"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16865,10 +16986,10 @@ msgstr "Maker-Wert"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17032,7 +17153,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17317,12 +17438,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Do"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Bis"
 
@@ -17332,13 +17453,13 @@ msgstr "Bis"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17419,7 +17540,7 @@ msgstr "Zeitstempel"
 msgid "To"
 msgstr "Bis"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 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"
 
@@ -17541,13 +17662,13 @@ msgstr "Trends"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Auslöser"
 
@@ -17566,7 +17687,7 @@ msgstr ""
 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."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17650,7 +17771,7 @@ msgstr "Auslöser"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17717,15 +17838,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Auslöserpriorität"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Auslöser Status \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17777,7 +17898,7 @@ msgstr "Menüleiste"
 msgid "Tue"
 msgstr "Di"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -17790,7 +17911,7 @@ msgstr "Türkisch (tr_TR)"
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17805,15 +17926,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17880,7 +18002,7 @@ msgid "UNKNOWN"
 msgstr "UNBEKANNT"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17890,7 +18012,7 @@ msgstr "UNBEKANNT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17936,7 +18058,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17984,7 +18106,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18031,7 +18153,8 @@ msgstr "Ausgewählte Benutzer entsperren?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18050,7 +18173,8 @@ msgstr "Einheit"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18061,9 +18185,9 @@ msgstr "Einheit"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -18082,12 +18206,12 @@ msgstr "Unbekannter Fehler"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Ausgewählter Host enthält keinen solchen Datenpunkt"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Kein solcher Host im System gefunden"
 
@@ -18135,7 +18259,7 @@ msgstr "Verbindung mit Vorlage entfernen"
 msgid "Unlink from templates"
 msgstr "Verbindung mit Vorlagen entfernen"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Ton an"
 
@@ -18216,27 +18340,28 @@ msgstr "Erreichbar"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18305,7 +18430,7 @@ msgid "Upper level maps"
 msgstr "Übergeordnete Karten"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Laufzeit"
@@ -18354,37 +18479,37 @@ msgstr "Benutzt in Aktion"
 msgid "User"
 msgstr "Benutzer"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "Benutzer \"%1$s\" ist Besitzer von Dashboard \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18401,13 +18526,13 @@ msgstr "Benutzer hinzugefügt"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18432,32 +18557,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Benutzergruppe"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Benutzer-Gruppe \"%1$s\" wird verwendet in Skript \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18488,7 +18613,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18496,14 +18621,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Benutzergruppen"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Benutzer darf sich nicht selbst löschen."
 
@@ -18552,7 +18677,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18586,7 +18711,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18607,12 +18732,12 @@ msgstr "Benutzer geändert"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18657,7 +18782,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18924,23 +19049,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19147,8 +19272,8 @@ msgstr "Vertikale Ausrichtung"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamesisch (Vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19175,7 +19300,12 @@ msgstr "Sichtbarer Name"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Sichtbarer Name darf nicht leer sein wenn der Hostname fehlt."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19192,12 +19322,12 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Warnung"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
 # "remember"?
-#: jsLoader.php:289
+#: jsLoader.php:294
 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."
 
@@ -19213,7 +19343,7 @@ msgstr "Leider wurde die maximale mögliche Anzahl von Elementen zur Erinnerung
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19282,7 +19412,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mi"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -19293,6 +19423,10 @@ msgstr "Mittwoch"
 msgid "Weekly"
 msgstr "wöchentlich"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Willkommen"
@@ -19310,7 +19444,7 @@ msgstr "Aktiv um"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19523,8 +19657,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19566,19 +19700,19 @@ msgstr "jährlich"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19646,19 +19780,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Sie haben keine Berechtigung, diese Operation durchzuführen."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Sie haben keine Berechtigung zur Erstellung von Benutzer."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Sie haben keine Berechtigungen zum Zugriff auf diese Seite."
@@ -19779,7 +19909,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "boolescher Wert erwartet"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19898,7 +20028,6 @@ msgstr "Agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20194,9 +20323,9 @@ msgstr "nicht änderbar"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20276,7 +20405,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "zirkuläre Datenpunkt Abhängigkeit ist nicht zulässig"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20323,7 +20452,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "T"
@@ -20522,13 +20651,13 @@ msgstr "globale Einstellungen Bereinigungsprozess"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20576,7 +20705,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "einschließlich Untergruppen"
 
@@ -20802,12 +20931,12 @@ msgstr "Suchlaufregel"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20911,8 +21040,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr "die Mindestlänge beträgt %1$s Zeichen"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -21007,7 +21136,7 @@ msgstr ""
 msgid "name"
 msgstr "Name"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "neu"
 
@@ -21074,7 +21203,7 @@ msgstr ""
 msgid "number"
 msgstr "Anzahl"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "von"
@@ -21143,7 +21272,7 @@ msgstr "Leistung"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21270,7 +21399,7 @@ msgstr "ausgewählt"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "Kurzbeschreibung"
 
@@ -21355,7 +21484,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21365,8 +21494,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21447,7 +21576,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21510,7 +21639,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "Hier klicken um zu suchen"
 
@@ -21537,7 +21666,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21631,7 +21760,7 @@ msgstr "nicht unterstützte Version"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21651,7 +21780,7 @@ msgstr "nicht unterstützte Version"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "Wert"
 
@@ -21798,7 +21927,7 @@ msgstr "Falscher Suchlaufregel-Typ"
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "J"
diff --git a/ui/locale/el/LC_MESSAGES/frontend.po b/ui/locale/el/LC_MESSAGES/frontend.po
index 63664101d16..f45a4f13861 100644
--- a/ui/locale/el/LC_MESSAGES/frontend.po
+++ b/ui/locale/el/LC_MESSAGES/frontend.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2014-10-03 08:43+0300\n"
 "Last-Translator: ΓΙΑΝΝΗΣ <yannis@computerstudio.gr>\n"
 "Language-Team: none\n"
@@ -98,7 +98,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d ημέρα"
 msgstr[1] "%1$d ημέρες"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -183,7 +183,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -197,7 +197,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -227,17 +227,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s προσπάθεια απέμεινε"
 msgstr[1] "%1$s προσπάθειες απέμειναν"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s δευτερόλεπτο"
 msgstr[1] "%1$s δευτερόλεπτα"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -257,13 +257,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -312,7 +312,7 @@ msgstr "(χωρίς διαμεσολαβητή)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 ή 1"
 
@@ -380,7 +380,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "ΚΑΙ"
 
@@ -397,7 +397,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -462,40 +462,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Απαγορευμένη πρόσβαση!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Αναγνώριση"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Αναγνώριση"
 
@@ -503,7 +503,7 @@ msgstr "Αναγνώριση"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Αναγνωρισμένο"
@@ -532,20 +532,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -650,7 +652,7 @@ msgstr "Η Ενέργεια ενημερώθηκε"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -659,7 +661,7 @@ msgstr "Η Ενέργεια ενημερώθηκε"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Ενέργειες"
@@ -718,8 +720,8 @@ msgstr "Ενεργό έως"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -730,7 +732,6 @@ msgstr "Ενεργό έως"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -738,11 +739,13 @@ msgstr "Ενεργό έως"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -754,15 +757,17 @@ msgstr "Ενεργό έως"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -829,7 +834,7 @@ msgstr "Ενεργό έως"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Προσθήκη"
 
@@ -837,19 +842,19 @@ msgstr "Προσθήκη"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -866,7 +871,7 @@ msgstr "Προσθήκη ξενιστή"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -883,7 +888,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -891,7 +900,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -925,7 +934,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -934,12 +943,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Διαχειριστής"
@@ -949,6 +966,10 @@ msgstr "Διαχειριστής"
 msgid "Administration"
 msgstr "Διαχείριση"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Σύνθετες ετικέτες"
@@ -1035,7 +1056,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Όλα"
 
@@ -1044,8 +1065,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1053,7 +1074,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Όλοι οι σύνδεσμοι πρέπει να έχουν \"Όνομα\" και \"URL\" καθορισμένο"
 
@@ -1087,7 +1108,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1100,7 +1121,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Επιτρεπόμενοι ξενιστές"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1118,7 +1139,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1159,12 +1180,12 @@ msgstr "Καί/Ή"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1184,15 +1205,15 @@ msgstr "Σφάλμα εφαρμογής."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Εφαρμογή"
 
@@ -1210,7 +1231,7 @@ msgstr "Προσεγγίζοντας"
 msgid "Apr"
 msgstr "Απρ"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Απρίλιος"
 
@@ -1238,6 +1259,10 @@ msgstr "Τύπος περιοχής"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Ως απλό κείμενο"
@@ -1286,8 +1311,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1365,7 +1390,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Αυγ"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Αύγουστος"
 
@@ -1395,7 +1420,7 @@ msgstr "Ταυτοποίηση"
 msgid "Authentication algorithm"
 msgstr "Αλγόριθμος ταυτοποίησης"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1444,7 +1469,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Αυτόματη σύνδεση"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1454,7 +1479,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1639,11 +1664,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Κάτω"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1724,7 +1749,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Υπολογισμένο"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1744,8 +1769,8 @@ msgstr "Επανάκληση"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1762,8 +1787,8 @@ msgstr "Επανάκληση"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Ματαίωση"
 
@@ -1793,7 +1818,7 @@ msgstr "Αδύνατη η προσθήκη ενέργειας"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1804,7 +1829,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Αδύνατη η προσθήκη εξάρτησης απο ξενιστή σε σχεδιότυπο."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1923,7 +1948,7 @@ msgid "Cannot add user"
 msgstr "Αδύνατη η προσθήκη χρήστη"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1931,11 +1956,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Αδύνατη η προσθήκη σενάριου ιστού"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2016,7 +2041,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Αδύνατη η αντιγραφή εναύσματος \"%1$s:%2$s\", επειδή έχει πολλούς ξενιστές στην έκφραση."
@@ -2071,7 +2096,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Αδύνατη η διαγραφή Zabbix εσωτερικού χρήστη \"%1$s\", απενεργοποιήστε το χρήστη."
@@ -2490,7 +2515,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2660,7 +2685,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2722,7 +2747,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Αδύνατη η ανάγνωση απάντησης, ελέγξτε σύνδεση με Zabbix εξυπηρετητή \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Αδύνατη η μετονομασία χρήστη επισκέπτη."
 
@@ -2781,7 +2806,12 @@ msgstr "Αδύνατη η τοποθέτηση πεδίων απογραφής �
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3206,6 +3236,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3347,7 +3378,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Οι έλεγχοι πρέπει να είναι μοναδικοί."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3389,11 +3420,11 @@ msgstr "Εκκαθάριση ιστορικού και τάσεων"
 msgid "Clear when unlinking"
 msgstr "Εκκαθάριση όταν αποσυνδέεται"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3423,7 +3454,7 @@ msgstr "Ρολόι"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Κλώνος"
 
@@ -3434,8 +3465,8 @@ msgstr "Κλώνος"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -3465,8 +3496,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3483,7 +3514,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3551,6 +3582,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Συνθήκη"
 
@@ -3605,7 +3637,7 @@ msgstr "Συνθήκες"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Διαμόρφωση"
 
@@ -3868,7 +3900,7 @@ msgstr "Επαφή"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3905,8 +3937,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3967,8 +3999,8 @@ msgstr "Συντεταγμένες"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Αντιγραφή"
 
@@ -4098,11 +4130,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4219,7 +4251,7 @@ msgstr "Δημιουργία χάρτη"
 msgid "Create media type"
 msgstr "Δημιουργία τύπου μέσων"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Δημιουργία νέου"
 
@@ -4235,7 +4267,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Δημιουργία δέσμης ενεργειών"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4243,7 +4275,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Δημιουργία σχεδιότυπου"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Δημιουργία εναύσματος"
 
@@ -4463,7 +4495,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4493,7 +4525,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4663,7 +4695,7 @@ msgstr "Ημέρα της εβδομάδος"
 msgid "Days"
 msgstr "Ημέρες"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Εκσφαλμάτωση"
 
@@ -4677,7 +4709,7 @@ msgstr "Λειτουργία εκσφαλμάτωσης"
 msgid "Dec"
 msgstr "Δεκ"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Δεκέμβριος"
 
@@ -4686,13 +4718,17 @@ msgstr "Δεκέμβριος"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
@@ -4762,8 +4798,8 @@ msgid "Delayed by"
 msgstr "Καθυστερημένο από"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4777,7 +4813,7 @@ msgstr "Καθυστερημένο από"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4809,8 +4845,8 @@ msgstr "Καθυστερημένο από"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -4839,7 +4875,7 @@ msgstr "Διαγραφή τρέχουσας ενέργειας;"
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4883,7 +4919,7 @@ msgstr "Διαγραφή πρωτότυπου συλλέκτη;"
 msgid "Delete item?"
 msgstr "Διαγραφή συλλέκτη;"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Διαγραφή συνδέσμων μεταξύ επιλεγμένων στοιχείων;"
 
@@ -4939,7 +4975,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Διαγραφή επιλεγμένων κανόνων εντοπισμού;"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Διαγραφή επιλεγμένων στοιχείων;"
 
@@ -5040,11 +5076,11 @@ msgstr "Διαγραφή επιλεγμένων δεσμών ενεργειών;
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5060,7 +5096,7 @@ msgstr "Διαγραφή επιλεγμένων πρωτότυπων εναυσ�
 msgid "Delete selected triggers?"
 msgstr "Διαγραφή επιλεγμένων εναυσμάτων;"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Διαγραφή επιλεγμένου χρήστη;"
 
@@ -5111,7 +5147,7 @@ msgstr "Διεγράφη: Σχεδιότυπο \"%1$s\"."
 msgid "Delimiter"
 msgstr "Οριοθέτης"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5125,7 +5161,7 @@ msgstr "Άρνηση"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5133,7 +5169,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Εξαρτήσεις"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Εξαρτημένο"
 
@@ -5141,7 +5177,7 @@ msgstr "Εξαρτημένο"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5169,7 +5205,7 @@ msgstr "Κατάσταση υλοποίησης"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5333,7 +5369,7 @@ msgstr "Απενεργοποίηση επιλεγμένων σεναρίων ι�
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5346,14 +5382,14 @@ msgstr "Απενεργοποίηση επιλεγμένων σεναρίων ι�
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5436,7 +5472,7 @@ msgid "Discovery by proxy"
 msgstr "Εντοπισμός με διαμεσολαβητή"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Έλεγχος εντοπισμού"
 
@@ -5448,7 +5484,7 @@ msgstr "Έλεγχοι εντοπισμών"
 msgid "Discovery list"
 msgstr "Κατάλογος εντοπισμού"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Αντικείμενο εντοπισμού"
 
@@ -5548,7 +5584,7 @@ msgstr "Κανόνας εντοπισμού ενημερώθηκε"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5559,7 +5595,7 @@ msgstr "Κανόνες εντοπισμού"
 msgid "Discovery rules deleted"
 msgstr "Κανόνες εντοπισμού διεγράφησαν"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Κατάσταση εντοπισμού"
@@ -5599,7 +5635,7 @@ msgstr "Εμφάνιση στοιβαγμένου γραφήματος"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Εμφάνιση %1$s από %2$s βρέθηκαν"
@@ -5617,10 +5653,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Μην υπολογίζεις"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5635,7 +5667,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Θέλετε να αντικαταστήσετε την υπο συνθήκη έκφραση;"
 
@@ -5691,7 +5723,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Ανενεργό"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5700,7 +5732,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Χρόνος μη διαθεσιμότητας"
@@ -5776,7 +5808,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5798,7 +5830,7 @@ msgstr "Δυναμικός συλλέκτης"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Κάθε URL πρέπει να έχει μοναδικό όνομα. Βεβαιωθείτε να υπάρχει μόνο ένα ονομαζόμενο URL"
 
@@ -5806,13 +5838,14 @@ msgstr "Κάθε URL πρέπει να έχει μοναδικό όνομα. Β�
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5824,8 +5857,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Επεξεργασία"
 
@@ -5841,11 +5874,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Επεξεργασία εναύσματος"
 
@@ -6120,7 +6153,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6142,12 +6175,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6206,7 +6239,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6230,7 +6263,7 @@ msgstr "Σφάλμα"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Σφάλμα στό αίτημα αναζήτησης για πίνακα \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6270,7 +6303,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Λεπτομέρειες συμβάντος"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Παραγωγή συμβάντος"
 
@@ -6300,7 +6333,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Τύπος συμβάντος"
 
@@ -6334,7 +6367,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Εξαίρεση"
 
@@ -6345,7 +6378,7 @@ msgstr "Εξαίρεση"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Εκτέλεση"
 
@@ -6391,7 +6424,7 @@ msgstr "Εκτελεσμένο"
 msgid "Executed script"
 msgstr "Εκτελέσιμη δέσμη ενεργειών"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Επιβεβαίωση εκτέλεσης"
 
@@ -6407,8 +6440,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6475,7 +6508,7 @@ msgstr "Εξαγωγή σε CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6529,7 +6562,7 @@ msgstr "Εκφράσεις"
 msgid "External check"
 msgstr "Εξωτερικός έλεγχος"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Π"
@@ -6553,7 +6586,7 @@ msgid "Failed"
 msgstr "Απέτυχε"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6562,24 +6595,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6587,7 +6620,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Αποτυχία ενημέρωσης σχεδιότυπου."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6611,7 +6644,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Φεβ"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Φεβρουάριος"
 
@@ -6757,8 +6790,8 @@ msgstr "Γεμισμένη περιοχή"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6836,6 +6869,10 @@ msgstr "Προσαρμογή στο χάρτη"
 msgid "Fixed"
 msgstr "Σταθερό"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6901,14 +6938,14 @@ msgstr "Γαλλικά (fr_FR)"
 msgid "Fri"
 msgstr "Παρ"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Παρασκευή"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6926,7 +6963,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Πρόσβαση στο περιβάλλον ΙΣΤΟΥ"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Μηνύματα στο περιβάλλον ΙΣΤΟΥ"
 
@@ -7008,7 +7045,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Η δοσμένη έκφραση δεν είναι μακροεντολή"
 
@@ -7026,7 +7063,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Μετάβαση σε"
 
@@ -7075,7 +7112,7 @@ msgstr "Χρωμοβαθμισμένη γραμμή"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7236,7 +7273,7 @@ msgstr "Γράφημα με όνομα \"%1$s\" υπάρχει ήδη σε γρ�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Γραφήματα"
 
@@ -7436,11 +7473,11 @@ msgstr "Βοήθεια"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Κρυφό"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7485,14 +7522,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Ιστορικό"
 
@@ -7556,7 +7593,7 @@ msgstr "Οριζόντια ευθυγράμμιση"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7564,8 +7601,7 @@ msgstr "Οριζόντια ευθυγράμμιση"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7577,7 +7613,7 @@ msgstr "Οριζόντια ευθυγράμμιση"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7657,7 +7693,7 @@ msgstr[1] "Ξενιστές ενεργοποιημένοι"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7665,7 +7701,7 @@ msgstr[1] "Ξενιστές ενεργοποιημένοι"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Ομάδα ξενιστών"
@@ -7696,7 +7732,7 @@ msgstr "Τύπος ετικέτας ομάδος ξενιστών"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7713,7 +7749,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7752,7 +7788,7 @@ msgstr "Διεπαφή ξενιστή"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7901,7 +7937,7 @@ msgstr "Ξενιστής με ίδιο ορατό όνομα \"%1$s\" υπάρχ
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8133,14 +8169,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Αν νομίζετε ότι το μήνυμα είναι λάθος, συμβουλευτείτε τους διαχειριστές για τις αναγκαίες άδειες."
@@ -8149,12 +8237,16 @@ msgstr "Αν νομίζετε ότι το μήνυμα είναι λάθος, σ
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Εικόνα"
 
@@ -8284,7 +8376,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8297,11 +8389,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8327,7 +8419,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Συμπεριλαμβάνω"
 
@@ -8345,6 +8437,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8735,7 +8832,7 @@ msgstr "Λανθασμένος τύπος φίλτρου συνθήκης γιά
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Λανθασμένη συνάρτηση σε χρήση"
 
@@ -8792,7 +8889,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Λανθασμένο κλειδί συλλέκτη \"%1$s\" παρέχεται για έκφραση εναύσματος σε \"%2$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8823,7 +8920,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Ανακριβής μέθοδος \"%1$s.%2$s\"."
@@ -8963,10 +9060,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9273,9 +9370,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9347,6 +9444,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Λανθασμένη τιμή σε χρήση κατάστασης διαμεσολαβητή \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Ινδονησιακά (id_ID)"
@@ -9358,12 +9459,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9436,7 +9537,7 @@ msgid "Insert"
 msgstr "Εισαγωγή"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Εισαγωγή έκφρασης"
 
@@ -9544,7 +9645,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9592,7 +9693,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9695,8 +9796,8 @@ msgstr "Άκυρες παράμετροι μεθόδου."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9900,7 +10001,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Απογραφή"
 
@@ -10091,7 +10192,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10252,7 +10353,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Ιαν"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Ιανουάριος"
 
@@ -10274,7 +10375,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Ιούλ"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Ιούλιος"
 
@@ -10282,7 +10383,7 @@ msgstr "Ιούλιος"
 msgid "Jun"
 msgstr "Ιούν"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Ιούνιος"
 
@@ -10316,7 +10417,7 @@ msgstr "Κλειδί"
 msgid "Key passphrase"
 msgstr "Κλειδί συνθηματικής φράσης"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Λέξη-κλειδί"
 
@@ -10386,7 +10487,7 @@ msgstr "Θέση επιγραφής"
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10465,11 +10566,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Τελευταίος έλεγχος"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Γράφημα τελευταίας ώρας"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Γράφημα τελευταίου μήνα"
 
@@ -10507,7 +10608,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Τελευταία τιμή"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Γράφημα τελευταίας εβδομάδος"
 
@@ -10520,11 +10621,11 @@ msgstr "Γράφημα τελευταίας εβδομάδος"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Τελευταία δεδομένα"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Τελευταίες τιμές"
 
@@ -10635,7 +10736,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10713,12 +10814,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10846,7 +10947,7 @@ msgstr "Κανόνας εντοπισμού χαμηλού επιπέδου σε
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Δ"
@@ -11006,7 +11107,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11035,7 +11136,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Χάρτης"
 
@@ -11074,7 +11175,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11100,7 +11201,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Αποτυχία ενημέρωσης χάρτη."
 
@@ -11136,7 +11237,7 @@ msgstr "Χάρτες"
 msgid "Mar"
 msgstr "Μαρ"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Μάρτιος"
 
@@ -11163,7 +11264,7 @@ msgstr "Μάσκα"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11234,9 +11335,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11249,12 +11350,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "Μέγιστη χρονική περίοδος εμφάνισης %1$s ημέρα."
 msgstr[1] "Μέγιστη χρονική περίοδος εμφάνισης %1$s ημέρες."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Μάιος"
 
@@ -11264,8 +11365,8 @@ msgid "May"
 msgstr "Μάι"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Μέσα ενημέρωσης"
 
@@ -11327,7 +11428,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Τύπος μέσων ενημερώθηκε"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11400,8 +11501,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Χρονικό όριο μηνύματος"
 
@@ -11419,7 +11520,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Ανταλλαγή μηνυμάτων"
 
@@ -11447,6 +11548,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11462,11 +11568,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11612,7 +11713,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Δευ"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -11652,11 +11753,11 @@ msgstr "Μήνας"
 msgid "Monthly"
 msgstr "Μηνιαίως"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Βρέθηκαν περισσότερα ταιριάσματα..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11672,6 +11773,14 @@ msgstr "Περισσότερο απο 10 λεπτά"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Πλέον του ενός γραφήματα ονόματος \"%1$s\" εντός ξενιστού."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11681,11 +11790,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Πολλαπλά ΠΡΟΒΛΗΜΑΤΙΚΑ συμβάντα"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Σίγαση"
 
@@ -11693,6 +11802,18 @@ msgstr "Σίγαση"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11787,25 +11908,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11948,6 +12070,10 @@ msgstr ""
 msgid "Never"
 msgstr "Ποτέ"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11959,7 +12085,7 @@ msgstr "Νέα συνθήκη"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Νέο στοιχείο"
 
@@ -11983,7 +12109,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Νέα κανονική έκφραση"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12000,7 +12126,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12018,20 +12144,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12164,7 +12290,7 @@ msgstr "Χωρίς λεπτομέρειες"
 msgid "No discovery rule IDs given."
 msgstr "Δεν δόθηκαν IDs κανόνα εντοπισμού."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12226,7 +12352,7 @@ msgstr "Χωρίς εικόνα"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Δεν βρέθηκε διεπαφή"
 
@@ -12266,7 +12392,7 @@ msgstr "Δεν βρέθηκαν μακροεντολές."
 msgid "No maps added."
 msgstr "Δεν προστέθηκαν χάρτες."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Δεν βρέθηκαν ταιριάσματα"
 
@@ -12279,8 +12405,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Χωρίς δικαιώματα για πρόσβαση συστήματος."
 
@@ -12292,7 +12418,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12300,11 +12425,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12422,19 +12548,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12443,15 +12569,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12478,7 +12604,7 @@ msgstr "Δεν καθορίστηκε αρχείο δημοσίου κλειδι
 msgid "No recipients for action operation message."
 msgstr "Χωρίς παραλήπτες για μήνυμα εργασίας ενέργειας."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12494,7 +12620,7 @@ msgstr "Δεν επιλέχθηκε στόχος"
 msgid "No target selected."
 msgstr "Δεν επιλέχθηκε στόχος."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12541,7 +12667,7 @@ msgstr "Ουδέν"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12573,15 +12699,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Δεν επιτρέπεται ορισμός συνθηματικού για χρήστη \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12613,8 +12739,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Μη υποστηριζόμενο"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Σημείωση"
 
@@ -12644,7 +12770,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Νοε"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Νοέμβριος"
 
@@ -12807,12 +12933,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Αριθμητικό (κινητή υποδιαστολή)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12827,18 +12953,17 @@ msgstr "Αριθμητικό (απρόσημο)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12865,7 +12990,7 @@ msgstr "OOB δρομολογητής"
 msgid "OOB subnet mask"
 msgstr "OOB μάσκα υποδικτύου"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "Ή"
 
@@ -12893,13 +13018,13 @@ msgstr "Οκτ"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Οκτώβριος"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Εκτός"
 
@@ -12911,7 +13036,7 @@ msgstr "Εκτός"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12930,7 +13055,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Επί"
 
@@ -12938,7 +13063,7 @@ msgstr "Επί"
 msgid "On status change triggers blink for"
 msgstr "Σε αλλαγή κατάστασης τα εναύσματα αναβοσβήνουν για"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Άπαξ"
 
@@ -12955,7 +13080,7 @@ msgid "One time only"
 msgstr "Μία φορά μόνο"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Μία φορά μή διαθέσιμο"
 
@@ -12967,26 +13092,14 @@ msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν ομά
 msgid "Only Super Admins can create media types."
 msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν τύπους μέσων ενημέρωσης."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Μόνο Υπερ Διαχειριστές διαγράφουν τύπους μέσων ενημέρωσης."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Μόνο Υπερ Διαχειριστές διαγράφουν ομάδες χρηστών."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Μόνο Υπερ Διαχειριστές επεξεργάζονται τύπους μέσων ενημέρωσης."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Μοναδικοί έλεγχοι μόνο Zabbix agent, SNMPv1, SNMPv2 and SNMPv3."
@@ -13027,11 +13140,11 @@ msgid_plural "Only selected problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13064,7 +13177,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13089,7 +13202,7 @@ msgstr "Η λειτουργία δεν έχει ομάδα να λειτουργ
 msgid "Operation has no template to operate."
 msgstr "Η λειτουργία δεν έχει σχεδιότυπο να λειτουργήσει."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13114,27 +13227,27 @@ msgstr "Λειτουργίες"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Χειριστής"
 
@@ -13159,7 +13272,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13176,8 +13289,8 @@ msgstr "Ή"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13224,9 +13337,9 @@ msgstr "Ή"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Αρχικό"
 
@@ -13478,7 +13591,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "ΠΡΟΒΛΗΜΑ"
@@ -13525,7 +13638,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13548,13 +13661,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Παράμετρος"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13585,9 +13700,7 @@ msgstr "Γονικοί συλλέκτες"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13676,15 +13789,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13758,19 +13875,20 @@ msgid "Periods"
 msgstr "Περίοδοι"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Τα δικαιώματα μπορούν να εκχωρηθούν μόνο σε ομάδες χρηστών."
 
@@ -13792,12 +13910,12 @@ msgstr "Αλγόριθμος τοποθέτησης"
 msgid "Plain text"
 msgstr "Απλό κείμενο"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Παίξε"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Παίξε ήχο"
 
@@ -13827,7 +13945,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Επιλέξτε δύο στοιχεία"
 
@@ -13956,7 +14074,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14015,7 +14133,7 @@ msgstr "Ιδιωτικό συνθηματικό"
 msgid "Privacy protocol"
 msgstr "Ιδιωτικό πρωτόκολλο"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14035,12 +14153,12 @@ msgid "Privilege level"
 msgstr "Επίπεδο δικαιωμάτων"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14070,7 +14188,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Πρόβλημα εμφάνισης"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14088,7 +14206,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Πρόβλημα σε"
 
@@ -14101,8 +14219,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14115,14 +14233,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Πρόβλημα, άν όλα τα θυγατρικά έχουν προβλήματα"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Πρόβλημα, άν τουλάχιστον ένα θυγατρικό έχει πρόβλημα"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14139,7 +14249,7 @@ msgstr "Πρόβλημα, άν τουλάχιστον ένα θυγατρικό
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Προβλήματα"
 
@@ -14173,12 +14283,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14200,7 +14310,7 @@ msgstr "Διαμεσολαβητές"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14264,7 +14374,7 @@ msgstr "Όνομα Διαμεσολαβητή"
 msgid "Proxy updated"
 msgstr "Διαμεσολαβητής ενημερώθηκε"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14358,8 +14468,8 @@ msgstr "Ανάγνωση"
 msgid "Read only"
 msgstr "Μόνο ανάγνωση"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14367,8 +14477,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14421,7 +14531,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14429,7 +14539,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Ανάκτηση"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14464,7 +14574,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14525,7 +14635,7 @@ msgstr "Κανονικές εκφράσεις"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14557,6 +14667,7 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14566,7 +14677,7 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14574,13 +14685,13 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14590,8 +14701,8 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14668,8 +14779,8 @@ msgstr "Απομακρυσμένη εντολή"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Αφαίρεση"
 
@@ -14709,7 +14820,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14738,7 +14849,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14746,7 +14857,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Αντικατάσταση"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Αντικατάσταση εξαρτήσεων"
 
@@ -14853,7 +14964,7 @@ msgstr "Απαιτούμενοι κωδικοί κατάστασης"
 msgid "Required string"
 msgstr "Απαιτούμενη στοιχειοσειρά"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Επαναφορά"
@@ -14887,7 +14998,7 @@ msgstr "Επιβεβαίωση επαναφοράς"
 msgid "Reset defaults"
 msgstr "Επαναφορά προκαθορισμένων"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Επιλυμένο"
 
@@ -15085,8 +15196,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15144,12 +15255,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Ρωσικά (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Σ"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Κ"
@@ -15160,10 +15271,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15376,7 +15485,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Σάβ"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Σάββατο"
 
@@ -15550,7 +15659,7 @@ msgstr "Δέσμη ενεργειών ενημερώθηκε"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Δέσμες ενεργειών"
 
@@ -15620,8 +15729,8 @@ msgid "Security name"
 msgstr "Όνομα ασφάλειας"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15629,7 +15738,7 @@ msgstr "Όνομα ασφάλειας"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Επιλέξτε"
 
@@ -15665,19 +15774,19 @@ msgstr "Επιλεγμένα στοιχεία"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15702,7 +15811,7 @@ msgstr "Αποστολή μόνο σε"
 msgid "Send to"
 msgstr "Αποστολή σε"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15735,7 +15844,7 @@ msgstr "Χωριστό"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Σεπτέμβριος"
 
@@ -15767,34 +15876,29 @@ msgid "Server time"
 msgstr "Ώρα εξυπηρετητή"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Υπηρεσία"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15802,7 +15906,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Υπηρεσία δημιουργήθηκε"
 
@@ -15831,7 +15935,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Χρόνος έναρξης υπηρεσίας πρέπει να είναι μικρότερος του χρόνου λήξης."
 
@@ -15847,11 +15951,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Χρόνοι υπηρεσίας"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Τύπος υπηρεσίας"
 
@@ -15860,7 +15964,7 @@ msgstr "Τύπος υπηρεσίας"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Υπηρεσία ενημερώθηκε"
 
@@ -15869,16 +15973,16 @@ msgstr "Υπηρεσία ενημερώθηκε"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Υπηρεσίες από κυκλική εξάρτηση."
 
@@ -15890,9 +15994,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Τερματισμός συνεδρίας. Επανασυνδεθείτε."
 
@@ -15916,10 +16020,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15960,7 +16072,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16006,7 +16118,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16097,7 +16209,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16148,7 +16260,7 @@ msgstr "Εμφάνιση προειδοποίησης εάν εξυπηρετη�
 msgid "Show working time"
 msgstr "Εμφάνιση χρόνου εργασίας"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Ορατό"
 
@@ -16257,7 +16369,7 @@ msgstr "Παράλειψη αντιγραφής γραφήματος \"%1$s\" σ
 msgid "Slovak (sk_SK)"
 msgstr "Σλοβακικά (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Αναβολή"
 
@@ -16303,7 +16415,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ταξινόμηση καταχωρίσεων με"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Σειρά ταξινόμησης (0->999)"
 
@@ -16377,7 +16489,7 @@ msgstr "Έναρξη σε"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16425,12 +16537,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16441,17 +16555,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16475,13 +16596,10 @@ msgstr ""
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Υπολογισμός κατάστασης"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Αλγόριθμος υπολογισμού κατάστασης"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16512,6 +16630,10 @@ msgstr "Κατάσταση μόνο"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16543,8 +16665,8 @@ msgstr "Βήμα ονόματος \"%1$s\" υπάρχει ήδη."
 msgid "Steps"
 msgstr "Βήματα"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Σταματώ"
 
@@ -16556,7 +16678,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16588,7 +16710,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16621,7 +16743,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Υποχάρτης"
 
@@ -16637,7 +16759,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Επιτυχής επιθεώρηση"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16650,7 +16772,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Κυρ"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -16742,12 +16864,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Π"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Τ"
@@ -16783,8 +16905,8 @@ msgstr "Ο πίνακας \"%1$s\" δεν έχει πεδίο με όνομα \"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Ετικέτα"
@@ -16824,14 +16946,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16839,10 +16960,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17006,7 +17127,7 @@ msgstr "Σχεδιότυπο με ίδιο ορατό όνομα \"%1$s\" υπά
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17291,12 +17412,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Πέμ"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Έως"
 
@@ -17306,13 +17427,13 @@ msgstr "Έως"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17393,7 +17514,7 @@ msgstr "Σήμανση χρόνου"
 msgid "To"
 msgstr "Σε"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Για να ορίσετε διεπαφή ξενιστή επιλέξτε απλό τύπο στοιχείου για όλα τα στοιχεία"
 
@@ -17515,13 +17636,13 @@ msgstr "Τάσεις"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Έναυσμα"
 
@@ -17540,7 +17661,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Έναυσμα \"%1$s\" εξαρτάται με ανύπαρκτο έναυσμα \"%2$s\"."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17624,7 +17745,7 @@ msgstr "Επισκόπηση εναυσμάτων"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17692,15 +17813,15 @@ msgstr "Πρωτότυπα εναύσματα διεγράφησαν"
 msgid "Trigger prototypes updated"
 msgstr "Πρωτότυπα εναύσματα ενημερώθηκαν"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Σοβαρότητα εναύσματος"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Κατάσταση εναύσματος \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Κατάσταση εναύσματος \"Problem\""
 
@@ -17752,7 +17873,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Τρι"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Τρίτη"
 
@@ -17765,7 +17886,7 @@ msgstr "Τουρκικά (tr_TR)"
 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\", αυτό θα οδηγούσε σε σύγκρουση."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17780,15 +17901,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17855,7 +17977,7 @@ msgid "UNKNOWN"
 msgstr "ΑΓΝΩΣΤΟ"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17865,7 +17987,7 @@ msgstr "ΑΓΝΩΣΤΟ"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17911,7 +18033,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17959,7 +18081,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18006,7 +18128,8 @@ msgstr "Απεμπλοκή επιλεγμένων χρηστών;"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18025,7 +18148,8 @@ msgstr "Μονάδες"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18036,9 +18160,9 @@ msgstr "Μονάδες"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Άγνωστο"
@@ -18057,12 +18181,12 @@ msgstr "Άγνωστο σφάλμα"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Άγνωστος συλλέκτης ξενιστή, κανένας τέτοιος συλλέκτης σε επιλεγμένο ξενιστή"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Άγνωστος ξενιστής, δεν υπάρχει τέτοιος ξενιστής στο σύστημα"
 
@@ -18109,7 +18233,7 @@ msgstr "Αποσύνδεση από σχεδιότυπο"
 msgid "Unlink from templates"
 msgstr "Αποσύνδεση από σχεδιότυπα"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Αναίρεση σίγασης"
 
@@ -18190,27 +18314,28 @@ msgstr "Ανοικτά"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18279,7 +18404,7 @@ msgid "Upper level maps"
 msgstr "Χάρτες Άνω επίπεδο"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Χρόνος διαθεσιμότητας"
@@ -18328,37 +18453,37 @@ msgstr "Χρησιμοποιείται σε ενέργειες"
 msgid "User"
 msgstr "Χρήστης"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18375,13 +18500,13 @@ msgstr "Χρήστης προστέθηκε"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Χρήστης δεν αυτοπροστίθεται σε απενεργοποιημένη ομάδα ή ομάδα απενεργοποιημένης πρόσβασης GUI."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18406,32 +18531,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Ομάδα χρήστη"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Ομάδα χρήστη \"%1$s\" υπάρχει ήδη."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Ομάδα χρήστη \"%1$s\" χρησιμοποιείται σε ρύθμιση μηνυμάτων πτώσης βάσης."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Ομάδα χρήστη \"%1$s\" χρησιμοποιείται στη δέσμη ενεργειών \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18462,7 +18587,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18470,14 +18595,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Ομάδες χρηστών"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Ο χρήστης δεν επιτρέπεται να διαγράψει τον εαυτό του."
 
@@ -18526,7 +18651,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18560,7 +18685,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18581,12 +18706,12 @@ msgstr "Χρήστης ενημερώθηκε"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18631,7 +18756,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18898,23 +19023,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19121,8 +19246,8 @@ msgstr "Κατακόρυφη ευθυγράμμιση"
 msgid "Vietnamese (vi_VN)"
 msgstr "Βιετναμέζικα (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19149,7 +19274,12 @@ msgstr "Ορατό όνομα"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Το ορατό όνομα δεν μπορεί να είναι κενό αν το όνομα ξενιστή απουσιάζει."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Τ"
@@ -19166,11 +19296,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Λυπούμαστε, ο μέγιστος πιθανόν αριθμός στοιχείων για υπενθύμιση έχει καλυφθεί."
 
@@ -19186,7 +19316,7 @@ msgstr "Λυπούμαστε, ο μέγιστος πιθανόν αριθμός
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Ιστός"
 
@@ -19255,7 +19385,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Τετ"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
@@ -19266,6 +19396,10 @@ msgstr "Τετάρτη"
 msgid "Weekly"
 msgstr "Εβδομαδιαίως"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19283,7 +19417,7 @@ msgstr "Όταν είναι ενεργά"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19496,8 +19630,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19539,19 +19673,19 @@ msgstr "Ετησίως"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19619,19 +19753,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Δεν έχετε άδεια για να εκτελέσετε αυτή τη λειτουργία."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Δεν έχετε δικαιώματα για δημιουργία χρηστών."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Χωρίς δικαίωμα πρόσβασης σε αυτή τη σελίδα."
@@ -19752,7 +19882,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19871,7 +20001,6 @@ msgstr "αντιπρόσωπος"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20167,9 +20296,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20249,7 +20378,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20296,7 +20425,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "η"
@@ -20495,14 +20624,14 @@ msgstr "καθολικές ρυθμίσεις τακτοποίησης"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "ω"
 
 # ωω
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "ωω"
 
@@ -20550,7 +20679,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20776,12 +20905,12 @@ msgstr "κανόνας εντοπισμού χαμηλού επιπέδου"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "λ"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "μ"
@@ -20885,8 +21014,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20981,7 +21110,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "νέο"
 
@@ -21048,7 +21177,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "απο"
@@ -21116,7 +21245,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21243,7 +21372,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "σύντομη περιγραφή"
 
@@ -21328,7 +21457,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21338,8 +21467,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21420,7 +21549,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21483,7 +21612,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "Πληκτρολογήστε για αναζήτηση"
 
@@ -21510,7 +21639,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21604,7 +21733,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21624,7 +21753,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "τιμή"
 
@@ -21771,7 +21900,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "ε"
diff --git a/ui/locale/es/LC_MESSAGES/frontend.po b/ui/locale/es/LC_MESSAGES/frontend.po
index deb73dc4aef..9215b317c15 100644
--- a/ui/locale/es/LC_MESSAGES/frontend.po
+++ b/ui/locale/es/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2014-10-01 18:50+0300\n"
 "Last-Translator: Saúl <saulortega.co@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d día"
 msgstr[1] "%1$d días"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s elemento de %2$s en estado de problema"
 msgstr[1] "%1$s elementos de %2$s en estado de problema"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Queda %1$s intento"
 msgstr[1] "Quedan %1$s intentos"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segundo"
 msgstr[1] "%1$s segundos"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr "(sin proxy)"
 msgid "0 - use default port"
 msgstr "0 - usar el puerto por defecto"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 o 1"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "Y"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Acceso denegado"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "¡Acceso negado!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Reconocer"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Aceptada"
 
@@ -499,7 +499,7 @@ msgstr "Aceptada"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Reconocida"
@@ -528,20 +528,22 @@ msgstr "Aceptar eventos RESUELTOS"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -646,7 +648,7 @@ msgstr "Acción actualizada"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -655,7 +657,7 @@ msgstr "Acción actualizada"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acciones"
@@ -714,8 +716,8 @@ msgstr "Activo hasta"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -726,7 +728,6 @@ msgstr "Activo hasta"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -734,11 +735,13 @@ msgstr "Activo hasta"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -750,15 +753,17 @@ msgstr "Activo hasta"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -825,7 +830,7 @@ msgstr "Activo hasta"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Agregar"
 
@@ -833,19 +838,19 @@ msgstr "Agregar"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Agregar un nuevo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Agregar un elemento hijo"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -862,7 +867,7 @@ msgstr "Agregar equipo"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Agregar varios mapas"
 
@@ -879,7 +884,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -887,7 +896,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -921,7 +930,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Agregar widget"
 
@@ -930,12 +939,20 @@ msgstr "Agregar widget"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Administrador"
@@ -945,6 +962,10 @@ msgstr "Administrador"
 msgid "Administration"
 msgstr "Administración"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Etiquetas avanzadas"
@@ -1031,7 +1052,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Todo"
 
@@ -1040,8 +1061,8 @@ msgid "All dashboards"
 msgstr "Todos los tableros"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Todos los grupos"
 
@@ -1049,7 +1070,7 @@ msgstr "Todos los grupos"
 msgid "All hosts"
 msgstr "Todos los hosts"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos los enlaces deben tener especificados \"Nombre\" y \"URL\""
 
@@ -1083,7 +1104,7 @@ msgstr "Todas las plantillas"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1096,7 +1117,7 @@ msgstr "Permitir cierre manual"
 msgid "Allowed hosts"
 msgstr "Equipos permitidos"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1114,7 +1135,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1155,12 +1176,12 @@ msgstr "Y/O"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1180,15 +1201,15 @@ msgstr "Error de aplicación."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1206,7 +1227,7 @@ msgstr "Acercamiento"
 msgid "Apr"
 msgstr "Abr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Abril"
 
@@ -1234,6 +1255,10 @@ msgstr "Tipo de área"
 msgid "Arithmetic"
 msgstr "Aritmético"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Como texto sencillo"
@@ -1282,8 +1307,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1361,7 +1386,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Agosto"
 
@@ -1391,7 +1416,7 @@ msgstr "Autenticación"
 msgid "Authentication algorithm"
 msgstr "Algoritmo de autenticación"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1440,7 +1465,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Acceso automático"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Las opciones inicio y cierre de sesión automáticos no pueden ser habilitadas al mismo tiempo."
 
@@ -1450,7 +1475,7 @@ msgstr "Cierre de sesión automático"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1635,11 +1660,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Debajo"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Traer al frente"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Traer al frente"
 
@@ -1720,7 +1745,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculado"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1740,8 +1765,8 @@ msgstr "Devolución de llamada"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1758,8 +1783,8 @@ msgstr "Devolución de llamada"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1789,7 +1814,7 @@ msgstr "No se pudo agregar la acción"
 msgid "Cannot add correlation"
 msgstr "No se pudo agregar la correlación"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1800,7 +1825,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "No se puede agregar una dependencia desde un equipo a una plantilla."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "No se pudo agregar la dependencia del disparador \"%1$s:%2$s\" al disparador \"%3$s:%4$s\" porque éste último no existe."
@@ -1919,7 +1944,7 @@ msgid "Cannot add user"
 msgstr "No se pudo agregar el usuario"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1927,11 +1952,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "No se pudo agregar el escenario web"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2012,7 +2037,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "No se pudo copiar el iniciador"
 msgstr[1] "No se pudieron copiar los iniciadores"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "No se puede copiar el disparador \"%1$s:%2$s\" porque tiene varios equipos en la expresión."
@@ -2067,7 +2092,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2484,7 +2509,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "No pude expandir las macros."
 
@@ -2654,7 +2679,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2716,7 +2741,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "No se pudo leer la respuesta. Verifique la conexión con el servidor Zabbix \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "No se puede cambiar el nombre al usuario guest."
 
@@ -2775,7 +2800,12 @@ msgstr "No se puede establecer campos de inventario en un inventario deshabilita
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3200,6 +3230,7 @@ msgid "Change per second"
 msgstr "Cambio por segundo"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3341,7 +3372,7 @@ msgstr "Comprueba el rendimiento del servicio UDP. Devuelve 0 - servicio caído;
 msgid "Checks should be unique."
 msgstr "Las comprobaciones deben ser únicas."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3383,11 +3414,11 @@ msgstr "Limpiar historial y tendencias"
 msgid "Clear when unlinking"
 msgstr "Limpiar cuando se deslinke"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3417,7 +3448,7 @@ msgstr "Reloj"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Clonar"
 
@@ -3428,8 +3459,8 @@ msgstr "Clonar"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Cerrar"
 
@@ -3459,8 +3490,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Plegar"
 
@@ -3477,7 +3508,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3545,6 +3576,7 @@ msgstr "Sesiones simultáneas"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Condición"
 
@@ -3599,7 +3631,7 @@ msgstr "Condiciones"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -3862,7 +3894,7 @@ msgstr "Contacto"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3899,8 +3931,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3961,8 +3993,8 @@ msgstr "Coordenadas"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Copiar"
 
@@ -4093,11 +4125,11 @@ msgstr "Crear correlación"
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Crear elemento dependiente"
 
@@ -4214,7 +4246,7 @@ msgstr "Crear mapa"
 msgid "Create media type"
 msgstr "Crear tipo de medio"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Crear nuevo"
 
@@ -4230,7 +4262,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Crear script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4238,7 +4270,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Crear plantilla"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Crear iniciador"
 
@@ -4458,7 +4490,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4488,7 +4520,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4658,7 +4690,7 @@ msgstr "Día de semana"
 msgid "Days"
 msgstr "Días"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Depurar"
 
@@ -4672,7 +4704,7 @@ msgstr "Modo depuración"
 msgid "Dec"
 msgstr "Dic"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Diciembre"
 
@@ -4681,13 +4713,17 @@ msgstr "Diciembre"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4757,8 +4793,8 @@ msgid "Delayed by"
 msgstr "Demorado por"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4772,7 +4808,7 @@ msgstr "Demorado por"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4804,8 +4840,8 @@ msgstr "Demorado por"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -4834,7 +4870,7 @@ msgstr "¿Desea eliminar la acción actual?"
 msgid "Delete current correlation?"
 msgstr "¿Borrar la correlación actual?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4878,7 +4914,7 @@ msgstr "¿Desea eliminar el prototipo de ítem?"
 msgid "Delete item?"
 msgstr "¿Desea eliminar el ítem?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "¿Desea eliminar los enlaces entre los elementos seleccionados?"
 
@@ -4934,7 +4970,7 @@ msgstr "¿Borrar los tableros seleccionados?"
 msgid "Delete selected discovery rules?"
 msgstr "¿Desea eliminar las reglas de descubrimiento seleccionadas?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "¿Desea eliminar los elementos seleccionados?"
 
@@ -5035,11 +5071,11 @@ msgstr "¿Desea eliminar los scripts seleccionados?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "¿Borrar las formas seleccionadas?"
 
@@ -5055,7 +5091,7 @@ msgstr "¿Desea eliminar los prototipos de disparadores seleccionados?"
 msgid "Delete selected triggers?"
 msgstr "¿Desea eliminar los disparadores seleccionados?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "¿Desea eliminar el usuario seleccionado?"
 
@@ -5106,7 +5142,7 @@ msgstr "Se ha eliminado la plantilla \"%1$s\"."
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5120,7 +5156,7 @@ msgstr "Denegar"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5128,7 +5164,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependencias"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Dependiente"
 
@@ -5136,7 +5172,7 @@ msgstr "Dependiente"
 msgid "Dependent item"
 msgstr "Elemento dependiente"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5164,7 +5200,7 @@ msgstr "Estado de implementación"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5328,7 +5364,7 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5341,14 +5377,14 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5431,7 +5467,7 @@ msgid "Discovery by proxy"
 msgstr "Descubierto por proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Comprobación de descubrimiento"
 
@@ -5443,7 +5479,7 @@ msgstr "Comprobaciones de descubrimiento"
 msgid "Discovery list"
 msgstr "Lista de descubrimiento"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objeto de descubrimiento"
 
@@ -5543,7 +5579,7 @@ msgstr "Regla de descubrimiento actualizada"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5554,7 +5590,7 @@ msgstr "Reglas de descubrimiento"
 msgid "Discovery rules deleted"
 msgstr "Reglas de descubrimiento eliminadas"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Estado del descubrimiento"
@@ -5595,7 +5631,7 @@ msgstr "Mostrar gráfico apilado"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Mostrando %1$s de %2$s encontrados"
@@ -5613,10 +5649,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "No calcular"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5631,7 +5663,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "¿Desea sustituir la expresión condicional?"
 
@@ -5687,7 +5719,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Caído"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5696,7 +5728,7 @@ msgid "Download the configuration file"
 msgstr "Descargar el archivo de configuración"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Tiempo inoperativo"
@@ -5772,7 +5804,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Userid duplicado \"%1$s\" en usuarios para el mapa \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5794,7 +5826,7 @@ msgstr "Elemento dinámico"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Cada URL debería tener un único nombre. Por favor, asegúrese que sólo hay nombrada una URL"
 
@@ -5802,13 +5834,14 @@ msgstr "Cada URL debería tener un único nombre. Por favor, asegúrese que sól
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5820,8 +5853,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Editar"
 
@@ -5837,11 +5870,11 @@ msgstr "Editar mapa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Editar disparador"
 
@@ -6116,7 +6149,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6138,12 +6171,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6202,7 +6235,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6226,7 +6259,7 @@ msgstr "Error"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Error en la solicitud de búsqueda de la tabla \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6265,7 +6298,7 @@ msgstr "Reglas de correlación de evento"
 msgid "Event details"
 msgstr "Detalles del evento"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Generación del evento"
 
@@ -6295,7 +6328,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Par de etiquetas de evento"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo de evento"
 
@@ -6329,7 +6362,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Excluir"
 
@@ -6340,7 +6373,7 @@ msgstr "Excluir"
 msgid "Exclude host groups"
 msgstr "Excluir grupos de equipos"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Ejecutar"
 
@@ -6386,7 +6419,7 @@ msgstr "Ejecutado"
 msgid "Executed script"
 msgstr "Script ejecutado"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Confirmación de ejecución"
 
@@ -6402,8 +6435,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Expandir"
 
@@ -6471,7 +6504,7 @@ msgstr "Exportar a CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6525,7 +6558,7 @@ msgstr "Expresiones"
 msgid "External check"
 msgstr "Comprobación externa"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "V"
@@ -6549,7 +6582,7 @@ msgid "Failed"
 msgstr "Falló"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Falló la creación del tablero"
 
@@ -6558,24 +6591,24 @@ msgstr "Falló la creación del tablero"
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Falló la actualización del tablero"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6583,7 +6616,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Falló la actualización de la plantilla."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6607,7 +6640,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Febrero"
 
@@ -6753,8 +6786,8 @@ msgstr "Región rellenada"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6832,6 +6865,10 @@ msgstr "Ajustar al mapa"
 msgid "Fixed"
 msgstr "Fijo"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6897,14 +6934,14 @@ msgstr "Francés (fr_FR)"
 msgid "Fri"
 msgstr "Vie"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Viernes"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6922,7 +6959,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acceso a la interfaz web"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Mensajes de la interfaz web"
 
@@ -7004,7 +7041,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "La expresión dada no es una macro"
 
@@ -7022,7 +7059,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr "Volver a %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr ""
 
@@ -7071,7 +7108,7 @@ msgstr "Línea de gradiente"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7232,7 +7269,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Gráficos"
 
@@ -7432,11 +7469,11 @@ msgstr "Ayuda"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7481,14 +7518,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Histórico"
 
@@ -7552,7 +7589,7 @@ msgstr "Alineación horizontal"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7560,8 +7597,7 @@ msgstr "Alineación horizontal"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7573,7 +7609,7 @@ msgstr "Alineación horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7654,7 +7690,7 @@ msgstr[1] "Equipos habilitados"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7662,7 +7698,7 @@ msgstr[1] "Equipos habilitados"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupo del equipo"
@@ -7693,7 +7729,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7710,7 +7746,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7749,7 +7785,7 @@ msgstr "Interfaz de equipo"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7898,7 +7934,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8130,14 +8166,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8146,12 +8234,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Imagen"
 
@@ -8281,7 +8373,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8294,11 +8386,11 @@ msgstr "Mapa inaccesible"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8324,7 +8416,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr ""
 
@@ -8342,6 +8434,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8733,7 +8830,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Función incorrecta usada"
 
@@ -8791,7 +8888,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Proporcionada clave de elemento incorrecta \"%1$s\" para la expresión del iniciador en \"%2$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8822,7 +8919,7 @@ msgstr "Identificador de tipo de soporte incorrecto."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Método incorrecto \"%1$s.%2$s\"."
@@ -8962,10 +9059,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9272,9 +9369,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9346,6 +9443,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9357,12 +9458,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9435,7 +9536,7 @@ msgid "Insert"
 msgstr "Insertar"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9543,7 +9644,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9591,7 +9692,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9694,8 +9795,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9899,7 +10000,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -10089,7 +10190,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10250,7 +10351,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Ene"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Enero"
 
@@ -10272,7 +10373,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Julio"
 
@@ -10280,7 +10381,7 @@ msgstr "Julio"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Junio"
 
@@ -10314,7 +10415,7 @@ msgstr "Monitor"
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Parámetro"
 
@@ -10384,7 +10485,7 @@ msgstr "Posición de la etiqueta"
 msgid "Language"
 msgstr "Idioma"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10463,11 +10564,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Última comprobación"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Gráfico de la última hora"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Gráfico del último mes"
 
@@ -10505,7 +10606,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Gráfico de la última semana"
 
@@ -10518,11 +10619,11 @@ msgstr "Gráfico de la última semana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Última fecha"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10633,7 +10734,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10711,12 +10812,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10844,7 +10945,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11004,7 +11105,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11033,7 +11134,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11072,7 +11173,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11098,7 +11199,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11134,7 +11235,7 @@ msgstr "Mapas"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Marzo"
 
@@ -11161,7 +11262,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11232,9 +11333,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11247,12 +11348,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mayo"
 
@@ -11262,8 +11363,8 @@ msgid "May"
 msgstr "May"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Medio"
 
@@ -11324,7 +11425,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Tipo de medio actualizado"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11397,8 +11498,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Tiempo de espera de mensajes"
 
@@ -11416,7 +11517,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Mensajería"
 
@@ -11444,6 +11545,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11459,11 +11565,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11609,7 +11710,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Lunes"
 
@@ -11649,11 +11750,11 @@ msgstr "Mes"
 msgid "Monthly"
 msgstr "Mensual"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11669,6 +11770,14 @@ msgstr "Más de 10 minutos"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11678,11 +11787,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Múltiples eventos PROBLEMA"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -11690,6 +11799,18 @@ msgstr "Silenciar"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11784,25 +11905,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11945,6 +12067,10 @@ msgstr ""
 msgid "Never"
 msgstr "Nunca"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11956,7 +12082,7 @@ msgstr "Nueva condición"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nuevo elemento"
 
@@ -11980,7 +12106,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nueva expresión regular"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11997,7 +12123,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12015,20 +12141,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12161,7 +12287,7 @@ msgstr "Sin detalles"
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12223,7 +12349,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12263,7 +12389,7 @@ msgstr ""
 msgid "No maps added."
 msgstr "No se agregaron mapas."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12276,8 +12402,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12289,7 +12415,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12297,11 +12422,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12419,19 +12545,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12440,15 +12566,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12475,7 +12601,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "No actualizar"
 
@@ -12491,7 +12617,7 @@ msgstr ""
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12538,7 +12664,7 @@ msgstr "Ninguno"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12570,15 +12696,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12610,8 +12736,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "No soportado"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
 
@@ -12641,7 +12767,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Noviembre"
 
@@ -12804,12 +12930,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numérico (coma flotante)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12824,18 +12950,17 @@ msgstr "Numérico (entero de 64 bits)"
 msgid "OEM"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12862,7 +12987,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "O"
 
@@ -12890,13 +13015,13 @@ msgstr "Oct"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Octubre"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "INACTIVO"
 
@@ -12908,7 +13033,7 @@ msgstr "INACTIVO"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12927,7 +13052,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "ACTIVO"
 
@@ -12935,7 +13060,7 @@ msgstr "ACTIVO"
 msgid "On status change triggers blink for"
 msgstr "En cambios de estado los iniciadores parpadean durante"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Una vez"
 
@@ -12952,7 +13077,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Una vez inoperativo"
 
@@ -12964,26 +13089,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13024,11 +13137,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Sólo problema seleccionado"
 msgstr[1] "Sólo problemas seleccionados"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13061,7 +13174,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr "Información del sistema operativo. Devuelve una cadena"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13086,7 +13199,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13111,27 +13224,27 @@ msgstr "Operaciones"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operador"
 
@@ -13156,7 +13269,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13173,8 +13286,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13221,9 +13334,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Original"
 
@@ -13475,7 +13588,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEMA"
@@ -13522,7 +13635,7 @@ msgstr "Identidad PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13545,13 +13658,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parámetro"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13582,9 +13697,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13673,15 +13786,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13755,19 +13872,20 @@ msgid "Periods"
 msgstr "Períodos"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Permisos"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Los permisos sólo pueden ser asignados por los grupos de usuarios."
 
@@ -13789,12 +13907,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Reproducir"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Reproducir sonido"
 
@@ -13824,7 +13942,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Por favor, selecciona dos elementos"
 
@@ -13953,7 +14071,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14011,7 +14129,7 @@ msgstr "Clave de privacidad"
 msgid "Privacy protocol"
 msgstr "Protocolo de privacidad"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privada"
@@ -14031,12 +14149,12 @@ msgid "Privilege level"
 msgstr "Nivel de privilegio"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14066,7 +14184,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Mostrar problema"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Expresión de problema"
@@ -14084,7 +14202,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problema en"
 
@@ -14097,8 +14215,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14111,14 +14229,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problema, si todos los hijos tienen problemas"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problema, si al menos un hijo tiene un problema"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14135,7 +14245,7 @@ msgstr "Problema, si al menos un hijo tiene un problema"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problemas"
 
@@ -14169,12 +14279,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Propiedades"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14196,7 +14306,7 @@ msgstr "Proxies"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14259,7 +14369,7 @@ msgstr "Nombre del proxy"
 msgid "Proxy updated"
 msgstr "Proxy actualizado"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Público"
@@ -14353,8 +14463,8 @@ msgstr "Lectura"
 msgid "Read only"
 msgstr "Sólo lectura"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14362,8 +14472,8 @@ msgstr "Sólo lectura"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14416,7 +14526,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14424,7 +14534,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Recuperar"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14459,7 +14569,7 @@ msgstr ""
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Intervalo de refresco"
 
@@ -14520,7 +14630,7 @@ msgstr "Expresiones regulares"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14552,6 +14662,7 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14561,7 +14672,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14569,13 +14680,13 @@ msgstr "Comando remoto"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14585,8 +14696,8 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14663,8 +14774,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -14704,7 +14815,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14733,7 +14844,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14741,7 +14852,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Reemplazar dependencias"
 
@@ -14848,7 +14959,7 @@ msgstr "Códigos de estado requeridos"
 msgid "Required string"
 msgstr "Cadena requerida"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Restablecer"
@@ -14882,7 +14993,7 @@ msgstr "Confirmar restablecer"
 msgid "Reset defaults"
 msgstr "Restablecer predeterminados"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Resuelto"
 
@@ -15080,8 +15191,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15139,12 +15250,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Ruso (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15155,10 +15266,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15371,7 +15480,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sáb"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -15544,7 +15653,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr ""
 
@@ -15614,8 +15723,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15623,7 +15732,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Seleccione"
 
@@ -15659,19 +15768,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15696,7 +15805,7 @@ msgstr ""
 msgid "Send to"
 msgstr "Enviar a"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15729,7 +15838,7 @@ msgstr "Separado"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Septiembre"
 
@@ -15761,34 +15870,29 @@ msgid "Server time"
 msgstr "Hora del sevidor"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Servicio"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15796,7 +15900,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15825,7 +15929,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15841,11 +15945,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Tiempos del servicio"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo de servicio"
 
@@ -15854,7 +15958,7 @@ msgstr "Tipo de servicio"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Servicio actualizado"
 
@@ -15863,16 +15967,16 @@ msgstr "Servicio actualizado"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Servicios"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15884,9 +15988,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -15910,10 +16014,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15954,7 +16066,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16000,7 +16112,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16091,7 +16203,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16142,7 +16254,7 @@ msgstr "Mostrar una advertencia si el servidor Zabbix está caído"
 msgid "Show working time"
 msgstr "Mostrar tiempo de trabajo"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Se muestra"
 
@@ -16251,7 +16363,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16297,7 +16409,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordenar entradas por"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Orden de clasificación (0->999)"
 
@@ -16371,7 +16483,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16419,12 +16531,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16435,17 +16549,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16469,13 +16590,10 @@ msgstr ""
 msgid "Status"
 msgstr "Estado"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Cálculo del estado"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritmo para el cálculo del estado"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16506,6 +16624,10 @@ msgstr "Sólo el estado"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16537,8 +16659,8 @@ msgstr ""
 msgid "Steps"
 msgstr "Pasos"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Parar"
 
@@ -16550,7 +16672,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16582,7 +16704,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16615,7 +16737,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Asunto"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Submapa"
 
@@ -16631,7 +16753,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16644,7 +16766,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Domingo"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -16736,12 +16858,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16777,8 +16899,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiqueta"
@@ -16818,14 +16940,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16833,10 +16954,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17000,7 +17121,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17285,12 +17406,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Jueves"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Jueves"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Hasta"
 
@@ -17300,13 +17421,13 @@ msgstr "Hasta"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17387,7 +17508,7 @@ msgstr "Marca de hora"
 msgid "To"
 msgstr "A"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17509,13 +17630,13 @@ msgstr "Tendencias"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Iniciadores"
 
@@ -17534,7 +17655,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17618,7 +17739,7 @@ msgstr "Vistazo general de los iniciadores"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17685,15 +17806,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Gravedad del iniciador"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17745,7 +17866,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -17758,7 +17879,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17773,15 +17894,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17848,7 +17970,7 @@ msgid "UNKNOWN"
 msgstr "DESCONOCIDO"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17858,7 +17980,7 @@ msgstr "DESCONOCIDO"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17904,7 +18026,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17952,7 +18074,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17999,7 +18121,8 @@ msgstr ""
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18018,7 +18141,8 @@ msgstr "Unidad"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18029,9 +18153,9 @@ msgstr "Unidad"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconocido"
@@ -18050,12 +18174,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -18102,7 +18226,7 @@ msgstr "Desvincular de plantilla"
 msgid "Unlink from templates"
 msgstr "Desvincular de plantillas"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18183,27 +18307,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18272,7 +18397,7 @@ msgid "Upper level maps"
 msgstr "Mapas de nivel superior"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Tiempo operativo"
@@ -18321,37 +18446,37 @@ msgstr ""
 msgid "User"
 msgstr "Usuario"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18368,13 +18493,13 @@ msgstr "Usuario añadido"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18399,32 +18524,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Un grupo de usuarios"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18455,7 +18580,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18463,14 +18588,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Grupos de usuarios"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18519,7 +18644,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18553,7 +18678,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18574,12 +18699,12 @@ msgstr "Usuario actualizado"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18624,7 +18749,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18891,23 +19016,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19114,8 +19239,8 @@ msgstr "Alineación vertical"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19142,7 +19267,12 @@ msgstr "Nombre visible"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19159,11 +19289,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19179,7 +19309,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19248,7 +19378,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -19259,6 +19389,10 @@ msgstr "Miércoles"
 msgid "Weekly"
 msgstr "Semanal"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19276,7 +19410,7 @@ msgstr "Cuándo está activo"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19489,8 +19623,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19532,19 +19666,19 @@ msgstr "Anual"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19612,19 +19746,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Tú no tienes permiso para crear usuarios."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19745,7 +19875,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19864,7 +19994,6 @@ msgstr "agente"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20160,9 +20289,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20242,7 +20371,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20289,7 +20418,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20488,13 +20617,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20542,7 +20671,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "incluir subgrupos"
 
@@ -20768,12 +20897,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20877,8 +21006,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20973,7 +21102,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21040,7 +21169,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "de"
@@ -21108,7 +21237,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21235,7 +21364,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "descripción corta"
 
@@ -21320,7 +21449,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21330,8 +21459,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21412,7 +21541,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21475,7 +21604,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "pulse aquí para buscar"
 
@@ -21502,7 +21631,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21596,7 +21725,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21616,7 +21745,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "valor"
 
@@ -21763,7 +21892,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/fa/LC_MESSAGES/frontend.po b/ui/locale/fa/LC_MESSAGES/frontend.po
index a90bf543083..42207cc5369 100644
--- a/ui/locale/fa/LC_MESSAGES/frontend.po
+++ b/ui/locale/fa/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-10-10 08:30+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d روز%1$d روز"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -170,7 +170,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -182,7 +182,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -209,16 +209,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -237,13 +237,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -290,7 +290,7 @@ msgstr "(بدون پروکسی)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 یا 1"
 
@@ -358,7 +358,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "و"
 
@@ -375,7 +375,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -437,40 +437,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "غير قابل دسترسي!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "تأیید"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "تأیید کردن"
 
@@ -478,7 +478,7 @@ msgstr "تأیید کردن"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "تأیید شده"
@@ -507,20 +507,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -623,7 +625,7 @@ msgstr "فعالیت بروز شد"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -632,7 +634,7 @@ msgstr "فعالیت بروز شد"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "فعالیت ها"
@@ -691,8 +693,8 @@ msgstr "فعال تا"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -703,7 +705,6 @@ msgstr "فعال تا"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -711,11 +712,13 @@ msgstr "فعال تا"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -727,15 +730,17 @@ msgstr "فعال تا"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -802,7 +807,7 @@ msgstr "فعال تا"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "افزودن"
 
@@ -810,19 +815,19 @@ msgstr "افزودن"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -839,7 +844,7 @@ msgstr "افزودن هاست"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -856,7 +861,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -898,7 +907,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -907,12 +916,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "مدیر"
@@ -922,6 +939,10 @@ msgstr "مدیر"
 msgid "Administration"
 msgstr "مدیریت"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "برچسب های پیشرفته"
@@ -1008,7 +1029,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "همه"
 
@@ -1017,8 +1038,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1026,7 +1047,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "همه لینک ها باید \"نام\" و \"آدرس\" مشخص داشته باشند"
 
@@ -1060,7 +1081,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1073,7 +1094,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "هاست ها مجاز"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1091,7 +1112,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1132,12 +1153,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1157,15 +1178,15 @@ msgstr "خطای برنامه."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "اعمال"
 
@@ -1183,7 +1204,7 @@ msgstr ""
 msgid "Apr"
 msgstr "آوریل"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "آوریل"
 
@@ -1211,6 +1232,10 @@ msgstr "نوع ناحیه"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "به عنوان متن ساده"
@@ -1259,8 +1284,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1338,7 +1363,7 @@ msgstr ""
 msgid "Aug"
 msgstr "اوت"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "اوت"
 
@@ -1368,7 +1393,7 @@ msgstr "تصدیق هویت"
 msgid "Authentication algorithm"
 msgstr "الگوریتم تصدیق هویت"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1417,7 +1442,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "ورود خودکار"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1427,7 +1452,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1612,11 +1637,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "پایین"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1697,7 +1722,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "محاسبه کردن"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1717,8 +1742,8 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1735,8 +1760,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "لغو"
 
@@ -1766,7 +1791,7 @@ msgstr "فعالیت نمی تواند اضافه شود"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1777,7 +1802,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "وابستگی از یک هاست به یک قالب نمی‌تواند اضافه شود"
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
@@ -1895,7 +1920,7 @@ msgid "Cannot add user"
 msgstr "کاربر نمی تواند اضافه شود"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1903,11 +1928,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1985,7 +2010,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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\" نمی‌تواند کپی شود ، زیرا چندین هاست در عبارت خود دارد."
@@ -2039,7 +2064,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
@@ -2420,7 +2445,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2588,7 +2613,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2650,7 +2675,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2709,7 +2734,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3125,6 +3155,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3266,7 +3297,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "تطبیق ها باید منحصر به فرد باشد."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3308,11 +3339,11 @@ msgstr "پاک کردن تاریخچه و روند ها"
 msgid "Clear when unlinking"
 msgstr "پاک کردن وقتی جدا شد"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3342,7 +3373,7 @@ msgstr "ساعت"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "کپی برداری"
 
@@ -3353,8 +3384,8 @@ msgstr "کپی برداری"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "بستن"
 
@@ -3384,8 +3415,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3402,7 +3433,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3470,6 +3501,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "شرط"
 
@@ -3524,7 +3556,7 @@ msgstr "شروط"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "پیکربندی"
 
@@ -3787,7 +3819,7 @@ msgstr "تماس"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3824,8 +3856,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3886,8 +3918,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "رونوشت"
 
@@ -4014,11 +4046,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4135,7 +4167,7 @@ msgstr "ایجاد نقشه"
 msgid "Create media type"
 msgstr "ایجاد نوع رسانه"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4151,7 +4183,7 @@ msgstr ""
 msgid "Create script"
 msgstr "ایجاد اسکریپت"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4159,7 +4191,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "ایجاد هشدار"
 
@@ -4378,7 +4410,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4408,7 +4440,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4578,7 +4610,7 @@ msgstr "روز از هفته"
 msgid "Days"
 msgstr "روز"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "رفع خطا"
 
@@ -4592,7 +4624,7 @@ msgstr "حالت رفع خطا"
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "دسامبر"
 
@@ -4601,13 +4633,17 @@ msgstr "دسامبر"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "پیش فرض"
 
@@ -4677,8 +4713,8 @@ msgid "Delayed by"
 msgstr "تأخیر توسط"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4692,7 +4728,7 @@ msgstr "تأخیر توسط"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4724,8 +4760,8 @@ msgstr "تأخیر توسط"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "حذف"
 
@@ -4754,7 +4790,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4798,7 +4834,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4854,7 +4890,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -4955,11 +4991,11 @@ msgstr ""
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -4975,7 +5011,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5026,7 +5062,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "جداکننده"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5040,7 +5076,7 @@ msgstr "رد کردن"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5048,7 +5084,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "وابستگی‌ها"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "وابسته"
 
@@ -5056,7 +5092,7 @@ msgstr "وابسته"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5084,7 +5120,7 @@ msgstr "وضعیت گسترش"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5248,7 +5284,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5261,14 +5297,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5351,7 +5387,7 @@ msgid "Discovery by proxy"
 msgstr "کشف با پروکسی"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "تطبیق کشف"
 
@@ -5363,7 +5399,7 @@ msgstr "تطبیق کشف"
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "تطبیق شیء"
 
@@ -5459,7 +5495,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5470,7 +5506,7 @@ msgstr "قوانین کشف"
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "وضعیت کشف"
@@ -5510,7 +5546,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "نمایش %1$s از %2$s پیدا شده"
@@ -5528,10 +5564,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "محاسبه نشود"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5546,7 +5578,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5602,7 +5634,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5611,7 +5643,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "زمان از کار افتادگی"
@@ -5687,7 +5719,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5709,7 +5741,7 @@ msgstr "آیتم پویا"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است."
 
@@ -5717,13 +5749,14 @@ msgstr "هر آدرس اینترنتی باید یک نام واحد داشته
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5735,8 +5768,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "ویرایش"
 
@@ -5752,11 +5785,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "ویرایش هشدار"
 
@@ -6031,7 +6064,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6053,12 +6086,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6117,7 +6150,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6141,7 +6174,7 @@ msgstr "خطا"
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6181,7 +6214,7 @@ msgstr ""
 msgid "Event details"
 msgstr "جزئیات رویداد"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "تولید رویداد"
 
@@ -6211,7 +6244,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6244,7 +6277,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "مانع شدن"
 
@@ -6255,7 +6288,7 @@ msgstr "مانع شدن"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "اجرا"
 
@@ -6301,7 +6334,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "اجرای اسکریپت"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "تأیید اجرا"
 
@@ -6317,8 +6350,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6385,7 +6418,7 @@ msgstr "صدور به CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6439,7 +6472,7 @@ msgstr "عبارات"
 msgid "External check"
 msgstr "تطبیق خارجی"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6463,7 +6496,7 @@ msgid "Failed"
 msgstr "شکست خورد"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6472,24 +6505,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6497,7 +6530,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6521,7 +6554,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "فوریه"
 
@@ -6667,8 +6700,8 @@ msgstr "منطقه پرشده"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6746,6 +6779,10 @@ msgstr "متناسب با نقشه"
 msgid "Fixed"
 msgstr "ثابت"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6811,14 +6848,14 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "جمعه"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6836,7 +6873,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "دسترسی به واسط کاربری"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -6918,7 +6955,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -6936,7 +6973,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "برو به"
 
@@ -6985,7 +7022,7 @@ msgstr "خط گراديان"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7145,7 +7182,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "نمودارها"
 
@@ -7344,11 +7381,11 @@ msgstr "راهنما"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "پنهان"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7393,14 +7430,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "تاریخچه"
 
@@ -7464,7 +7501,7 @@ msgstr "ردیف کردن افقی"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7472,8 +7509,7 @@ msgstr "ردیف کردن افقی"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7485,7 +7521,7 @@ msgstr "ردیف کردن افقی"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7563,7 +7599,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7571,7 +7607,7 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "گروه هاست"
@@ -7602,7 +7638,7 @@ msgstr "نوع برچسب گروه هاست"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7619,7 +7655,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7658,7 +7694,7 @@ msgstr "واسط هاست"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7805,7 +7841,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8037,14 +8073,64 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8053,12 +8139,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "تصویر"
 
@@ -8188,7 +8278,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8201,11 +8291,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8231,7 +8321,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "شامل"
 
@@ -8249,6 +8339,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8639,7 +8734,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr ""
 
@@ -8696,7 +8791,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8727,7 +8822,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8867,10 +8962,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9177,9 +9272,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9251,6 +9346,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9262,12 +9361,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9340,7 +9439,7 @@ msgid "Insert"
 msgstr "درج"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9448,7 +9547,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9496,7 +9595,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9599,8 +9698,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9804,7 +9903,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "فهرست"
 
@@ -9990,7 +10089,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10151,7 +10250,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr ""
 
@@ -10173,7 +10272,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr ""
 
@@ -10181,7 +10280,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr ""
 
@@ -10215,7 +10314,7 @@ msgstr "کلید"
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "کلیدواژه"
 
@@ -10285,7 +10384,7 @@ msgstr "محل برچسب"
 msgid "Language"
 msgstr "زبان"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10358,11 +10457,11 @@ msgstr ""
 msgid "Last check"
 msgstr "آخرین بررسی"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "نمودار ساعت گذشته"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "نمودار ماه گذشته"
 
@@ -10400,7 +10499,7 @@ msgstr ""
 msgid "Last value"
 msgstr "آخرین مقدار"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "نمودار هفته گذشته"
 
@@ -10413,11 +10512,11 @@ msgstr "نمودار هفته گذشته"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "آخرین اطلاعات"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10528,7 +10627,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10606,12 +10705,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10739,7 +10838,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10899,7 +10998,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10928,7 +11027,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "نقشه"
 
@@ -10967,7 +11066,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -10993,7 +11092,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11029,7 +11128,7 @@ msgstr "نقشه‌ها"
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr ""
 
@@ -11056,7 +11155,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11127,9 +11226,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11141,12 +11240,12 @@ msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr ""
 
@@ -11156,8 +11255,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "رسانه"
 
@@ -11215,7 +11314,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11288,8 +11387,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11307,7 +11406,7 @@ msgstr ""
 msgid "Messages"
 msgstr "پیام"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "پیام‌رسانی"
 
@@ -11335,6 +11434,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11350,11 +11454,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11495,7 +11594,7 @@ msgstr ""
 msgid "Mon"
 msgstr "دوشنبه"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "دوشنبه"
 
@@ -11535,11 +11634,11 @@ msgstr "ماه"
 msgid "Monthly"
 msgstr "ماهانه"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11555,6 +11654,14 @@ msgstr "بیشتر از 10 دقیقه"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr ""
@@ -11564,11 +11671,11 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "رویدادهای مشکلات چندگانه"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "بی‌صدا"
 
@@ -11576,6 +11683,18 @@ msgstr "بی‌صدا"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr ""
@@ -11670,25 +11789,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11831,6 +11951,10 @@ msgstr ""
 msgid "Never"
 msgstr "هرگز"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11842,7 +11966,7 @@ msgstr "شرط جدید"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "عنصر جدید"
 
@@ -11866,7 +11990,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "عبارت منظم جدید"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11883,7 +12007,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -11901,20 +12025,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12047,7 +12171,7 @@ msgstr "بدون جزئیات"
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12109,7 +12233,7 @@ msgstr "بدون تصویر"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12149,7 +12273,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12162,8 +12286,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12175,7 +12299,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12183,11 +12306,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12305,19 +12429,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12326,15 +12450,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12361,7 +12485,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12377,7 +12501,7 @@ msgstr "هدف انتخاب نشده"
 msgid "No target selected."
 msgstr "هدف انتخاب نشده"
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12424,7 +12548,7 @@ msgstr "هیچکدام"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12456,15 +12580,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12496,8 +12620,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "عدم پشتیبانی"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
 
@@ -12527,7 +12651,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "نوامبر"
 
@@ -12690,12 +12814,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "عددی(شناور)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12710,18 +12834,17 @@ msgstr "عددی (بیعلامت)"
 msgid "OEM"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "صحیح"
@@ -12748,7 +12871,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "یا"
 
@@ -12776,13 +12899,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "اکتبر"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "خاموش"
 
@@ -12794,7 +12917,7 @@ msgstr "خاموش"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "صحیح"
@@ -12813,7 +12936,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "روشن"
 
@@ -12821,7 +12944,7 @@ msgstr "روشن"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "یکبار"
 
@@ -12838,7 +12961,7 @@ msgid "One time only"
 msgstr "فقط یکبار"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "یکبار پایین آمده"
 
@@ -12850,26 +12973,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -12909,11 +13020,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12946,7 +13057,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -12971,7 +13082,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -12996,27 +13107,27 @@ msgstr "عملکردها"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "عملگر"
 
@@ -13041,7 +13152,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13058,8 +13169,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13106,9 +13217,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "اصلی"
 
@@ -13360,7 +13471,7 @@ msgstr ""
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "مشکل"
@@ -13407,7 +13518,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13430,13 +13541,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "پارامتر"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13467,9 +13580,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13558,15 +13669,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13640,19 +13755,20 @@ msgid "Periods"
 msgstr "دوره ها"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "مجوزها"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13674,12 +13790,12 @@ msgstr "محل الگوریتم"
 msgid "Plain text"
 msgstr "متن ساده"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "پخش"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "پخش صدا"
 
@@ -13709,7 +13825,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "لطفاً دو عنصر انتخاب کنید"
 
@@ -13838,7 +13954,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13896,7 +14012,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -13916,12 +14032,12 @@ msgid "Privilege level"
 msgstr "سطح ویژه"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13951,7 +14067,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "نمایش مشکل"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -13969,7 +14085,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "نمایش مشکل"
 
@@ -13982,8 +14098,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -13996,14 +14112,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "مشکل، اگر همه فرزندان مشکل دارند"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "مشکل، اگر دست کم یکی از فرزندان مشکل دارند"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14020,7 +14128,7 @@ msgstr "مشکل، اگر دست کم یکی از فرزندان مشکل دار
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "مشکل"
 
@@ -14054,12 +14162,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14081,7 +14189,7 @@ msgstr "پروکسی ها"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14143,7 +14251,7 @@ msgstr ""
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14237,8 +14345,8 @@ msgstr "خواندن"
 msgid "Read only"
 msgstr "فقط خواندنی"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14246,8 +14354,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14300,7 +14408,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14308,7 +14416,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "بازیابی"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14343,7 +14451,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14403,7 +14511,7 @@ msgstr "عبارات منظم"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14435,6 +14543,7 @@ msgstr "فرمان راه دور"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14444,7 +14553,7 @@ msgstr "فرمان راه دور"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14452,13 +14561,13 @@ msgstr "فرمان راه دور"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14468,8 +14577,8 @@ msgstr "فرمان راه دور"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14546,8 +14655,8 @@ msgstr "فرمان راه دور"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "حذف"
 
@@ -14587,7 +14696,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14616,7 +14725,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14624,7 +14733,7 @@ msgstr ""
 msgid "Replace"
 msgstr "جایگزینی"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14731,7 +14840,7 @@ msgstr "کدهای وضعیت مورد نیاز"
 msgid "Required string"
 msgstr "رشته مورد نیاز"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "بازنشانی"
@@ -14765,7 +14874,7 @@ msgstr "بازنشاندن تصدیق"
 msgid "Reset defaults"
 msgstr "بازنشانی پیش‌فرضها"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "رفع شد"
 
@@ -14963,8 +15072,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15022,12 +15131,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15038,10 +15147,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "سطح سرویس"
 
@@ -15254,7 +15361,7 @@ msgstr ""
 msgid "Sat"
 msgstr "شنبه"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "شنبه"
 
@@ -15423,7 +15530,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "اسکریپت ها"
 
@@ -15493,8 +15600,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15502,7 +15609,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "انتخاب"
 
@@ -15538,19 +15645,19 @@ msgstr "عناصر انتخاب شده"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15575,7 +15682,7 @@ msgstr "ارسال فقط به"
 msgid "Send to"
 msgstr "ارسال به"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15608,7 +15715,7 @@ msgstr "جداشده"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "سپتامبر"
 
@@ -15640,34 +15747,29 @@ msgid "Server time"
 msgstr "زمان سرور"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "سرویس"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15675,7 +15777,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15702,7 +15804,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15718,11 +15820,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "مدت سرویس"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "نوع سرویس"
 
@@ -15731,7 +15833,7 @@ msgstr "نوع سرویس"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr ""
 
@@ -15740,16 +15842,16 @@ msgstr ""
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "سرویس ها "
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15761,9 +15863,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "جلسه پایان یافت ، لطفاً دوباره وارد شوید"
 
@@ -15787,10 +15889,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15831,7 +15941,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15877,7 +15987,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -15968,7 +16078,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16019,7 +16129,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "نمایش ساعت کاری"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "نمایش"
 
@@ -16128,7 +16238,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "بعدا"
 
@@ -16174,7 +16284,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "مرتب سازی(0->999)"
 
@@ -16248,7 +16358,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16296,12 +16406,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16312,17 +16424,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16346,13 +16465,10 @@ msgstr ""
 msgid "Status"
 msgstr "وضعیت"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "محاسبه وضعیت"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "الگوریتم محاسبه وضعیت"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16383,6 +16499,10 @@ msgstr "فقط وضعیت"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16414,8 +16534,8 @@ msgstr ""
 msgid "Steps"
 msgstr "مراحل"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "توقف"
 
@@ -16427,7 +16547,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16459,7 +16579,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16492,7 +16612,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "زیر نقشه"
 
@@ -16508,7 +16628,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "رسیدگی موفق"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16521,7 +16641,7 @@ msgstr ""
 msgid "Sun"
 msgstr "یکشنبه"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "یکشنبه"
 
@@ -16613,12 +16733,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16654,8 +16774,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16695,14 +16815,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16710,10 +16829,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16877,7 +16996,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17160,12 +17279,12 @@ msgstr ""
 msgid "Thu"
 msgstr "پنجشنبه"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "تا"
 
@@ -17175,13 +17294,13 @@ msgstr "تا"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17262,7 +17381,7 @@ msgstr "مهر زمان"
 msgid "To"
 msgstr "به"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17384,13 +17503,13 @@ msgstr "روندها"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "هشدار"
 
@@ -17409,7 +17528,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17490,7 +17609,7 @@ msgstr "نمای کلی هشدارها"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17556,15 +17675,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "جدیت هشدار"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17616,7 +17735,7 @@ msgstr ""
 msgid "Tue"
 msgstr "سه شنبه"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "سه شنبه"
 
@@ -17629,7 +17748,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17644,15 +17763,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17719,7 +17839,7 @@ msgid "UNKNOWN"
 msgstr "ناشناخته"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17729,7 +17849,7 @@ msgstr "ناشناخته"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
@@ -17775,7 +17895,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "نشانی های اینترنتی"
 
@@ -17823,7 +17943,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17870,7 +17990,8 @@ msgstr ""
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17889,7 +18010,8 @@ msgstr "واحدها"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17900,9 +18022,9 @@ msgstr "واحدها"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "ناشناخته"
@@ -17921,12 +18043,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -17973,7 +18095,7 @@ msgstr "حذف پیوند از قالب"
 msgid "Unlink from templates"
 msgstr "حذف پیوند از قالب ها"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "وصل صدا"
 
@@ -18053,27 +18175,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18142,7 +18265,7 @@ msgid "Upper level maps"
 msgstr "نقشه های سطح بالاتر"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "زمان کار"
@@ -18191,37 +18314,37 @@ msgstr "استفاده شده در فعالیت"
 msgid "User"
 msgstr "کار‌بر"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18238,13 +18361,13 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18268,32 +18391,32 @@ msgstr[0] ""
 msgid "User group"
 msgstr "گروه کابر"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18322,7 +18445,7 @@ msgstr[0] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18330,14 +18453,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "گروه های کابران"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18385,7 +18508,7 @@ msgstr[0] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18419,7 +18542,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18439,12 +18562,12 @@ msgstr ""
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18489,7 +18612,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18756,23 +18879,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18979,8 +19102,8 @@ msgstr "ردیف کردن عمودی"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19007,7 +19130,12 @@ msgstr "نام قابل رؤیت"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19024,11 +19152,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19044,7 +19172,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "وب"
 
@@ -19111,7 +19239,7 @@ msgstr ""
 msgid "Wed"
 msgstr "چهارشنبه"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
@@ -19122,6 +19250,10 @@ msgstr "چهارشنبه"
 msgid "Weekly"
 msgstr "هفتگی"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19139,7 +19271,7 @@ msgstr "وقتی فعال شد"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19352,8 +19484,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19395,19 +19527,19 @@ msgstr "سالانه"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19475,19 +19607,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr ""
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19608,7 +19736,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19727,7 +19855,6 @@ msgstr "عامل"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20023,9 +20150,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20105,7 +20232,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20152,7 +20279,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20351,13 +20478,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20405,7 +20532,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20631,12 +20758,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20740,8 +20867,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -20836,7 +20963,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -20903,7 +21030,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "از"
@@ -20971,7 +21098,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21098,7 +21225,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "شرح کوتاه"
 
@@ -21183,7 +21310,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21193,8 +21320,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21275,7 +21402,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21338,7 +21465,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21365,7 +21492,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21459,7 +21586,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21479,7 +21606,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "مقدار"
 
@@ -21626,7 +21753,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/fi/LC_MESSAGES/frontend.po b/ui/locale/fi/LC_MESSAGES/frontend.po
index a0b7829225b..036d580570c 100644
--- a/ui/locale/fi/LC_MESSAGES/frontend.po
+++ b/ui/locale/fi/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-10-10 08:23+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d vuorokausi"
 msgstr[1] "%1$d vuorokautta"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -222,17 +222,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s yritys jäljellä"
 msgstr[1] "%1$s yritystä jäljellä"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s sekuntti"
 msgstr[1] "%1$s sekunttia"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -307,7 +307,7 @@ msgstr "(ei välityspalvelinta)"
 msgid "0 - use default port"
 msgstr "0 - Käytä oletusporttia"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 tai 1"
 
@@ -377,7 +377,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "JA"
 
@@ -394,7 +394,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -459,40 +459,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Ei käyttöoikeutta."
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Ei käyttöoikeutta!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Kuittaa"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Kuittaa"
 
@@ -500,7 +500,7 @@ msgstr "Kuittaa"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Kuitattu"
@@ -529,20 +529,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -647,7 +649,7 @@ msgstr "Toiminto päivitetty"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -656,7 +658,7 @@ msgstr "Toiminto päivitetty"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Toiminnot"
@@ -715,8 +717,8 @@ msgstr "Aktiivinen asti"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -727,7 +729,6 @@ msgstr "Aktiivinen asti"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -735,11 +736,13 @@ msgstr "Aktiivinen asti"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -751,15 +754,17 @@ msgstr "Aktiivinen asti"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -826,7 +831,7 @@ msgstr "Aktiivinen asti"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Lisää"
 
@@ -834,19 +839,19 @@ msgstr "Lisää"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -863,7 +868,7 @@ msgstr "Lisää kone"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -880,7 +885,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -888,7 +897,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -922,7 +931,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -931,12 +940,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Hallinta"
@@ -946,6 +963,10 @@ msgstr "Hallinta"
 msgid "Administration"
 msgstr "Hallinta"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Edistyneet nimilaput"
@@ -1033,7 +1054,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Kaikki"
 
@@ -1042,8 +1063,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1051,7 +1072,7 @@ msgstr ""
 msgid "All hosts"
 msgstr "Kaikki isäntäkoneet"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Kaikilla linkeillä pitäisi olla \"Nimi\" tai \"URL\" määriteltynä"
 
@@ -1085,7 +1106,7 @@ msgstr "Kaikki mallit"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1098,7 +1119,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Sallitut koneet"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1116,7 +1137,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1157,12 +1178,12 @@ msgstr "ja/tai"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1182,15 +1203,15 @@ msgstr "Sovelluksessa virhe."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Käytä"
 
@@ -1208,7 +1229,7 @@ msgstr "Lähestyy"
 msgid "Apr"
 msgstr "Huhti"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Huhtikuu"
 
@@ -1236,6 +1257,10 @@ msgstr "Alueen tyyppi"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Paljaana tekstinä"
@@ -1284,8 +1309,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1363,7 +1388,7 @@ msgstr ""
 msgid "Aug"
 msgstr "elo"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "elokuu"
 
@@ -1393,7 +1418,7 @@ msgstr "Tunnistautuminen"
 msgid "Authentication algorithm"
 msgstr "Tunnistautumisalgoritmi"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1442,7 +1467,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Automaattinen sisäänkirjautuminen"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1452,7 +1477,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1637,11 +1662,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Alareuna"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1722,7 +1747,7 @@ msgstr ""
 msgid "Calculated"
 msgstr ""
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1742,8 +1767,8 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1760,8 +1785,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr ""
 
@@ -1791,7 +1816,7 @@ msgstr ""
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1802,7 +1827,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
@@ -1921,7 +1946,7 @@ msgid "Cannot add user"
 msgstr ""
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1929,11 +1954,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2014,7 +2039,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
@@ -2069,7 +2094,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
@@ -2483,7 +2508,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2653,7 +2678,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2715,7 +2740,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2774,7 +2799,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3196,6 +3226,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3337,7 +3368,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3379,11 +3410,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3413,7 +3444,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr ""
 
@@ -3424,8 +3455,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr ""
 
@@ -3455,8 +3486,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3473,7 +3504,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3541,6 +3572,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr ""
 
@@ -3595,7 +3627,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr ""
 
@@ -3858,7 +3890,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3895,8 +3927,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3957,8 +3989,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr ""
 
@@ -4088,11 +4120,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4209,7 +4241,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4225,7 +4257,7 @@ msgstr ""
 msgid "Create script"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4233,7 +4265,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr ""
 
@@ -4453,7 +4485,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4483,7 +4515,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4653,7 +4685,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr ""
 
@@ -4667,7 +4699,7 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr ""
 
@@ -4676,13 +4708,17 @@ msgstr ""
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr ""
 
@@ -4752,8 +4788,8 @@ msgid "Delayed by"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4767,7 +4803,7 @@ msgstr ""
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4799,8 +4835,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr ""
 
@@ -4829,7 +4865,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4873,7 +4909,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4929,7 +4965,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5030,11 +5066,11 @@ msgstr ""
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5050,7 +5086,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5101,7 +5137,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5115,7 +5151,7 @@ msgstr ""
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5123,7 +5159,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr ""
 
@@ -5131,7 +5167,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5159,7 +5195,7 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5323,7 +5359,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5336,14 +5372,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5426,7 +5462,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5438,7 +5474,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5537,7 +5573,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5548,7 +5584,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5588,7 +5624,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5606,10 +5642,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr ""
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5624,7 +5656,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5680,7 +5712,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5689,7 +5721,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr ""
@@ -5765,7 +5797,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5787,7 +5819,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5795,13 +5827,14 @@ msgstr ""
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5813,8 +5846,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr ""
 
@@ -5830,11 +5863,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr ""
 
@@ -6109,7 +6142,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6131,12 +6164,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6195,7 +6228,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6219,7 +6252,7 @@ msgstr ""
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6258,7 +6291,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr ""
 
@@ -6288,7 +6321,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6322,7 +6355,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr ""
 
@@ -6333,7 +6366,7 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr ""
 
@@ -6379,7 +6412,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6395,8 +6428,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6463,7 +6496,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6517,7 +6550,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6541,7 +6574,7 @@ msgid "Failed"
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6550,24 +6583,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6575,7 +6608,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6599,7 +6632,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr ""
 
@@ -6745,8 +6778,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6824,6 +6857,10 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6889,14 +6926,14 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr ""
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6914,7 +6951,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -6996,7 +7033,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -7014,7 +7051,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr ""
 
@@ -7063,7 +7100,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7224,7 +7261,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr ""
 
@@ -7424,11 +7461,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7473,14 +7510,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr ""
 
@@ -7544,7 +7581,7 @@ msgstr ""
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7552,8 +7589,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7565,7 +7601,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7645,7 +7681,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7653,7 +7689,7 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr ""
@@ -7684,7 +7720,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7701,7 +7737,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7740,7 +7776,7 @@ msgstr ""
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7888,7 +7924,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8120,14 +8156,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8136,12 +8224,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr ""
 
@@ -8271,7 +8363,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8284,11 +8376,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8314,7 +8406,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr ""
 
@@ -8332,6 +8424,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8722,7 +8819,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr ""
 
@@ -8779,7 +8876,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8810,7 +8907,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8950,10 +9047,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9260,9 +9357,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9334,6 +9431,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9345,12 +9446,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9423,7 +9524,7 @@ msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9531,7 +9632,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9579,7 +9680,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9682,8 +9783,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9887,7 +9988,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr ""
 
@@ -10077,7 +10178,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10238,7 +10339,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr ""
 
@@ -10260,7 +10361,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr ""
 
@@ -10268,7 +10369,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr ""
 
@@ -10302,7 +10403,7 @@ msgstr ""
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr ""
 
@@ -10372,7 +10473,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10451,11 +10552,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr ""
 
@@ -10493,7 +10594,7 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr ""
 
@@ -10506,11 +10607,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10621,7 +10722,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10699,12 +10800,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10832,7 +10933,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10992,7 +11093,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11021,7 +11122,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -11060,7 +11161,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11086,7 +11187,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11122,7 +11223,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr ""
 
@@ -11149,7 +11250,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11220,9 +11321,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11235,12 +11336,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr ""
 
@@ -11250,8 +11351,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11312,7 +11413,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11385,8 +11486,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11404,7 +11505,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11432,6 +11533,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11447,11 +11553,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11597,7 +11698,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr ""
 
@@ -11637,11 +11738,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11657,6 +11758,14 @@ msgstr ""
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr ""
@@ -11666,11 +11775,11 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr ""
 
@@ -11678,6 +11787,18 @@ msgstr ""
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr ""
@@ -11772,25 +11893,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11933,6 +12055,10 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11944,7 +12070,7 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr ""
 
@@ -11968,7 +12094,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11985,7 +12111,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12003,20 +12129,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12149,7 +12275,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12211,7 +12337,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12251,7 +12377,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12264,8 +12390,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12277,7 +12403,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12285,11 +12410,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12407,19 +12533,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12428,15 +12554,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12463,7 +12589,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12479,7 +12605,7 @@ msgstr ""
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12526,7 +12652,7 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12558,15 +12684,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12598,8 +12724,8 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
 
@@ -12629,7 +12755,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr ""
 
@@ -12792,12 +12918,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr ""
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12812,18 +12938,17 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr ""
@@ -12850,7 +12975,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr ""
 
@@ -12878,13 +13003,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr ""
 
@@ -12896,7 +13021,7 @@ msgstr ""
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr ""
@@ -12915,7 +13040,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr ""
 
@@ -12923,7 +13048,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr ""
 
@@ -12940,7 +13065,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
@@ -12952,26 +13077,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13012,11 +13125,11 @@ msgid_plural "Only selected problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13049,7 +13162,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13074,7 +13187,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13099,27 +13212,27 @@ msgstr ""
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13144,7 +13257,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13161,8 +13274,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13209,9 +13322,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr ""
 
@@ -13463,7 +13576,7 @@ msgstr ""
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr ""
@@ -13510,7 +13623,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13533,13 +13646,15 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13570,9 +13685,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13661,15 +13774,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13743,19 +13860,20 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13777,12 +13895,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr ""
 
@@ -13812,7 +13930,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr ""
 
@@ -13941,7 +14059,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13999,7 +14117,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14019,12 +14137,12 @@ msgid "Privilege level"
 msgstr ""
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14054,7 +14172,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14072,7 +14190,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -14085,8 +14203,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14099,14 +14217,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr ""
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr ""
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14123,7 +14233,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14157,12 +14267,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14184,7 +14294,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14247,7 +14357,7 @@ msgstr ""
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14341,8 +14451,8 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14350,8 +14460,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14404,7 +14514,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14412,7 +14522,7 @@ msgstr ""
 msgid "Recovery"
 msgstr ""
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14447,7 +14557,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14508,7 +14618,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14540,6 +14650,7 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14549,7 +14660,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14557,13 +14668,13 @@ msgstr ""
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14573,8 +14684,8 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14651,8 +14762,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr ""
 
@@ -14692,7 +14803,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14721,7 +14832,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14729,7 +14840,7 @@ msgstr ""
 msgid "Replace"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14836,7 +14947,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
@@ -14870,7 +14981,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr ""
 
@@ -15068,8 +15179,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15127,12 +15238,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15143,10 +15254,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr ""
 
@@ -15359,7 +15468,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr ""
 
@@ -15532,7 +15641,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr ""
 
@@ -15602,8 +15711,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15611,7 +15720,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr ""
 
@@ -15647,19 +15756,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15684,7 +15793,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15717,7 +15826,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr ""
 
@@ -15749,34 +15858,29 @@ msgid "Server time"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15784,7 +15888,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15812,7 +15916,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15828,11 +15932,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -15841,7 +15945,7 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr ""
 
@@ -15850,16 +15954,16 @@ msgstr ""
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15871,9 +15975,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -15897,10 +16001,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15941,7 +16053,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15987,7 +16099,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16078,7 +16190,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16129,7 +16241,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr ""
 
@@ -16238,7 +16350,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16284,7 +16396,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16358,7 +16470,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16406,12 +16518,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16422,17 +16536,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16456,12 +16577,9 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr ""
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
@@ -16493,6 +16611,10 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16524,8 +16646,8 @@ msgstr ""
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr ""
 
@@ -16537,7 +16659,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16569,7 +16691,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16602,7 +16724,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16618,7 +16740,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16631,7 +16753,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr ""
 
@@ -16723,12 +16845,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16764,8 +16886,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16805,14 +16927,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16820,10 +16941,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16987,7 +17108,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17272,12 +17393,12 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr ""
 
@@ -17287,13 +17408,13 @@ msgstr ""
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17374,7 +17495,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17496,13 +17617,13 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr ""
 
@@ -17521,7 +17642,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17605,7 +17726,7 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17672,15 +17793,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17732,7 +17853,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr ""
 
@@ -17745,7 +17866,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17760,15 +17881,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17835,7 +17957,7 @@ msgid "UNKNOWN"
 msgstr ""
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17845,7 +17967,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr ""
 
@@ -17891,7 +18013,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr ""
 
@@ -17939,7 +18061,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17986,7 +18108,8 @@ msgstr ""
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18005,7 +18128,8 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18016,9 +18140,9 @@ msgstr ""
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18037,12 +18161,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -18089,7 +18213,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18170,27 +18294,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18259,7 +18384,7 @@ msgid "Upper level maps"
 msgstr ""
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr ""
@@ -18308,37 +18433,37 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18355,13 +18480,13 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18386,32 +18511,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18442,7 +18567,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18450,14 +18575,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18506,7 +18631,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18540,7 +18665,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18561,12 +18686,12 @@ msgstr ""
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18611,7 +18736,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18878,23 +19003,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19101,8 +19226,8 @@ msgstr ""
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19129,7 +19254,12 @@ msgstr ""
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19146,11 +19276,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19166,7 +19296,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr ""
 
@@ -19235,7 +19365,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr ""
 
@@ -19246,6 +19376,10 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19263,7 +19397,7 @@ msgstr ""
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19476,8 +19610,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19519,19 +19653,19 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19599,19 +19733,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr ""
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19732,7 +19862,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19851,7 +19981,6 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20147,9 +20276,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20229,7 +20358,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20276,7 +20405,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20475,13 +20604,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20529,7 +20658,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20755,12 +20884,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20864,8 +20993,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -20960,7 +21089,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21027,7 +21156,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr ""
@@ -21095,7 +21224,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21222,7 +21351,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "lyhyt kuvaus"
 
@@ -21307,7 +21436,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21317,8 +21446,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21399,7 +21528,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21462,7 +21591,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21489,7 +21618,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21583,7 +21712,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21603,7 +21732,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr ""
 
@@ -21750,7 +21879,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/fr/LC_MESSAGES/frontend.po b/ui/locale/fr/LC_MESSAGES/frontend.po
index a8ef95b80ec..1375bfb9ab7 100644
--- a/ui/locale/fr/LC_MESSAGES/frontend.po
+++ b/ui/locale/fr/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2018-01-15 09:21+0300\n"
 "Last-Translator: Christophe <ctr@pmspos.fr>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d jour"
 msgstr[1] "%1$d jours"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] "%1$s messages"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s de %2$s élément en défaut"
 msgstr[1] "%1$s de %2$s éléments en défaut"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s essai restant"
 msgstr[1] "%1$s essais restants"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s seconde"
 msgstr[1] "%1$s secondes"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s symboles restants"
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Séverité, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, lecture seule"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr "(pas de proxy)"
 msgid "0 - use default port"
 msgstr "0 - utiliser le port par défaut"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 ou 1"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "AJOUTER SURCHARGE"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "ET"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Accès refusé"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Accès refusé !"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Acquitté"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Acquittement"
 
@@ -499,7 +499,7 @@ msgstr "Acquittement"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Acquitté"
@@ -528,20 +528,22 @@ msgstr "Événements RÉSOLUS acquittés"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -646,7 +648,7 @@ msgstr "Action mise à jour"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -655,7 +657,7 @@ msgstr "Action mise à jour"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Actions"
@@ -714,8 +716,8 @@ msgstr "Actif jusqu'à"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -726,7 +728,6 @@ msgstr "Actif jusqu'à"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -734,11 +735,13 @@ msgstr "Actif jusqu'à"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -750,15 +753,17 @@ msgstr "Actif jusqu'à"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -825,7 +830,7 @@ msgstr "Actif jusqu'à"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Ajouter"
 
@@ -833,19 +838,19 @@ msgstr "Ajouter"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Ajouter un nouveau widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Ajouter un élément enfant"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -862,7 +867,7 @@ msgstr "Ajouter hôte"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Ajouter plusieurs cartes"
 
@@ -879,7 +884,11 @@ msgstr ""
 msgid "Add new override"
 msgstr "Ajouter une nouvelle surcharge"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -887,7 +896,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -921,7 +930,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Ajouter un widget"
 
@@ -930,12 +939,20 @@ msgstr "Ajouter un widget"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Ajouté, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -945,6 +962,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administration"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Étiquettes avancées"
@@ -1031,7 +1052,7 @@ msgstr "Aligner les éléments de carte"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Tous"
 
@@ -1040,8 +1061,8 @@ msgid "All dashboards"
 msgstr "Tous les tableaux de bord"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Tous les groupes"
 
@@ -1049,7 +1070,7 @@ msgstr "Tous les groupes"
 msgid "All hosts"
 msgstr "Tous les hôtes"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tous liens doivent avoir \"Nom\" et \"URL\" spécifiés"
 
@@ -1083,7 +1104,7 @@ msgstr "Tous les modèles"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1096,7 +1117,7 @@ msgstr "Autoriser la fermeture manuelle"
 msgid "Allowed hosts"
 msgstr "Hôtes autorisés"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1114,7 +1135,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1155,12 +1176,12 @@ msgstr "Et/Ou"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1180,15 +1201,15 @@ msgstr "Erreur d'application."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -1206,7 +1227,7 @@ msgstr "Proche de"
 msgid "Apr"
 msgstr "Avr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Avril"
 
@@ -1234,6 +1255,10 @@ msgstr "Type de zone"
 msgid "Arithmetic"
 msgstr "Arithmétique"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Format texte"
@@ -1284,8 +1309,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1363,7 +1388,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aoû"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Août"
 
@@ -1393,7 +1418,7 @@ msgstr "Authentification"
 msgid "Authentication algorithm"
 msgstr "Algorithme d'authentification"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "L'authentification a échoué: %1$s."
@@ -1442,7 +1467,7 @@ msgstr "Auto"
 msgid "Auto-login"
 msgstr "Connexion automatique"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Les options d'auto-connexion et d'auto-déconnexion ne peuvent pas être activées en même temps."
 
@@ -1452,7 +1477,7 @@ msgstr "Auto-déconnexion"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1637,11 +1662,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Bas"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Amener vers l'avant"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Amener à l'avant"
 
@@ -1722,7 +1747,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculé"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -1742,8 +1767,8 @@ msgstr "Rappel"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1760,8 +1785,8 @@ msgstr "Rappel"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1791,7 +1816,7 @@ msgstr "Impossible d'ajouter l'action"
 msgid "Cannot add correlation"
 msgstr "Impossible d'ajouter la corrélation"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1802,7 +1827,7 @@ 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/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1921,7 +1946,7 @@ msgid "Cannot add user"
 msgstr "Impossible d'ajouter l'utilisateur"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1929,11 +1954,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Impossible d'ajouter le scénario web"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2014,7 +2039,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "Impossible de copier le déclencheur"
 msgstr[1] "Impossible de copier les déclencheurs"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2069,7 +2094,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2486,7 +2511,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Substitution des macros impossible."
 
@@ -2656,7 +2681,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2718,7 +2743,7 @@ msgstr ""
 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Impossible de renommer l'utilisateur invité."
 
@@ -2777,7 +2802,12 @@ msgstr "Impossible de configurer les champs d'inventaire pour un inventaire dés
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3199,6 +3229,7 @@ msgid "Change per second"
 msgstr "Changement par seconde"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Changement de gravité"
 
@@ -3340,7 +3371,7 @@ msgstr "Vérifie la performance du service UDP. Retourne 0 - le service est inac
 msgid "Checks should be unique."
 msgstr "Les vérifications doivent être uniques."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3382,11 +3413,11 @@ msgstr "Effacer l'historique et les tendances"
 msgid "Clear when unlinking"
 msgstr "Effacer en déliant"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "Cliquez et faites glisser jusqu'à la taille désirée."
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "Cliquez pour voir ou éditer"
 
@@ -3416,7 +3447,7 @@ msgstr "Horloge"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Clone"
 
@@ -3427,8 +3458,8 @@ msgstr "Clone"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Fermer"
 
@@ -3458,8 +3489,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Replier"
 
@@ -3476,7 +3507,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3544,6 +3575,7 @@ msgstr "Sessions concurrentes"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Condition"
 
@@ -3598,7 +3630,7 @@ msgstr "Conditions"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -3861,7 +3893,7 @@ msgstr "Contact"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3898,8 +3930,8 @@ msgstr "Contient"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3960,8 +3992,8 @@ msgstr "Coordonnées"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Copier"
 
@@ -4092,11 +4124,11 @@ msgstr "Créer une corrélation"
 msgid "Create dashboard"
 msgstr "Créer un tableau de bord"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "Créer une règle de découverte dépendante"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Créer un élément dépendant"
 
@@ -4213,7 +4245,7 @@ msgstr "Créer une carte"
 msgid "Create media type"
 msgstr "Créer un type de média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Créer un nouveau"
 
@@ -4229,7 +4261,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Créer un script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4237,7 +4269,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Créer un modèle"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Créer un déclencheur"
 
@@ -4457,7 +4489,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Propriété du tableau de bord"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Partage du tableau de bord"
 
@@ -4487,7 +4519,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Tableaux de bord"
 
@@ -4657,7 +4689,7 @@ msgstr "Jour de la semaine"
 msgid "Days"
 msgstr "Jours"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debug"
 
@@ -4671,7 +4703,7 @@ msgstr "Mode debug"
 msgid "Dec"
 msgstr "Déc"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Décembre"
 
@@ -4680,13 +4712,17 @@ msgstr "Décembre"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Défaut"
 
@@ -4756,8 +4792,8 @@ msgid "Delayed by"
 msgstr "Retardé de"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4771,7 +4807,7 @@ msgstr "Retardé de"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4803,8 +4839,8 @@ msgstr "Retardé de"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -4833,7 +4869,7 @@ msgstr "Effacer l'action actuelle ?"
 msgid "Delete current correlation?"
 msgstr "Effacer la corrélation actuelle ?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Effacer le tableau de bord ?"
 
@@ -4877,7 +4913,7 @@ msgstr "Supprimer le prototype d'élément ?"
 msgid "Delete item?"
 msgstr "Effacer l'élément ?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Supprimer les liens entre les éléments sélectionnés ?"
 
@@ -4933,7 +4969,7 @@ msgstr "Effacer le tableau de bord sélectionné ?"
 msgid "Delete selected discovery rules?"
 msgstr "Supprimer les règles de découverte sélectionnées ?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Supprimer les éléments sélectionnés ?"
 
@@ -5034,11 +5070,11 @@ msgstr "Supprimer les scripts sélectionnés ?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Supprimer les formes sélectionnées ?"
 
@@ -5054,7 +5090,7 @@ msgstr "Supprimer les prototypes de déclencheurs sélectionnés ?"
 msgid "Delete selected triggers?"
 msgstr "Supprimer les déclencheurs sélectionnés ?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Supprimer l'utilisateur sélectionné ?"
 
@@ -5105,7 +5141,7 @@ msgstr "Supprimé : Modèle \"%1$s\"."
 msgid "Delimiter"
 msgstr "Délimiteur"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5119,7 +5155,7 @@ msgstr "Interdit"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5127,7 +5163,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dépendances"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Dépendant"
 
@@ -5135,7 +5171,7 @@ msgstr "Dépendant"
 msgid "Dependent item"
 msgstr "Élément dépendant"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5163,7 +5199,7 @@ msgstr "État du déploiement"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5327,7 +5363,7 @@ msgstr "Désactiver les scénarios web sélectionnés ?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5340,14 +5376,14 @@ msgstr "Désactiver les scénarios web sélectionnés ?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5430,7 +5466,7 @@ msgid "Discovery by proxy"
 msgstr "Découverte par le proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Test de découverte"
 
@@ -5442,7 +5478,7 @@ msgstr "Tests de découverte"
 msgid "Discovery list"
 msgstr "Liste des découvertes"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objet de découverte"
 
@@ -5542,7 +5578,7 @@ msgstr "Règle de découverte mise à jour"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5553,7 +5589,7 @@ msgstr "Règles de découverte"
 msgid "Discovery rules deleted"
 msgstr "Règles de découverte supprimées"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "État de la découverte"
@@ -5593,7 +5629,7 @@ msgstr "Afficher le graphique empilé"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Affichage de %1$s sur %2$s trouvés"
@@ -5611,10 +5647,6 @@ msgstr "Options d'affichage"
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Ne pas calculer"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5629,7 +5661,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Souhaitez-vous remplacer l'expression conditionnelle ?"
 
@@ -5685,7 +5717,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Arrêté"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5694,7 +5726,7 @@ msgid "Download the configuration file"
 msgstr "Télécharger le fichier de configuration"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Temps d'arrêt"
@@ -5770,7 +5802,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Identifiant d'utilisateur \"%1$s\" en doublon dans les utilisateurs pour la carte \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5792,7 +5824,7 @@ msgstr "Élément dynamique"
 msgid "Dynamic items"
 msgstr "Éléments dynamiques"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Chaque URL doit avoir un nom unique. Veuillez vous assurer qu'il n'existe qu'un URL du même nom"
 
@@ -5800,13 +5832,14 @@ msgstr "Chaque URL doit avoir un nom unique. Veuillez vous assurer qu'il n'exist
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5818,8 +5851,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Édition"
 
@@ -5835,11 +5868,11 @@ msgstr "Éditer la carte"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Éditer un élément d'arborescence"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Éditer le déclencheur"
 
@@ -6114,7 +6147,7 @@ msgstr "Activer les trap"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6136,12 +6169,12 @@ msgstr "Activer les trap"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6200,7 +6233,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6224,7 +6257,7 @@ msgstr "Erreur"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erreur dans la requête de recherche dans la table \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Message d'erreur"
 
@@ -6263,7 +6296,7 @@ msgstr "Règles de corrélation d'événement"
 msgid "Event details"
 msgstr "Détails de l'événement"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Génération d'événement"
 
@@ -6293,7 +6326,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Paire de tags d'événement"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Type d'événement"
 
@@ -6327,7 +6360,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Exclure"
 
@@ -6338,7 +6371,7 @@ msgstr "Exclure"
 msgid "Exclude host groups"
 msgstr "Exclure un groupe d'hôte"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Exécuter"
 
@@ -6384,7 +6417,7 @@ msgstr "Exécuté"
 msgid "Executed script"
 msgstr "Script exécuté"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Confirmation d'exécution"
 
@@ -6400,8 +6433,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Déplier"
 
@@ -6468,7 +6501,7 @@ msgstr "Exporter en CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6522,7 +6555,7 @@ msgstr "Expressions"
 msgid "External check"
 msgstr "Vérification externe"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "V"
@@ -6546,7 +6579,7 @@ msgid "Failed"
 msgstr "Échoué"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Impossible de créer le tableau de bord"
 
@@ -6555,24 +6588,24 @@ msgstr "Impossible de créer le tableau de bord"
 msgid "Failed to parse URL."
 msgstr "Échec d'analyse de l'URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Impossible de mettre à jour le tableau de bord"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6580,7 +6613,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Échec lors de la mise à jour du modèle."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6604,7 +6637,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Fév"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Février"
 
@@ -6750,8 +6783,8 @@ msgstr "Région remplie"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6829,6 +6862,10 @@ msgstr "Ajuster à la carte"
 msgid "Fixed"
 msgstr "Fixe"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6894,14 +6931,14 @@ msgstr "Français (fr_FR)"
 msgid "Fri"
 msgstr "Ven"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Vendredi"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6919,7 +6956,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Accès à l'interface"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Messages dans l'interface"
 
@@ -7001,7 +7038,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "L'expression fournie n'est pas une macro"
 
@@ -7019,7 +7056,7 @@ msgstr "Valeur globale"
 msgid "Go back to %1$s"
 msgstr "Retour vers %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Aller à"
 
@@ -7068,7 +7105,7 @@ msgstr "Ligne et dégradé"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7229,7 +7266,7 @@ msgstr "Un graphique nommé \"%1$s\" existe déjà parmi les graphiques ou proto
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Graphiques"
 
@@ -7429,11 +7466,11 @@ msgstr "Aide"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadécimal vers décimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Caché"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Cacher le debug"
 
@@ -7478,14 +7515,14 @@ msgstr "Mettre en surbrillance la ligne entière"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Historique"
 
@@ -7549,7 +7586,7 @@ msgstr "Alignement horizontal"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7557,8 +7594,7 @@ msgstr "Alignement horizontal"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7570,7 +7606,7 @@ msgstr "Alignement horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7650,7 +7686,7 @@ msgstr[1] "Hôtes désactivés"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7658,7 +7694,7 @@ msgstr[1] "Hôtes désactivés"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Groupe d'hôtes"
@@ -7689,7 +7725,7 @@ msgstr "Type d'étiquette du groupe d'hôtes"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Le groupe d'hôtes avec l'ID \"%1$s\" n'est pas disponible."
@@ -7706,7 +7742,7 @@ msgstr "Le groupe d'hôtes avec l'ID \"%1$s\" n'est pas disponible."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7745,7 +7781,7 @@ msgstr "Interface hôte"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7893,7 +7929,7 @@ msgstr "Un hôte ayant le même nom visible \"%1$s\" existe déjà."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8125,14 +8161,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Identification du système. Retourne une chaîne"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8141,12 +8229,16 @@ msgstr "Si vous pensez que ce message n'est pas correct, veuillez consulter votr
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Image"
 
@@ -8276,7 +8368,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8289,11 +8381,11 @@ msgstr "Carte inaccessible"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "Modèle inaccessible"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "Déclencheur inaccessible"
 
@@ -8319,7 +8411,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Inclure"
 
@@ -8337,6 +8429,11 @@ msgstr "Inclure les sous-groupes"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statistiques de trafic entrant sur une interface réseau. Retourne un entier"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8727,7 +8824,7 @@ msgstr "Type de condition de filtre incorrect pour l'action \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Fonction incorrecte utilisée"
 
@@ -8784,7 +8881,7 @@ 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\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Type de valeur d'élément incorrect"
 
@@ -8815,7 +8912,7 @@ msgstr "Identifiant de type de média incorrect."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Méthode \"%1$s.%2$s\" incorrecte."
@@ -8955,10 +9052,10 @@ msgstr "Identifiant d'utilisateur incorrect pour la carte \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Identifiant de groupe d'utilisateurs incorrect pour la carte \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9265,9 +9362,9 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9339,6 +9436,10 @@ msgstr "Valeur incorrecte pour le champ PSK. Il doit contenir un nombre pair de
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Valeur incorrecte utilisée pour l'état de proxy \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonésien (id_ID)"
@@ -9350,12 +9451,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9428,7 +9529,7 @@ msgid "Insert"
 msgstr "Insertion"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Insérer une expression"
 
@@ -9536,7 +9637,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9584,7 +9685,7 @@ msgstr "Data invalide."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Adresse de courrier électronique non valide \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Adresse e-mail incorrecte pour le type de media avec l'ID \"%1$s\"."
@@ -9687,8 +9788,8 @@ msgstr "Paramètres de la méthode invalides."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9892,7 +9993,7 @@ msgstr "Période de temps invalide."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -10082,7 +10183,7 @@ msgstr "Prototypes d'élément mis à jour"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10243,7 +10344,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Janvier"
 
@@ -10265,7 +10366,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Juil"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Juillet"
 
@@ -10273,7 +10374,7 @@ msgstr "Juillet"
 msgid "Jun"
 msgstr "Juin"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Juin"
 
@@ -10307,7 +10408,7 @@ msgstr "Clé"
 msgid "Key passphrase"
 msgstr "Phrase de passe de la clé"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Mot-clé"
 
@@ -10377,7 +10478,7 @@ msgstr "Positionnement de l'étiquette"
 msgid "Language"
 msgstr "Langue"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10456,11 +10557,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Dernière vérification"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Graphique de la dernière heure"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Graphique du dernier mois"
 
@@ -10498,7 +10599,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Dernière valeur"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Graphique dernière semaine"
 
@@ -10511,11 +10612,11 @@ msgstr "Graphique dernière semaine"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Dernières données"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Dernières valeurs"
 
@@ -10626,7 +10727,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10704,12 +10805,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Liste de partages pour les groupes d'utilisateurs"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Liste de partages pour les utilisateurs"
@@ -10837,7 +10938,7 @@ msgstr "Règle de découverte bas niveau dans l'état \"non supportée\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "L"
@@ -10997,7 +11098,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11026,7 +11127,7 @@ msgstr "Fermé manuellement"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Carte"
 
@@ -11065,7 +11166,7 @@ msgstr "Emplacement de l'étiquette de l'élément de carte"
 msgid "Map element label type"
 msgstr "Type d'étiquette de l'élément de carte"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11091,7 +11192,7 @@ msgstr "Le propriétaire de la carte ne peut pas être vide."
 msgid "Map shape"
 msgstr "Forme de carte"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "La mise à jour de la carte a échoué."
 
@@ -11127,7 +11228,7 @@ msgstr "Cartes"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Mars"
 
@@ -11154,7 +11255,7 @@ msgstr "Masque"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11225,9 +11326,9 @@ msgstr "Nombre maximal de fichiers ouverts supporté par le SE. Retourne un enti
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Nombre maximal de processus supporté par le SE. Retourne un entier"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11240,12 +11341,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "La période maximale à afficher est %1$s jour."
 msgstr[1] "La période maximale à afficher est %1$s jours."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Longueur totale maximale de l'adresse e-mail dépassée pour le type de media avec l'ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mai"
 
@@ -11255,8 +11356,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Média"
 
@@ -11317,7 +11418,7 @@ msgstr "Test du type de média réussi."
 msgid "Media type updated"
 msgstr "Type de média mis à jour"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Le type de média avec l'IS \"%1$s\" n'est pas disponible."
@@ -11390,8 +11491,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Expiration du message"
 
@@ -11409,7 +11510,7 @@ msgstr "Message/Commande"
 msgid "Messages"
 msgstr "Messages"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Messagerie"
 
@@ -11437,6 +11538,11 @@ msgstr "Min"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11452,11 +11558,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11602,7 +11703,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Lun"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Lundi"
 
@@ -11642,11 +11743,11 @@ msgstr "Mois"
 msgid "Monthly"
 msgstr "Mensuel"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Plus de correspondances trouvées..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11662,6 +11763,14 @@ msgstr "Plus de 10 minutes"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Plus d'un graphique nommé \"%1$s\" dans l'hôte."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11671,11 +11780,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Multiple"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Événements PROBLÈME multiples"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Sourdine"
 
@@ -11683,6 +11792,18 @@ msgstr "Sourdine"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11777,25 +11898,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11938,6 +12060,10 @@ msgstr ""
 msgid "Never"
 msgstr "Jamais"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11949,7 +12075,7 @@ msgstr "Nouvelle condition"
 msgid "New dashboard"
 msgstr "Nouveau tableau de bord"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nouvel élément"
 
@@ -11973,7 +12099,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nouvelle expression régulière"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11990,7 +12116,7 @@ msgid "New triggers"
 msgstr "Nouveaux déclencheurs"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12008,20 +12134,20 @@ msgstr "Prochaine étape"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12154,7 +12280,7 @@ msgstr "Pas de détails"
 msgid "No discovery rule IDs given."
 msgstr "Aucun identifiant de règle de découverte fourni."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12216,7 +12342,7 @@ msgstr "Aucune image"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Aucune interface trouvée"
 
@@ -12256,7 +12382,7 @@ msgstr "Aucune macro trouvée."
 msgid "No maps added."
 msgstr "Aucune carte ajoutée."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Aucune correspondance trouvée"
 
@@ -12269,8 +12395,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Aucun type d'opération donné pour la corrélation \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Aucune permission pour l'accès au système."
 
@@ -12282,7 +12408,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12290,11 +12415,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12412,19 +12538,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12433,15 +12559,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12468,7 +12594,7 @@ msgstr "Aucun fichier de clé publique spécifié."
 msgid "No recipients for action operation message."
 msgstr "Aucun destinataire pour le message d'opération d'action."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Pas de rafraîchissement"
 
@@ -12484,7 +12610,7 @@ msgstr "Aucune cible sélectionnée"
 msgid "No target selected."
 msgstr "Aucune cible sélectionnée."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12531,7 +12657,7 @@ msgstr "Aucun"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12563,15 +12689,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Configuration du mot de passe de l'utilisateur \"guest\" interdite."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12603,8 +12729,8 @@ msgstr "Éléments non hérités"
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Note"
 
@@ -12634,7 +12760,7 @@ msgstr "Notifier tous les participants"
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Novembre"
 
@@ -12797,12 +12923,12 @@ msgstr "Systèmes numériques"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numérique (flottant)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Numerique (Entier)"
 
@@ -12817,18 +12943,17 @@ msgstr "Numérique (non signé)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12855,7 +12980,7 @@ msgstr "Hôte - Routeur OOB"
 msgid "OOB subnet mask"
 msgstr "Hôte - Masque de sous-réseau OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "OU"
 
@@ -12883,13 +13008,13 @@ msgstr "Oct"
 msgid "Octal to decimal"
 msgstr "Octal vers décimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Octobre"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Inactif"
 
@@ -12901,7 +13026,7 @@ msgstr "Inactif"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12920,7 +13045,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Actif"
 
@@ -12928,7 +13053,7 @@ msgstr "Actif"
 msgid "On status change triggers blink for"
 msgstr "Au changement d'état, clignoter pendant"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Une fois"
 
@@ -12945,7 +13070,7 @@ msgid "One time only"
 msgstr "Une fois uniquement"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Temps d'arrêt unique"
 
@@ -12957,26 +13082,14 @@ msgstr "Seuls les super administrateurs peuvent créer des groupes d'hôtes."
 msgid "Only Super Admins can create media types."
 msgstr "Seuls les super administrateurs peuvent créer des types de médias."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Seuls les super administrateurs peuvent créer des groupes d'utilisateurs."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Seuls les super administrateurs peuvent effacer des types de médias."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Seuls les super administrateurs peuvent effacer des groupes d'utilisateurs."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Seuls les super administrateurs peuvent éditer les types de médias."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Seuls les super administrateurs peuvent mettre à jour les groupes d'utilisateurs."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Seules les vérifications d'agents Zabbix, SNMPv1, SNMPv2 et SNMPv3 peuvent être mises uniques."
@@ -13017,11 +13130,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Seulement le problème sélectionné"
 msgstr[1] "Seulement les problèmes sélectionnés"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13054,7 +13167,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informations du système d'exploitation. Retourne une chaîne"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13079,7 +13192,7 @@ msgstr "L'opération n'a pas de groupe à exploiter."
 msgid "Operation has no template to operate."
 msgstr "L'opération n'a pas de modèle à exploiter."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13104,27 +13217,27 @@ msgstr "Opérations"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Opérateur"
 
@@ -13149,7 +13262,7 @@ msgstr "Options"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13166,8 +13279,8 @@ msgstr "Ou"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13214,9 +13327,9 @@ msgstr "Ou"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Original"
 
@@ -13468,7 +13581,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLÈME"
@@ -13515,7 +13628,7 @@ msgstr "Identité PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "La PSK est trop courte. Le minimum est %1$s chiffres hexadécimaux."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13538,13 +13651,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Paramètre"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13575,9 +13690,7 @@ msgstr "Éléments parents"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13666,15 +13779,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Coller"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Coller sans les liens externes"
 
@@ -13748,19 +13865,20 @@ msgid "Periods"
 msgstr "Périodes"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Permissions"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Les permissions ne peuvent être assignées qu'aux groupes d'utilisateurs."
 
@@ -13782,12 +13900,12 @@ msgstr "Algorithme de placement"
 msgid "Plain text"
 msgstr "Texte brut"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Jouer"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Jouer un son"
 
@@ -13817,7 +13935,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Veuillez renseigner le nom d'hôte ou l'adresse IP et le numéro de port du serveur Zabbix ainsi que le nom de l'installation (facultatif)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Veuillez sélectionner deux éléments"
 
@@ -13946,7 +14064,7 @@ msgid "Previous month"
 msgstr "Mois précédent"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14004,7 +14122,7 @@ msgstr "Phrase de passe de confidentialité"
 msgid "Privacy protocol"
 msgstr "Protocole de confidentialité"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privé"
@@ -14024,12 +14142,12 @@ msgid "Privilege level"
 msgstr "Niveau de privilège"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14059,7 +14177,7 @@ msgstr "Problème créé"
 msgid "Problem display"
 msgstr "Affichage des problèmes"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Expression de problème"
@@ -14077,7 +14195,7 @@ msgstr "Le problème n'est pas supprimé"
 msgid "Problem is suppressed"
 msgstr "Le problème est supprimé"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problème sur"
 
@@ -14090,8 +14208,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Problème résolu"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14104,14 +14222,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problème si tous les enfants ont un problème"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problème si au moins un enfant a un problème"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14128,7 +14238,7 @@ msgstr "Problème si au moins un enfant a un problème"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problèmes"
 
@@ -14162,12 +14272,12 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus vers JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Propriétés"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14189,7 +14299,7 @@ msgstr "Proxys"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14252,7 +14362,7 @@ msgstr "Nom du proxy"
 msgid "Proxy updated"
 msgstr "Proxy modifié"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Public"
@@ -14346,8 +14456,8 @@ msgstr "Lecture"
 msgid "Read only"
 msgstr "Lecture seule"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14355,8 +14465,8 @@ msgstr "Lecture seule"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14409,7 +14519,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14417,7 +14527,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Récupération"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14452,7 +14562,7 @@ msgstr "Rectangle"
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Intervalle de rafraîchissement"
 
@@ -14513,7 +14623,7 @@ msgstr "Expressions régulières"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14545,6 +14655,7 @@ msgstr "Commande à distance"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14554,7 +14665,7 @@ msgstr "Commande à distance"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14562,13 +14673,13 @@ msgstr "Commande à distance"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14578,8 +14689,8 @@ msgstr "Commande à distance"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14656,8 +14767,8 @@ msgstr "Commande à distance"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -14697,7 +14808,7 @@ msgstr "Supprimer, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14726,7 +14837,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14734,7 +14845,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Remplacer"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Remplacer les dépendances"
 
@@ -14841,7 +14952,7 @@ msgstr "Code d'état requis"
 msgid "Required string"
 msgstr "Chaîne requise"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Réinitialiser"
@@ -14875,7 +14986,7 @@ msgstr "Confirmation de la réinitialisation"
 msgid "Reset defaults"
 msgstr "Réinitialiser aux valeurs par défaut"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Résolu"
 
@@ -15073,8 +15184,8 @@ msgstr "Y droit"
 msgid "Right trim"
 msgstr "Rogner à droite"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15132,12 +15243,12 @@ msgstr "Exécute la commande spécifiée sur l'hôte. Retourne le résultat text
 msgid "Russian (ru_RU)"
 msgstr "Russe (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15148,10 +15259,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15364,7 +15473,7 @@ msgstr "Sans empattement"
 msgid "Sat"
 msgstr "Sam"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -15537,7 +15646,7 @@ msgstr "Script modifié"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -15607,8 +15716,8 @@ msgid "Security name"
 msgstr "Nom de la sécurité"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15616,7 +15725,7 @@ msgstr "Nom de la sécurité"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -15652,19 +15761,19 @@ msgstr "Éléments sélectonnés"
 msgid "Selected items only"
 msgstr "Éléments sélectionnés uniquement"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Sélectionné, %1$s en position  %2$d de %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Sélectionné, %1$s, lecture seule, en position %2$d de %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Envoyer vers l'arrière"
 
@@ -15689,7 +15798,7 @@ msgstr "Envoyer uniquement à"
 msgid "Send to"
 msgstr "Envoyer"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Envoyer à l'arrière"
 
@@ -15722,7 +15831,7 @@ msgstr "Séparé"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Septembre"
 
@@ -15754,34 +15863,29 @@ msgid "Server time"
 msgstr "Temps serveur"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15789,7 +15893,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Service créé"
 
@@ -15818,7 +15922,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 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."
 
@@ -15834,11 +15938,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Périodes de maintenance"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Type de service"
 
@@ -15847,7 +15951,7 @@ msgstr "Type de service"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Service mis à jour"
 
@@ -15856,16 +15960,16 @@ msgstr "Service mis à jour"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Services"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Les services forment une dépendance circulaire."
 
@@ -15877,9 +15981,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Session terminée, veuillez vous reconnecter."
 
@@ -15903,10 +16007,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Configurer le mode d'inventaire d'hôte"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15947,7 +16059,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15993,7 +16105,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Partage"
 
@@ -16084,7 +16196,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16135,7 +16247,7 @@ msgstr "Afficher une alerte si le serveur Zabbix est arrêté"
 msgid "Show working time"
 msgstr "Afficher les heures ouvrées"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Affiché"
 
@@ -16244,7 +16356,7 @@ msgstr "Copie du graphique \"%1$s\" sur l'hôte \"%2$s\" sautée."
 msgid "Slovak (sk_SK)"
 msgstr "Slovaque (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Reporter"
 
@@ -16290,7 +16402,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Classer les entrées par"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Ordre de tri (0->999)"
 
@@ -16364,7 +16476,7 @@ msgstr "Démarrer dans"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16412,12 +16524,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16428,17 +16542,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16462,13 +16583,10 @@ msgstr ""
 msgid "Status"
 msgstr "État"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Calcul de l'état"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algorithme de calcul de l'état"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16499,6 +16617,10 @@ msgstr "État seulement"
 msgid "Status problem"
 msgstr "Statut problème"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16530,8 +16652,8 @@ msgstr "L'étape nommée \"%1$s\" existe déjà."
 msgid "Steps"
 msgstr "Étapes"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Stop"
 
@@ -16543,7 +16665,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16575,7 +16697,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16608,7 +16730,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Sujet"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Sous-carte"
 
@@ -16624,7 +16746,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Succès Audit"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "Message de succès"
 
@@ -16637,7 +16759,7 @@ msgstr "Somme des statistiques de trafic entrant et sortant sur l'interface rés
 msgid "Sun"
 msgstr "Dim"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -16729,12 +16851,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Uptime du système en secondes. Retourne un entier"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "J"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "M"
@@ -16770,8 +16892,8 @@ msgstr "La table \"%1$s\" n'a pas de champ nommé \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Étiquette"
@@ -16811,14 +16933,13 @@ msgstr "Valeur du tag"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16826,10 +16947,10 @@ msgstr "Valeur du tag"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16993,7 +17114,7 @@ msgstr "Un modèle avec le même nom visible \"%1$s\" existe déjà."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17278,12 +17399,12 @@ msgstr "Étranglement"
 msgid "Thu"
 msgstr "Jeu"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "À"
 
@@ -17293,13 +17414,13 @@ msgstr "À"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17380,7 +17501,7 @@ msgstr "Horodateur"
 msgid "To"
 msgstr "À"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 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"
 
@@ -17502,13 +17623,13 @@ msgstr "Tendances"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Déclencheur"
 
@@ -17527,7 +17648,7 @@ msgstr "Le déclencheur \"%1$s\" appartient à des modèles avec des liens diff�
 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."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17611,7 +17732,7 @@ msgstr "Aperçu des déclencheurs"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17678,15 +17799,15 @@ msgstr "Prototypes de déclencheurs supprimés"
 msgid "Trigger prototypes updated"
 msgstr "Prototypes de déclencheurs mis à jour"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Sévérité du déclencheur"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "État du déclencheur \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "État du déclencheur \"Problème\""
 
@@ -17738,7 +17859,7 @@ msgstr "Rogner"
 msgid "Tue"
 msgstr "Mar"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -17751,7 +17872,7 @@ msgstr "Turc (tr_TR)"
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "Deux éléments de carte devraient être sélectionnés"
 
@@ -17766,15 +17887,16 @@ msgstr "Deux éléments de carte devraient être sélectionnés"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17841,7 +17963,7 @@ msgid "UNKNOWN"
 msgstr "INCONNU"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17851,7 +17973,7 @@ msgstr "INCONNU"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17897,7 +18019,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "Les URLS doivent avoir les champs \"name\" et \"url\" pour la carte \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17945,7 +18067,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Impossible d'écrire par-dessus le fichier de configuration existant."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17992,7 +18114,8 @@ msgstr "Débloquer les utilisateurs sélectionnés ?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18011,7 +18134,8 @@ msgstr "Unités"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18022,9 +18146,9 @@ msgstr "Unités"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Inconnu"
@@ -18043,12 +18167,12 @@ msgstr "Erreur inconnue"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 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é"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Hôte inconnu, cet hôte n'est pas défini"
 
@@ -18095,7 +18219,7 @@ msgstr "Supprimer lien au modèle"
 msgid "Unlink from templates"
 msgstr "Supprimer lien aux modèles"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Enlever la sourdine"
 
@@ -18176,27 +18300,28 @@ msgstr "Fonctionne"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18265,7 +18390,7 @@ msgid "Upper level maps"
 msgstr "Cartes de niveau supérieur"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Temps de fonctionnement"
@@ -18314,37 +18439,37 @@ msgstr "Utilisé dans les actions"
 msgid "User"
 msgstr "Utilisateur"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "L'utilisateur \"%1$s\" ne peut pas ne pas avoir de groupe d'utilisateurs."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "L'utilisateur \"%1$s\" est le propriétaire du tableau de bord \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "L'utilisateur \"%1$s\" est le propriétaire de la carte \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "L'utilisateur \"%1$s\" est utilisé dans l'action \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18361,13 +18486,13 @@ msgstr "Utilisateur ajouté"
 msgid "User agent string"
 msgstr "Chaîne du \"user agent\""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18392,32 +18517,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Groupe d'utilisateurs"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Le groupe d'utilisateurs \"%1$s\" existe déjà."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans l'action \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans la configuration pour les messages envoyés lorsque la base de données est arrêtée."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, 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\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18448,7 +18573,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Le groupe d'utilisateurs avec l'IS \"%1$s\" n'est pas disponible."
@@ -18456,14 +18581,14 @@ msgstr "Le groupe d'utilisateurs avec l'IS \"%1$s\" n'est pas disponible."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Groupes d'utilisateurs"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Un utilisateur n'est pas autorisé à s'effacer lui-même."
 
@@ -18512,7 +18637,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18546,7 +18671,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Le paramètre %1$s manque pour le partage d'utilisateur pour la carte \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18567,12 +18692,12 @@ msgstr "Utilisateur mis à jour"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "L'utilisateur avec l'ID \"%1$s\" n'est pas disponible."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18617,7 +18742,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18884,23 +19009,23 @@ msgstr "Validation"
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19107,8 +19232,8 @@ msgstr "Alignement vertical"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamien (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19135,7 +19260,12 @@ msgstr "Nom visible"
 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:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19152,11 +19282,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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."
 
@@ -19172,7 +19302,7 @@ msgstr "Nous sommes désolés, le nombre maximal d'éléments à mémoriser a é
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19241,7 +19371,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mer"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -19252,6 +19382,10 @@ msgstr "Mercredi"
 msgid "Weekly"
 msgstr "Hebdomadaire"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Bienvenue"
@@ -19269,7 +19403,7 @@ msgstr "Lorsque actif"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19482,8 +19616,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19525,19 +19659,19 @@ msgstr "Annuel"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19605,19 +19739,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Vous n'avez pas la permission d'effectuer cette opération."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Vous n'avez pas la permission de créer des utilisateurs."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Vous n'avez pas la permission d'accéder à cette page."
@@ -19738,7 +19868,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "un booléen est nécessaire"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19857,7 +19987,6 @@ msgstr "agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20153,9 +20282,9 @@ msgstr "ne peut pas être changé"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20235,7 +20364,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "la dépendance d'élément circulaire n'est pas autorisée"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20282,7 +20411,7 @@ msgstr "count () - Nombre de valeurs récupérées avec succès V (qui remplisse
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "j"
@@ -20481,13 +20610,13 @@ msgstr "paramètres de nettoyage globaux"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20535,7 +20664,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "sous-groupes inclus"
 
@@ -20761,12 +20890,12 @@ msgstr "règle de découverte bas niveau"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20870,8 +20999,8 @@ msgstr "min () - Valeur minimale pour la période T"
 msgid "minimum length is %1$s characters"
 msgstr "la longueur minimale est de %1$s caractères"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20966,7 +21095,7 @@ msgstr ""
 msgid "name"
 msgstr "nom"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "nouveau"
 
@@ -21033,7 +21162,7 @@ msgstr "now () - Nombre de secondes écoulées depuis le temps Epoch"
 msgid "number"
 msgstr "nombre"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "de"
@@ -21101,7 +21230,7 @@ msgstr "sortie"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21228,7 +21357,7 @@ msgstr "sélectionné"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "description courte"
 
@@ -21313,7 +21442,7 @@ msgstr "sum () - Somme des valeurs d'une période T"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "les informations d'identification fournies ne sont pas uniques"
 
@@ -21323,8 +21452,8 @@ msgstr "les informations d'identification fournies ne sont pas uniques"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21405,7 +21534,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "décalage horaire"
 
@@ -21468,7 +21597,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "taper ici pour rechercher"
 
@@ -21495,7 +21624,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21589,7 +21718,7 @@ msgstr "numéro de version non supporté"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21609,7 +21738,7 @@ msgstr "numéro de version non supporté"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "valeur"
 
@@ -21756,7 +21885,7 @@ msgstr "mauvais type de règle de découverte"
 msgid "wrong item type"
 msgstr "mauvais type d'élément"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/he/LC_MESSAGES/frontend.po b/ui/locale/he/LC_MESSAGES/frontend.po
index 0b436bb4f71..5fdf8cffa84 100644
--- a/ui/locale/he/LC_MESSAGES/frontend.po
+++ b/ui/locale/he/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
-"PO-Revision-Date: 2021-08-23 08:21+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
+"PO-Revision-Date: 2021-08-31 08:35+0300\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: none\n"
 "Language: he\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.1.3\n"
-"X-POOTLE-MTIME: 1629699698.000000\n"
+"X-POOTLE-MTIME: 1630391739.000000\n"
 
 #: include/classes/db/MysqlDbBackend.php:70
 #: include/classes/db/OracleDbBackend.php:142
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "יום אחד"
 msgstr[1] "%1$d ימים"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] "%1$s הודעות"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s מתוך רכיב %2$s נמצא במצב תקלה"
 msgstr[1] "%1$s מתוך %2$s רכיבים נמצאים במצב תקלה"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -222,17 +222,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "נותר ניסיון אחד"
 msgstr[1] "נותרו %1$s ניסיונות"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "שנייה אחת"
 msgstr[1] "%1$s שניות"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "נותרו %1$s סמלים"
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, דרגת חומרה, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, קריאה בלבד"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -307,7 +307,7 @@ msgstr "(אין מתווך)"
 msgid "0 - use default port"
 msgstr "0 - שימוש בפתחת בררת המחדל"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 או 1"
 
@@ -375,7 +375,7 @@ msgstr "<תת־תפריט/תת־תפריט/…>"
 msgid "ADD OVERRIDE"
 msgstr "הוספת מעקף"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "וגם"
 
@@ -392,7 +392,7 @@ msgstr "שיטות API"
 msgid "API token"
 msgstr "אסימון API"
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr "אסימון ה־API‏ „%1$s” כבר קיים למזהה המשתמש „%2$s”."
@@ -457,40 +457,40 @@ msgstr "SLA מקובל"
 msgid "Access denied"
 msgstr "הגישה נדחתה"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "הגישה נדחתה!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr "גישה ל־API"
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "גישה לרכיבים במנשק המשתמש"
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr "גישה לפעולות"
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr "גישה למודולים"
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "מוכר"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "הכרה"
 
@@ -498,7 +498,7 @@ msgstr "הכרה"
 msgid "Acknowledge problems"
 msgstr "הכרה בתקלות"
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "מוכר"
@@ -527,20 +527,22 @@ msgstr "אירועים מוכרים שנפתרו"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -645,7 +647,7 @@ msgstr "המשימה עודכנה"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -654,7 +656,7 @@ msgstr "המשימה עודכנה"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "פעולות"
@@ -713,8 +715,8 @@ msgstr "פעיל עד"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -725,7 +727,6 @@ msgstr "פעיל עד"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -733,11 +734,13 @@ msgstr "פעיל עד"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -749,15 +752,17 @@ msgstr "פעיל עד"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -824,7 +829,7 @@ msgstr "פעיל עד"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "הוספה"
 
@@ -832,19 +837,19 @@ msgstr "הוספה"
 msgid "Add (message type limit reached)"
 msgstr "הוספה (הגעת לגבול כמות סוגי הודעות)"
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "הוספת וידג׳ט חדש"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "הוספת פריט צאצא"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr "הוספת שירות צאצא"
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr "הוספת שירותים צאצאים"
 
@@ -861,7 +866,7 @@ msgstr "הוספת מארח"
 msgid "Add missing"
 msgstr "הוספת חוסר"
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "הוספת מספר מפות"
 
@@ -878,7 +883,11 @@ msgstr "הוספת מנשק חדש"
 msgid "Add new override"
 msgstr "הוספת מעקף חדש"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr "הוספת שירותים הורים"
 
@@ -886,7 +895,7 @@ msgstr "הוספת שירותים הורים"
 msgid "Add problem comments"
 msgstr "הוספת הערות על תקלה"
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -920,7 +929,7 @@ msgstr "הוספת משתמש"
 msgid "Add user group"
 msgstr "הוספת קבוצת משתמשים"
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "הוספת וידג׳ט"
 
@@ -929,12 +938,20 @@ msgstr "הוספת וידג׳ט"
 msgid "Added"
 msgstr "נוסף"
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "נוסף, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "מנהל"
@@ -944,6 +961,10 @@ msgstr "מנהל"
 msgid "Administration"
 msgstr "ניהול"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "תוויות מתקדמות"
@@ -1030,7 +1051,7 @@ msgstr "יישור רכיבים במפה"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "הכול"
 
@@ -1039,8 +1060,8 @@ msgid "All dashboards"
 msgstr "כל לוחות המחוונים"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "כל הקבוצות"
 
@@ -1048,7 +1069,7 @@ msgstr "כל הקבוצות"
 msgid "All hosts"
 msgstr "כל המארחים"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "יש לציין „שם” ו־„כתובת” לכל הקישורים"
 
@@ -1082,7 +1103,7 @@ msgstr "כל התבניות"
 msgid "Allow list"
 msgstr "רשימת היתר"
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1095,7 +1116,7 @@ msgstr "לאפשר סגירה ידנית"
 msgid "Allowed hosts"
 msgstr "מארחים מורשים"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr "שיטות מורשות"
 
@@ -1113,7 +1134,7 @@ msgstr "כמות הזיכרון הפיזי שנצרך לטובת גיבוי עמ
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1154,12 +1175,12 @@ msgstr "וגם/או"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1179,15 +1200,15 @@ msgstr "שגיאת יישום."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "החלה"
 
@@ -1205,7 +1226,7 @@ msgstr "בהמשך"
 msgid "Apr"
 msgstr "אפר׳"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "אפריל"
 
@@ -1233,6 +1254,10 @@ msgstr "סוג השטח"
 msgid "Arithmetic"
 msgstr "חשבוני"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "כטקסט פשוט"
@@ -1283,8 +1308,8 @@ msgstr "יש לסמן לפחות רכיב מנשק משתמש אחד."
 msgid "At least one action is mandatory."
 msgstr "חובה לפחות פעולה אחת."
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr "לפחות משתמש פעיל אחד חייב להיות קיים עם התפקיד „%1$s”."
@@ -1362,7 +1387,7 @@ msgstr "הגדרות פיקוח"
 msgid "Aug"
 msgstr "אוג׳"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "אוגוסט"
 
@@ -1392,7 +1417,7 @@ msgstr "אימות"
 msgid "Authentication algorithm"
 msgstr "אלגוריתם אימות"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "האימות נכשל: %1$s."
@@ -1441,7 +1466,7 @@ msgstr "אוטומטית"
 msgid "Auto-login"
 msgstr "כניסה אוטומטית"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "לא ניתן להפעיל את האפשרויות לכניסה וליציאה באופן אוטומטי יחדיו."
 
@@ -1451,7 +1476,7 @@ msgstr "יציאה אוטומטית"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1636,11 +1661,11 @@ msgstr "שתי הססמאות חייבות להיות זהות."
 msgid "Bottom"
 msgstr "תחתית"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "קידום לעבר החזית"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "קידום לחזית"
 
@@ -1721,7 +1746,7 @@ msgstr "אמור להיות CUID"
 msgid "Calculated"
 msgstr "מחושב"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "לוח שנה"
 
@@ -1741,8 +1766,8 @@ msgstr "קריאה"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1759,8 +1784,8 @@ msgstr "קריאה"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -1790,7 +1815,7 @@ msgstr "לא ניתן להוסיף משימה"
 msgid "Cannot add correlation"
 msgstr "לא ניתן להוסיף יחס"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr "לא ניתן להוסיף עמוד ללוח מחוונים: נוספו כבר %1$d עמודי לוחות מחוונים שזו הכמות המרבית."
@@ -1801,7 +1826,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "לא ניתן להוסיף תלות ממארח לתבנית."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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”."
@@ -1920,7 +1945,7 @@ msgid "Cannot add user"
 msgstr "לא ניתן להוסיף משתמש"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr "לא ניתן להוסיף משתמש לקבוצה"
 
@@ -1928,11 +1953,11 @@ msgstr "לא ניתן להוסיף משתמש לקבוצה"
 msgid "Cannot add web scenario"
 msgstr "לא ניתן להוסיף תרחיש רשת"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "לא ניתן להוסיף וידג׳ט: אין מספיק מקום פנוי בלוח המחוונים."
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr "לא ניתן להסיר"
@@ -2013,7 +2038,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "לא ניתן להעתיק הקפצה"
 msgstr[1] "לא ניתן להעתיק הקפצות"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "לא ניתן להעתיק את ההקפצה „%1$s:%2$s”, כיוון שמופיעים מספר מארחים בביטוי."
@@ -2068,7 +2093,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] "לא ניתן למחוק אסימון API"
 msgstr[1] "לא ניתן למחוק אסימוני API"
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "לא ניתן למחוק את המשתמש הפנימי של Zabbix בשם „%1$s”, יש לנסות להשבית את המשתמש הזה."
@@ -2482,7 +2507,7 @@ msgstr "לא ניתן להעריך ביטוי"
 msgid "Cannot execute script."
 msgstr "לא ניתן להריץ סקריפט."
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "לא ניתן להרחיב מאקרואים."
 
@@ -2652,7 +2677,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] "לא ניתן לטעון את המודול תחת: %1$s."
 msgstr[1] "לא ניתן לטעון את המודולים תחת: %1$s."
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr "לא ניתן לצאת."
 
@@ -2714,7 +2739,7 @@ msgstr "לא ניתן לקרוא YAML‏: %1$s."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "לא ניתן לקרוא את התגובה, יש לבדוק את החיבור לשרת ה־Zabbix‏ „%1$s”."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "לא ניתן לשנות את שם משתמש האורח."
 
@@ -2773,7 +2798,12 @@ msgstr "לא ניתן להגדיר את שדות המלאי עבור מלאי מ
 msgid "Cannot set session cookie."
 msgstr "לא ניתן להגדיר עוגיית הפעלה."
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr "לא ניתן לתמוך בהתראה קולית עבור התקן זה."
 
@@ -3195,6 +3225,7 @@ msgid "Change per second"
 msgstr "שינויים בשנייה"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "שינוי דרגת חומרה"
 
@@ -3336,7 +3367,7 @@ msgstr "בודקת ביצועים של שירות UDP. מחזירה 0 - השיר
 msgid "Checks should be unique."
 msgstr "הבדיקות צריכות להיות ייחודיות."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr "שירותים צאצאים"
 
@@ -3378,11 +3409,11 @@ msgstr "פינוי היסטוריה ומגמות"
 msgid "Clear when unlinking"
 msgstr "פינוי בעת ניתוק"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "יש לגרור לגודל הרצוי."
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "יש ללחוץ כדי לצפות או לערוך"
 
@@ -3412,7 +3443,7 @@ msgstr "שעון"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "שכפול"
 
@@ -3423,8 +3454,8 @@ msgstr "שכפול"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "סגירה"
 
@@ -3454,8 +3485,8 @@ msgid "Close problems"
 msgstr "סגירת תקלות"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "צמצום"
 
@@ -3472,7 +3503,7 @@ msgstr "צמצום סרגל הצד"
 msgid "Color"
 msgstr "צבע"
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr "הצבע „%1$s” שגוי: אמור להיות צבע קוד הקסדצימלי (6 תווים)."
@@ -3540,6 +3571,7 @@ msgstr "הפעלות בו־זמנית"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "תנאי"
 
@@ -3594,7 +3626,7 @@ msgstr "תנאים"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "הגדרות"
 
@@ -3868,7 +3900,7 @@ msgstr "פרטי קשר"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3905,8 +3937,8 @@ msgstr "מכיל"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3967,8 +3999,8 @@ msgstr "נקודות ציון"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "העתקה"
 
@@ -4098,11 +4130,11 @@ msgstr "יצירת יחס"
 msgid "Create dashboard"
 msgstr "יצירת לוח מחוונים"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "יצירת כלל גילוי תלוי"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "יצירת פריט תלוי"
 
@@ -4219,7 +4251,7 @@ msgstr "יצירת מפה"
 msgid "Create media type"
 msgstr "יצירת סוג מדיה"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "יצירת חדש"
 
@@ -4235,7 +4267,7 @@ msgstr "יצירת דוח"
 msgid "Create script"
 msgstr "יצירת סקריפט"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr "יצירת שירות"
 
@@ -4243,7 +4275,7 @@ msgstr "יצירת שירות"
 msgid "Create template"
 msgstr "יצירת תבנית"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "יצירת הקפצה"
 
@@ -4463,7 +4495,7 @@ msgstr "מאפייני עמוד לוח מחוונים"
 msgid "Dashboard properties"
 msgstr "מאפייני לוח המחוונים"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "שיתוף לוח מחוונים"
 
@@ -4493,7 +4525,7 @@ msgstr "לוח מחוונים עם המזהה „%1$s” אינו זמין."
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "לוחות מחוונים"
 
@@ -4663,7 +4695,7 @@ msgstr "יום בשבוע"
 msgid "Days"
 msgstr "ימים"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "ניפוי שגיאות"
 
@@ -4677,7 +4709,7 @@ msgstr "מצב ניפוי שגיאות"
 msgid "Dec"
 msgstr "דצמ׳"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "דצמבר"
 
@@ -4686,13 +4718,17 @@ msgstr "דצמבר"
 msgid "Decimal places"
 msgstr "מקומות עשרוניים"
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "בררת מחדל"
 
@@ -4762,8 +4798,8 @@ msgid "Delayed by"
 msgstr "בהשהיה של"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4777,7 +4813,7 @@ msgstr "בהשהיה של"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4809,8 +4845,8 @@ msgstr "בהשהיה של"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -4839,7 +4875,7 @@ msgstr "למחוק את המשימה הנוכחית?"
 msgid "Delete current correlation?"
 msgstr "למחוק את היחס הנוכחי?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "למחוק את לוח המחוונים?"
 
@@ -4883,7 +4919,7 @@ msgstr "למחוק אבטיפוס פריט?"
 msgid "Delete item?"
 msgstr "למחוק פריט?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "למחוק קישורים בין הפריטים הנבחרים?"
 
@@ -4939,7 +4975,7 @@ msgstr "למחוק את לוחות המחוונים הנבחרים?"
 msgid "Delete selected discovery rules?"
 msgstr "למחוק את כללי הגילוי הנבחרים?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "למחוק את הפריטים הנבחרים?"
 
@@ -5040,11 +5076,11 @@ msgstr "למחוק את הסקריפטים הנבחרים?"
 msgid "Delete selected service?"
 msgstr "למחוק את השירות הנבחר?"
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr "למחוק את השירותים הנבחרים?"
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "למחוק את הצורות הנבחרות?"
 
@@ -5060,7 +5096,7 @@ msgstr "למחוק את אבות הטיפוס של ההקפצה הנבחרת?"
 msgid "Delete selected triggers?"
 msgstr "למחוק את ההקפצות הנבחרות?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "למחוק את המשתמש הנבחר?"
 
@@ -5111,7 +5147,7 @@ msgstr "נמחק: התבנית „%1$s“."
 msgid "Delimiter"
 msgstr "מפריד"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr "שיטות שנדחו"
 
@@ -5125,7 +5161,7 @@ msgstr "סירוב"
 msgid "Deny list"
 msgstr "רשימת דחייה"
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5133,7 +5169,7 @@ msgstr "רשימת דחייה"
 msgid "Dependencies"
 msgstr "תלויות"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "תלוי"
 
@@ -5141,7 +5177,7 @@ msgstr "תלוי"
 msgid "Dependent item"
 msgstr "פריט תלוי"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5169,7 +5205,7 @@ msgstr "מצב הטמעה"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5333,7 +5369,7 @@ msgstr "להשבית את תרחישי הרשת הנבחרים?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5346,14 +5382,14 @@ msgstr "להשבית את תרחישי הרשת הנבחרים?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5436,7 +5472,7 @@ msgid "Discovery by proxy"
 msgstr "התגלה על ידי המתווך"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "בדיקת גילוי"
 
@@ -5448,7 +5484,7 @@ msgstr "בדיקות גילוי"
 msgid "Discovery list"
 msgstr "רשימת גילוי"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "פריט גילוי"
 
@@ -5547,7 +5583,7 @@ msgstr "כלל הגילוי התעדכן"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5558,7 +5594,7 @@ msgstr "כללי גילוי"
 msgid "Discovery rules deleted"
 msgstr "כללי גלוי נמחקו"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "מצב הגילוי"
@@ -5598,7 +5634,7 @@ msgstr "הצגת תרשים מוערם"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "מוצגים %1$s מתוך %2$s שנמצאו"
@@ -5616,10 +5652,6 @@ msgstr "אפשרויות הצגה"
 msgid "Division denominator"
 msgstr "מכנה החילוק"
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "לא לחשב"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5634,7 +5666,7 @@ msgstr "לא לשמור היסטוריה"
 msgid "Do not keep trends"
 msgstr "לא לשמור מגמות"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "להחליף את הביטוי המותנה?"
 
@@ -5690,7 +5722,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "למטה"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr "הורדת תמונה"
 
@@ -5699,7 +5731,7 @@ msgid "Download the configuration file"
 msgstr "הורדת קובץ ההגדרות"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "זמן אי פעילות"
@@ -5775,7 +5807,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "userid משוכפל „%1$s” במשתמשים עבור המפה „%2$s”."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5797,7 +5829,7 @@ msgstr "פריט דינמי"
 msgid "Dynamic items"
 msgstr "פריטים דינמיים"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "לכל כתובת צריך להיות שם ייחודי. נא לוודא שאין כפילות שם לכתובת"
 
@@ -5805,13 +5837,14 @@ msgstr "לכל כתובת צריך להיות שם ייחודי. נא לוודא
 msgid "Each item"
 msgstr "כל פריט"
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5823,8 +5856,8 @@ msgstr "כל פריט"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "עריכה"
 
@@ -5840,11 +5873,11 @@ msgstr "עריכת מפה"
 msgid "Edit operation"
 msgstr "עריכת פעולה"
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "עריכת רכיב בעץ"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "עריכת הקפצה"
 
@@ -6119,7 +6152,7 @@ msgstr "הפעלת לכידה"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6141,12 +6174,12 @@ msgstr "הפעלת לכידה"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6205,7 +6238,7 @@ msgstr "כבר קיימת רשומה עם המזהה הייחודי „%1$s”."
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6229,7 +6262,7 @@ msgstr "שגיאה"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "שגיאה בבקשת החיפוש בטבלה „%1$s“."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "הודעת שגיאה"
 
@@ -6268,7 +6301,7 @@ msgstr "כללי יחסים בין אירועים"
 msgid "Event details"
 msgstr "פרטי האירוע"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "יצירת אירועים"
 
@@ -6298,7 +6331,7 @@ msgstr "שם אירוע"
 msgid "Event tag pair"
 msgstr "צמד תגיות של אירוע"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "סוג אירוע"
 
@@ -6332,7 +6365,7 @@ msgstr "למעט הנבחרים"
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "להדיר"
 
@@ -6343,7 +6376,7 @@ msgstr "להדיר"
 msgid "Exclude host groups"
 msgstr "הדרת קבוצות מארחים"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "הרצה"
 
@@ -6389,7 +6422,7 @@ msgstr "רץ"
 msgid "Executed script"
 msgstr "סקריפט שרץ"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "אימות הרצה"
 
@@ -6405,8 +6438,8 @@ msgid "Exists"
 msgstr "קיים"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "הרחבה"
 
@@ -6473,7 +6506,7 @@ msgstr "יצוא ל־CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6527,7 +6560,7 @@ msgstr "ביטויים"
 msgid "External check"
 msgstr "בדיקה חיצונית"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "ו׳"
@@ -6551,7 +6584,7 @@ msgid "Failed"
 msgstr "נכשל"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "יצירת לוח מחוונים נכשלה"
 
@@ -6560,24 +6593,24 @@ msgstr "יצירת לוח מחוונים נכשלה"
 msgid "Failed to parse URL."
 msgstr "פענוח הכתובת נכשל."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr "הדבקת עמוד לוח המחוונים נכשלה."
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr "הדבקת הווידג׳ט נכשלה."
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "עדכון לוח המחוונים נכשל"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr "עדכון מאפייני עמוד לוח המחוונים נכשל."
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr "עדכון מאפייני לוח המחוונים נכשל."
 
@@ -6585,7 +6618,7 @@ msgstr "עדכון מאפייני לוח המחוונים נכשל."
 msgid "Failed to update template."
 msgstr "עדכון התבנית נכשל."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr "עדכון מאפייני הווידג׳ט נכשל."
 
@@ -6609,7 +6642,7 @@ msgstr "מפות מועדפות"
 msgid "Feb"
 msgstr "פבר׳"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "פברואר"
 
@@ -6755,8 +6788,8 @@ msgstr "אזור מלא"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6834,6 +6867,10 @@ msgstr "התאמה למפה"
 msgid "Fixed"
 msgstr "קבוע"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6899,14 +6936,14 @@ msgstr "צרפתית (fr_FR)"
 msgid "Fri"
 msgstr "ו׳"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "יום שישי"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6924,7 +6961,7 @@ msgstr "כתובת מנשק משתמש"
 msgid "Frontend access"
 msgstr "גישה לפני המערכת"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "הודעות בפני המערכת"
 
@@ -7006,7 +7043,7 @@ msgid "Get value from host"
 msgstr "קבלת ערך ממארח"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "הביטוי שסופק אינו מאקרו"
 
@@ -7024,7 +7061,7 @@ msgstr "ערך גלובלי"
 msgid "Go back to %1$s"
 msgstr "חזרה אל %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "מעבר אל"
 
@@ -7073,7 +7110,7 @@ msgstr "קו מדורג"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7234,7 +7271,7 @@ msgstr "תרשים בשם „%1$s” כבר קיים בתרשימים או בא�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "תרשימים"
 
@@ -7434,11 +7471,11 @@ msgstr "עזרה"
 msgid "Hexadecimal to decimal"
 msgstr "הקסדצימלי לעשרוני"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "הסתרת ניפוי שגיאות"
 
@@ -7483,14 +7520,14 @@ msgstr "הדגשת שורה שלמה"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "היסטוריה"
 
@@ -7554,7 +7591,7 @@ msgstr "יישור אופקי"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7562,8 +7599,7 @@ msgstr "יישור אופקי"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7575,7 +7611,7 @@ msgstr "יישור אופקי"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7600,7 +7636,7 @@ msgstr "המארח „%1$s” לא יכול להישאר בלי קבוצת מא�
 #: include/classes/api/services/CProxy.php:500
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
-msgstr ""
+msgstr "המארח „%1$s” נמצא במעקב של המתווך „%2$s”."
 
 #: include/actions.inc.php:55
 msgid "Host IP"
@@ -7655,7 +7691,7 @@ msgstr[1] "מארחים מופעלים"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7663,7 +7699,7 @@ msgstr[1] "מארחים מופעלים"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "קבוצת מארחים"
@@ -7681,7 +7717,7 @@ msgstr "לא ניתן למחוק את קבוצת המארחים „%1$s”, כי
 #: include/classes/api/services/CHostGroup.php:795
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
-msgstr ""
+msgstr "קבוצת המארחים „%1$s” היא פנימית ואי אפשר למחוק אותה."
 
 #: include/views/js/monitoring.sysmaps.js.php:103
 msgid "Host group elements"
@@ -7694,7 +7730,7 @@ msgstr "סוג תווית קבוצת מארחים"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "קבוצת מארחים עם המזהה „%1$s” אינה זמינה."
@@ -7711,7 +7747,7 @@ msgstr "קבוצת מארחים עם המזהה „%1$s” אינה זמינה."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7750,7 +7786,7 @@ msgstr "מנשק מארח"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7898,7 +7934,7 @@ msgstr "מארח עם אותו שם התצוגה „%1$s” כבר קיים."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8130,14 +8166,66 @@ msgstr "מרחב שם זהה (%1$s) משמש את המודולים תחת %2$s."
 msgid "Identification of the system. Returns string"
 msgstr "זיהוי המערכת. מחזירה מחרוזת"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr "אם המסנן תואם"
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr "אם לא צוינו קבוצות משתמשים, יש לכלול לפחות משתמש אחד ברשימת הדיוור."
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "אם לדעתך הודעה זו שגויה, נא ליצור קשר עם מנהלי המערכת שלך לצורך קבלת ההרשאות הנדרשות."
@@ -8146,12 +8234,16 @@ msgstr "אם לדעתך הודעה זו שגויה, נא ליצור קשר עם
 msgid "Iframe sandboxing exceptions"
 msgstr "חריגות למידור מסגרות פנימיות (Iframes)"
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "תמונה"
 
@@ -8281,7 +8373,7 @@ msgstr "אבטיפוס פריט בלתי נגיש"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8294,11 +8386,11 @@ msgstr "מפה בלתי נגישה"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "תבנית בלתי נגישה"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "הקפצה בלתי נגישה"
 
@@ -8324,7 +8416,7 @@ msgstr "קבוצת משתמשים בלתי נגישה"
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "הכללה"
 
@@ -8342,6 +8434,11 @@ msgstr "לכלול תת־קבוצות"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "סטטיסטיקת תעבורה נכנסת על מנשק רשת. מחזירה מספר שלם וחיובי"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8408,7 +8505,7 @@ msgstr "אסימון הכספת שגוי."
 #: include/classes/api/services/CAction.php:3012
 #: include/classes/api/services/CAction.php:3030
 msgid "Incorrect action \"operationid\"."
-msgstr ""
+msgstr "המשימה „operationid” שגויה."
 
 #: include/classes/validators/CActionCondValidator.php:122
 msgid "Incorrect action condition discovery check."
@@ -8732,7 +8829,7 @@ msgstr "סוג תנאי מסנן שגוי לפעולה „%1$s”."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "נעשה שימוש בפונקציה הלא נכונה"
 
@@ -8789,7 +8886,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "סופק מפתח פריט שגוי „%1$s” לביטוי ההקפצה תחת „%2$s”."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "סוג ערך הפריט שגוי"
 
@@ -8820,7 +8917,7 @@ msgstr "מזהה סוג מדיה שגוי."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "שיטה שגויה „%1$s.%2$s”."
@@ -8946,7 +9043,7 @@ msgstr "סוג החישוב לכלל הגילוי „%1$s” שגוי."
 
 #: include/classes/api/services/CAction.php:3067
 msgid "Incorrect update action \"operationid\"."
-msgstr ""
+msgstr "פעולת העדכון „operationid” שגויה."
 
 #: include/classes/api/services/CMap.php:764
 #: include/classes/api/services/CMap.php:1232
@@ -8960,10 +9057,10 @@ msgstr "מזהה משתמש שגוי צוין עבור המפה „%1$s”."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "מזהה קבוצת משתמשים שגוי צוין עבור המפה „%1$s”."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr "שם המשתמש או הססמה או החשבון חסומים זמנית."
@@ -9270,9 +9367,9 @@ msgstr "ערך שגוי לשדה „%1$s”."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9344,6 +9441,10 @@ msgstr "נעשה שימוש בערך שגוי עבור השדה PSK. הוא אמ
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "נעשה שימוש בערך שגוי עבור מצב מתווך „%1$s”."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "אינדונזית (id_ID)"
@@ -9355,12 +9456,12 @@ msgstr "אינסוף"
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9384,7 +9485,7 @@ msgstr "מידע"
 #: include/classes/items/CHelpItems.php:337
 #: include/classes/items/CHelpItems.php:719
 msgid "Information about a file. Returns JSON"
-msgstr ""
+msgstr "מידע על קובץ. מחזירה JSON"
 
 #: include/classes/items/CHelpItems.php:201
 #: include/classes/items/CHelpItems.php:583
@@ -9433,7 +9534,7 @@ msgid "Insert"
 msgstr "הוספה"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "הוספת ביטוי"
 
@@ -9541,7 +9642,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9589,7 +9690,7 @@ msgstr "תאריך שגוי."
 msgid "Invalid email address \"%1$s\"."
 msgstr "כתובת דוא״ל שגויה „%1$s”."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "כתובת דוא״ל שגויה עבור סוג המדיה עם המזהה „%1$s”."
@@ -9692,8 +9793,8 @@ msgstr "הפרמטרים לשיטה שגויים."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9897,7 +9998,7 @@ msgstr "פרק הזמן שגוי."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "מאגר"
 
@@ -10087,7 +10188,7 @@ msgstr "אבות הטיפוס של הפריט עודכנו"
 msgid "Item tags"
 msgstr "תגיות פריט"
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr "סוג הפריט אינו משתמש במנשק"
 
@@ -10248,7 +10349,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "ינו׳"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "ינואר"
 
@@ -10270,7 +10371,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "יול׳"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "יולי"
 
@@ -10278,7 +10379,7 @@ msgstr "יולי"
 msgid "Jun"
 msgstr "יונ׳"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "יוני"
 
@@ -10312,7 +10413,7 @@ msgstr "מפתח"
 msgid "Key passphrase"
 msgstr "מילת צופן למפתח"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "מילת מפתח"
 
@@ -10382,7 +10483,7 @@ msgstr "מיקום התווית"
 msgid "Language"
 msgstr "שפה"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr "השפה „%1$s” אינה נתמכת."
@@ -10461,11 +10562,11 @@ msgstr "גישה אחרונה ב־"
 msgid "Last check"
 msgstr "הבדיקה האחרונה"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "תרשים של השעה האחרונה"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "תרשים של החודש שעבר"
 
@@ -10503,7 +10604,7 @@ msgstr "נשלח לאחרונה"
 msgid "Last value"
 msgstr "ערך אחרון"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "תרשים השבוע שעבר"
 
@@ -10516,11 +10617,11 @@ msgstr "תרשים השבוע שעבר"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "נתונים עדכניים"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "ערכים אחרונים"
 
@@ -10631,7 +10732,7 @@ msgid "Link new templates"
 msgstr "קישור תבניות חדשות"
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10709,12 +10810,12 @@ msgstr "רשימת מופעי פריטים של מוני ביצועים של Win
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr "רשימת מופעי פריטים של מוני ביצועים של Windows. מחזירה JSON"
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "הצגת שיתופי קבוצות משתמשים"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "הצגת שיתופי משתמשים"
@@ -10842,7 +10943,7 @@ msgstr "כלל גילוי ברמה נמוכה במצב „לא נתמך“"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "ב׳"
@@ -11002,7 +11103,7 @@ msgstr "ניהול שירותים"
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11031,7 +11132,7 @@ msgstr "נסגר ידנית"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "מפה"
 
@@ -11070,7 +11171,7 @@ msgstr "מיקום תווית רכיב במפה"
 msgid "Map element label type"
 msgstr "סוג תווית רכיב במפה"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr "המפה עודכנה! לחזור לרשימת המפות?"
 
@@ -11096,7 +11197,7 @@ msgstr "הבעלות על המפה לא יכולה להיות ריקה."
 msgid "Map shape"
 msgstr "צורת המפה"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "עדכון המפה נכשל."
 
@@ -11132,7 +11233,7 @@ msgstr "מפות"
 msgid "Mar"
 msgstr "מרץ"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "מרץ"
 
@@ -11159,7 +11260,7 @@ msgstr "מסכה"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11230,10 +11331,10 @@ msgstr "מספר הקבצים הפתוחים המרבי שנתמך על ידי �
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "מספר התהליכים המרבי שנתמך על ידי מערכת ההפעלה. מחזירה מספר שלם וחיובי"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
-msgstr "גרסת מסד הנתונים המרבית הנדרשת היא %1$s."
+msgid "Maximum required %1$s database version is %2$s."
+msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
 #: include/classes/mvc/CController.php:259
@@ -11245,12 +11346,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "תקופת הזמן המרבית להצגה היא יום %1$s."
 msgstr[1] "תקופת הזמן המרבית להצגה היא %1$s ימים."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "חרגת מהאורך הכללי המרבי המותר לכתובת דוא״ל עבור סוג המדיה עם המזהה „%1$s”."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "מאי"
 
@@ -11260,8 +11361,8 @@ msgid "May"
 msgstr "מאי"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "מדיה"
 
@@ -11322,7 +11423,7 @@ msgstr "בדיקת סוג מדיה מושבת הצליחה."
 msgid "Media type updated"
 msgstr "סוג המדיה עודכן"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "סוג המדיה עם המזהה „%1$s” אינו זמין."
@@ -11395,8 +11496,8 @@ msgstr "תבנית הודעה"
 msgid "Message templates"
 msgstr "תבניות הודעות"
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "תום זמן המתנה להודעה"
 
@@ -11414,7 +11515,7 @@ msgstr "הודעה/פקודה"
 msgid "Messages"
 msgstr "הודעות"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "התכתבות"
 
@@ -11442,6 +11543,11 @@ msgstr "מזערי"
 msgid "Minimum password length"
 msgstr "אורך ססמה מזערי"
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11457,11 +11563,6 @@ msgstr "גודל הקובץ המזערי להעלאה הנדרש ל־PHP הוא
 msgid "Minimum required PHP version is %1$s."
 msgstr "גרסת ה־PHP הנמוכה ביותר הנדרשת היא %1$s."
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr "גרסת מסד הנתונים המזערית הנדרשת היא %1$s."
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11607,7 +11708,7 @@ msgstr "המודולים עודכנו"
 msgid "Mon"
 msgstr "ב׳"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "יום שני"
 
@@ -11647,11 +11748,11 @@ msgstr "חודש"
 msgid "Monthly"
 msgstr "חודשי"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "נמצאו תוצאות נוספות…"
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11667,6 +11768,14 @@ msgstr "יותר מ־10 דקות"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "יותר מתרשים אחד עם השם „%1$s” במארח."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Firefox מבית Mozilla"
@@ -11676,11 +11785,11 @@ msgstr "Firefox מבית Mozilla"
 msgid "Multiple"
 msgstr "מרובים"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "מגוון אירועי תקלה"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "השתקה"
 
@@ -11688,6 +11797,18 @@ msgstr "השתקה"
 msgid "My"
 msgstr "שלי"
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11782,25 +11903,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11943,6 +12065,10 @@ msgstr "ניצולת תעבורת רשת (שילוב בין מהירות שלי�
 msgid "Never"
 msgstr "מעולם לא"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11954,7 +12080,7 @@ msgstr "תנאי חדש"
 msgid "New dashboard"
 msgstr "לוח מחוונים חדש"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "רכיב חדש"
 
@@ -11978,7 +12104,7 @@ msgstr "פעילות חדשה"
 msgid "New regular expression"
 msgstr "ביטוי רגולרי חדש"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr "שירות חדש"
 
@@ -11995,7 +12121,7 @@ msgid "New triggers"
 msgstr "הקפצות חדשות"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr "העמוד הבא"
 
@@ -12013,20 +12139,20 @@ msgstr "השלב הבא"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12159,7 +12285,7 @@ msgstr "אין פרטים"
 msgid "No discovery rule IDs given."
 msgstr "לא סופק מזהה של כלל גילוי."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr "לא נמצאו מודולים שהופעלו."
@@ -12198,7 +12324,7 @@ msgstr "לא סופקו מזהי מארחים."
 #: include/hosts.inc.php:515
 #, c-format
 msgid "No host groups with group ID \"%1$s\"."
-msgstr ""
+msgstr "אין קבוצת מארחים עם מזהה הקבוצה „%1$s”."
 
 #: app/controllers/CControllerWidgetUrlView.php:51
 msgid "No host selected."
@@ -12207,7 +12333,7 @@ msgstr "לא נבחר מארח."
 #: include/hosts.inc.php:558
 #, c-format
 msgid "No host with host ID \"%1$s\"."
-msgstr ""
+msgstr "אין מארח עם מזהה המארח „%1$s”."
 
 #: include/classes/api/services/CMapElement.php:176
 #, c-format
@@ -12221,7 +12347,7 @@ msgstr "אין תמונה"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "לא נמצא מנשק"
 
@@ -12246,7 +12372,7 @@ msgstr "לא צוין מצב מאגר לפעולת משימה."
 #: include/items.inc.php:742
 #, c-format
 msgid "No item with item ID \"%1$s\"."
-msgstr ""
+msgstr "אין פריט עם מזהה הפריט „%1$s”"
 
 #: chart3.php:145 chart7.php:56
 msgid "No items defined."
@@ -12261,7 +12387,7 @@ msgstr "לא נמצאו מאקרואים."
 msgid "No maps added."
 msgstr "לא נוספו מפות."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "לא נמצאו התאמות"
 
@@ -12274,8 +12400,8 @@ msgstr "לא התגלו מודולים חדשים"
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "לא צוין סוג משימה ליחס „%1$s”."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "אין הרשאות לגישה למערכת."
 
@@ -12287,7 +12413,6 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12295,11 +12420,12 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12417,19 +12543,19 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12438,15 +12564,15 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12473,7 +12599,7 @@ msgstr "לא צוין מפתח ציבורי."
 msgid "No recipients for action operation message."
 msgstr "אין נמענים להודעת משימת הפעולה."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "ללא רענון"
 
@@ -12489,10 +12615,10 @@ msgstr "לא נבחר יעד"
 msgid "No target selected."
 msgstr "לא נבחר יעד."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
-msgstr ""
+msgstr "אין הקפצה עם מזהה ההקפצה „%1$s”."
 
 #: chart4.php:42
 msgid "No triggers defined."
@@ -12536,7 +12662,7 @@ msgstr "ללא"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12568,15 +12694,15 @@ msgstr "לא כל התוצאות מוצגות. נא לספק תנאי חיפוש
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "לא כל התבנויות מקושרות אל „%1$s”."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "אין הרשאה להגדיר שפה למשתמש „guest” (אורח)."
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "אין הרשאה להגדיר את הססמה למשתמש „guest” (אורח)."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "אין הרשאה להגדיר ערכת עיצוב למשתמש „guest” (אורח)."
 
@@ -12608,8 +12734,8 @@ msgstr "פריטים שלא התקבלו בירושה"
 msgid "Not supported"
 msgstr "אין תמיכה"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "הערה"
 
@@ -12639,7 +12765,7 @@ msgstr "לשלוח התרעות לכל המעורבים"
 msgid "Nov"
 msgstr "נוב׳"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "נובמבר"
 
@@ -12655,7 +12781,7 @@ msgstr ""
 #: include/classes/items/CHelpItems.php:89
 #: include/classes/items/CHelpItems.php:451
 msgid "Number of currently open file descriptors. Returns integer"
-msgstr ""
+msgstr "מספר עם מתארי הקבצים (file descriptors) הפתוחים. מחזירה מספר שלם וחיובי"
 
 #: include/classes/items/CHelpItems.php:1209
 msgid "Number of enabled items on the host."
@@ -12802,12 +12928,12 @@ msgstr "מערכות ספרתיות"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "מספרי (שבר עשרוני)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "ספרתי (שלם וחיובי)"
 
@@ -12822,18 +12948,17 @@ msgstr "מספרי (ללא סימן)"
 msgid "OEM"
 msgstr "יצרן"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "תקין"
@@ -12860,7 +12985,7 @@ msgstr "נתב OOB"
 msgid "OOB subnet mask"
 msgstr "מסכת רשת OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "או"
 
@@ -12888,13 +13013,13 @@ msgstr "אוק׳"
 msgid "Octal to decimal"
 msgstr "אוקטלי לעשרוני"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "אוקטובר"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "כבוי"
 
@@ -12906,7 +13031,7 @@ msgstr "כבוי"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "בסדר"
@@ -12925,7 +13050,7 @@ msgstr "שם התגית הקודם"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "פעיל"
 
@@ -12933,7 +13058,7 @@ msgstr "פעיל"
 msgid "On status change triggers blink for"
 msgstr "עם החלפת מצב ההקפצות מהבהבות למשך"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "פעם אחת"
 
@@ -12950,7 +13075,7 @@ msgid "One time only"
 msgstr "פעם אחת בלבד"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "חוסר פעילות חד־פעמית"
 
@@ -12962,26 +13087,14 @@ msgstr "רק משתמשי על יכולים ליצור קבוצות מארחים
 msgid "Only Super Admins can create media types."
 msgstr "רק משתמשי על יכולים ליצור סוגי מדיה."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "רק משתמשי על יכולים ליצור קבוצות משתמשים."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "רק משתמשי על יכולים למחוק סוגי מדיה."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "רק משתמשי על יכולים למחוק קבוצות משתמשים."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "רק משתמשי על יכולים לערוך סוגי מדיה."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "רק משתמשי על יכולים לעדכן קבוצות משתמשים."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "רק בדיקות של סוכן Zabbix,‏ SNMPv1,‏ SNMPv2 ו־SNMPv3 יכולות להיות ייחודיות."
@@ -13022,11 +13135,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "רק תקלה נבחרת"
 msgstr[1] "רק תקלות נבחרות"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr "רק שירותים בלי ילדים"
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr "רק שירותים ללא תגיות של תקלות"
 
@@ -13059,7 +13172,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "פרטים על מערכת ההפעלה. מחזירה מחרוזת"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr "פעילות"
 
@@ -13084,7 +13197,7 @@ msgstr "לפעולה אין קבוצה לביצוע."
 msgid "Operation has no template to operate."
 msgstr "לפעולה אין תבנית לפעילות."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13109,27 +13222,27 @@ msgstr "פעולות"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "מפעיל"
 
@@ -13154,7 +13267,7 @@ msgstr "אפשרויות"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13171,8 +13284,8 @@ msgstr "או"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13219,9 +13332,9 @@ msgstr "או"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "מקורי"
 
@@ -13473,7 +13586,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "תקלה"
@@ -13520,7 +13633,7 @@ msgstr "זהות PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "ה־PSK קצר מדי. הכמות המזערית ביותר היא %1$s ספרות הקסדצימליות."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr "עמוד %1$d"
@@ -13543,13 +13656,15 @@ msgstr "נווט"
 msgid "Parameter"
 msgstr "פרמטר"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13580,9 +13695,7 @@ msgstr "פריטי הורה"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr "שירותי הורה"
 
@@ -13671,15 +13784,19 @@ msgstr "מדיניות הססמה"
 msgid "Password requirements:"
 msgstr "דרישות ססמה:"
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "הדבקה"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr "הדבקת וידג׳ט"
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "הדבקה ללא קישורים חיצוניים"
 
@@ -13753,19 +13870,20 @@ msgid "Periods"
 msgstr "תקופות"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "ניתן להקצות הרשאות לקבוצות משתמשים בלבד."
 
@@ -13787,12 +13905,12 @@ msgstr "אלגוריתם הצבה"
 msgid "Plain text"
 msgstr "טקסט פשוט"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "ניגון"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "ניגון צליל"
 
@@ -13822,7 +13940,7 @@ msgstr "נא להפעיל את ההנחיה „allow_url_fopen” (לאפשר פ
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "נא להזין את שם המארח או את כתובת ה־IP ומספר הפתחה של שרת ה־Zabbix כמו גם את שם ההתקנה (רשות)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "נא לבחור בשני רכיבים"
 
@@ -13951,7 +14069,7 @@ msgid "Previous month"
 msgstr "החודש הקודם"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr "העמוד הקודם"
 
@@ -14009,7 +14127,7 @@ msgstr "מילת צופן לפרטיות"
 msgid "Privacy protocol"
 msgstr "פרוטוקול פרטיות"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "פרטי"
@@ -14029,12 +14147,12 @@ msgid "Privilege level"
 msgstr "רמת ההרשאות"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14064,7 +14182,7 @@ msgstr "נוצרה תקלה"
 msgid "Problem display"
 msgstr "תצוגת תקלה"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "ביטוי התקלה"
@@ -14082,7 +14200,7 @@ msgstr "התקלה אינה מוסתרת"
 msgid "Problem is suppressed"
 msgstr "התקלה מוסתרת"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "תקלה עם"
 
@@ -14095,8 +14213,8 @@ msgstr "שיקום תקלה"
 msgid "Problem resolved"
 msgstr "התקלה נפתרה"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr "תגיות תקלה"
 
@@ -14109,14 +14227,6 @@ msgstr "מועד תקלה"
 msgid "Problem update"
 msgstr "עדכון תקלה"
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "תקלה, אם לכל הצאצאים יש תקלות"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "תקלה, אם לפחות לאחד מהצאצאים יש תקלה"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14133,7 +14243,7 @@ msgstr "תקלה, אם לפחות לאחד מהצאצאים יש תקלה"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "תקלות"
 
@@ -14167,12 +14277,12 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus ל־JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "תכונות"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14194,7 +14304,7 @@ msgstr "מתווכים"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14257,7 +14367,7 @@ msgstr "שם מתווך"
 msgid "Proxy updated"
 msgstr "מתווך עודכן"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "ציבורי"
@@ -14351,8 +14461,8 @@ msgstr "קריאה"
 msgid "Read only"
 msgstr "קריאה בלבד"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14360,8 +14470,8 @@ msgstr "קריאה-בלבד"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14414,7 +14524,7 @@ msgstr "נמענים"
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14422,7 +14532,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "שחזור"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14457,7 +14567,7 @@ msgstr "מרובע"
 msgid "Refresh"
 msgstr "רענון"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "תדירות רענון"
 
@@ -14518,7 +14628,7 @@ msgstr "ביטויים רגולריים"
 msgid "Related reports"
 msgstr "דוחות קשורים"
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr "יש לשחרר כדי ליצור וידג׳ט."
 
@@ -14550,6 +14660,7 @@ msgstr "פקודה מרוחקת"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14559,7 +14670,7 @@ msgstr "פקודה מרוחקת"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14567,13 +14678,13 @@ msgstr "פקודה מרוחקת"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14583,8 +14694,8 @@ msgstr "פקודה מרוחקת"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14661,8 +14772,8 @@ msgstr "פקודה מרוחקת"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "הסרה"
 
@@ -14702,7 +14813,7 @@ msgstr "הסרה, %1$s"
 msgid "Removed"
 msgstr "הוסר"
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14731,7 +14842,7 @@ msgstr "חוזרת"
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14739,7 +14850,7 @@ msgstr "חוזרת"
 msgid "Replace"
 msgstr "החלפה"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "החלפת תלויות"
 
@@ -14846,7 +14957,7 @@ msgstr "קודים נדרשים למצב"
 msgid "Required string"
 msgstr "מחרוזת נדרשת"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "איפוס"
@@ -14880,7 +14991,7 @@ msgstr "אישור איפוס"
 msgid "Reset defaults"
 msgstr "איפוס לבררות המחדל"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "נפתר"
 
@@ -15009,7 +15120,7 @@ msgstr "מחזירה ערך של מאפיין של רכיב MBean."
 #: include/classes/items/CHelpItems.php:349
 #: include/classes/items/CHelpItems.php:731
 msgid "Returns 4-digit string containing octal number with Unix permissions"
-msgstr ""
+msgstr "מחזירה מחרוזת באורך 4 ספרות שמכילה מספר אוקטלי (בסיס 8) עם הרשאות יוניקס"
 
 #: include/classes/items/CHelpItems.php:809
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
@@ -15078,8 +15189,8 @@ msgstr "Y ימין"
 msgid "Right trim"
 msgstr "צמצום מימין"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr "תפקיד"
 
@@ -15137,12 +15248,12 @@ msgstr "הרצת פקודה מסוימת על המארח. מחזירה את פל
 msgid "Russian (ru_RU)"
 msgstr "רוסית (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "ש׳"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "א׳"
@@ -15153,10 +15264,8 @@ msgstr "הגדרות SAML"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15369,7 +15478,7 @@ msgstr "ללא עיטורים"
 msgid "Sat"
 msgstr "ש׳"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "שבת"
 
@@ -15542,7 +15651,7 @@ msgstr "הסקריפט עודכן"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "סקריפטים"
 
@@ -15612,8 +15721,8 @@ msgid "Security name"
 msgstr "שם אבטחה"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15621,7 +15730,7 @@ msgstr "שם אבטחה"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "בחירה"
 
@@ -15657,19 +15766,19 @@ msgstr "רכיבים שנבחרו"
 msgid "Selected items only"
 msgstr "פריטים נבחרים בלבד"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "נבחר, %1$s במיקום %2$d מתוך %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "נבחר, %1$s, לקריאה בלבד, במיקום %2$d מתוך %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "שליחה לרקע"
 
@@ -15694,7 +15803,7 @@ msgstr "שליחה רק אל"
 msgid "Send to"
 msgstr "שליחה אל"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "הרחקה לרקע"
 
@@ -15727,7 +15836,7 @@ msgstr "מופרד"
 msgid "Separately"
 msgstr "בנפרד"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "ספטמבר"
 
@@ -15759,42 +15868,37 @@ msgid "Server time"
 msgstr "זמן השרת"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "שירות"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr "לשירות „%1$s” לא יכולות להיות תגיות תקלה וצאצאים בו־זמנית."
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr "לשירות „%1$s” לא יכולות להיות תגיות תקלה עם אלגוריתם חישוב המצב הנבחר."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
+msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
-msgstr "השירות „%1$s” לא יכול להציג SLA לאלגוריתם חישוב המצב הנבחר."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgstr "לשירות „%1$s” לא יכולות להיות תגיות תקלה וצאצאים בו־זמנית."
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
-msgstr "לשירות „%1$s” לא יכולות להיות למעלה מ־4 ספרות אחרי הנקודה העשרונית."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
+msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
 #: include/views/configuration.action.list.php:28
 msgid "Service actions"
 msgstr "פעולות שירות"
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "שירות נוצר"
 
@@ -15822,7 +15926,7 @@ msgid "Service recovery"
 msgstr "שחזור שירות"
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "מועד ההתחלה של השירות חייב להיות לפני מועד הסיום."
 
@@ -15838,11 +15942,11 @@ msgstr "ערך תגית שירות"
 msgid "Service time"
 msgstr "זמן שירות"
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "זמני שירות"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "סוג השירות"
 
@@ -15851,7 +15955,7 @@ msgstr "סוג השירות"
 msgid "Service update"
 msgstr "עדכון שירות"
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "השירות עודכן"
 
@@ -15860,16 +15964,16 @@ msgstr "השירות עודכן"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "שירותים"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "שירותים מתלות מעגלית."
 
@@ -15881,9 +15985,9 @@ msgstr "שירותים עודכנו"
 msgid "Session initialization error."
 msgstr "שגיאת אתחול הפעלה."
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "ההפעלה נפסקה, נא להיכנס שוב, בבקשה."
 
@@ -15907,10 +16011,18 @@ msgstr "הגדרת תאריך ושעת תפוגה"
 msgid "Set host inventory mode"
 msgstr "הגדרת מצב מלאי למארח"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr "הגדרת ערך חדש"
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15951,7 +16063,7 @@ msgstr "הגדרות"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15997,7 +16109,7 @@ msgstr "שיתוף"
 msgid "Shared"
 msgstr "משותף"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "שיתוף"
 
@@ -16088,7 +16200,7 @@ msgstr "הצגת סרגל צד"
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16139,7 +16251,7 @@ msgstr "הצגת אזהרה אם שרת ה־Zabbix אינו פעיל"
 msgid "Show working time"
 msgstr "הצגת זמן עבודה"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "מוצג"
 
@@ -16248,7 +16360,7 @@ msgstr "התבצע דילוג על ההעתקה של התרשים „%1$s” ל�
 msgid "Slovak (sk_SK)"
 msgstr "סלובקית (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "נודניק"
 
@@ -16294,7 +16406,7 @@ msgstr "ייתכן שחלק מההיסטוריה לפריט הזה דחוסה, �
 msgid "Sort entries by"
 msgstr "מיון רשומות לפי"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "אופן המיון (0->999)"
 
@@ -16368,7 +16480,7 @@ msgstr "התחלה בעוד"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr "להתחיל מצגת"
 
@@ -16416,12 +16528,14 @@ msgstr "סטטיסטיקה וזמינות זיכרון מטמון הכתיבה �
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16432,17 +16546,24 @@ msgstr "סטטיסטיקה וזמינות זיכרון מטמון הכתיבה �
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16466,13 +16587,10 @@ msgstr "סטטיסטיקה וזמינות זיכרון מטמון הכתיבה �
 msgid "Status"
 msgstr "מצב"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "חישוב מצב"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "אלגוריתם לחישוב מצב"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16503,6 +16621,10 @@ msgstr "מצב בלבד"
 msgid "Status problem"
 msgstr "מצב תקלה"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16534,8 +16656,8 @@ msgstr "מהלך עם השם „%1$s” כבר קיים."
 msgid "Steps"
 msgstr "שלבים"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "עצירה"
 
@@ -16547,7 +16669,7 @@ msgstr "להפסיק עיבוד"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr "לעצור מצגת"
 
@@ -16579,7 +16701,7 @@ msgid "Strict"
 msgstr "קפדני"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr "מחרוזת"
 
@@ -16612,7 +16734,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "נושא"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "תת־מפה"
 
@@ -16628,7 +16750,7 @@ msgstr "מינויים"
 msgid "Success Audit"
 msgstr "הצלחה בפיקוח"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "הודעת הצלחה"
 
@@ -16641,7 +16763,7 @@ msgstr "סכום של תעבורת נתונים נכנסת ויוצאת על מ�
 msgid "Sun"
 msgstr "א׳"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "יום ראשון"
 
@@ -16733,12 +16855,12 @@ msgstr "שעת המערכת. מחזירה מספר שלם וחיובי עם סו
 msgid "System uptime in seconds. Returns integer"
 msgstr "זמן הפעילות של המערכת בשניות. מחזירה מספר שלם וחיובי"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "ה"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "ג׳"
@@ -16774,8 +16896,8 @@ msgstr "לטבלה „%1$s“ אין שדה בשם „%2$s“."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "תגית"
@@ -16815,14 +16937,13 @@ msgstr "ערך תגית"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16830,10 +16951,10 @@ msgstr "ערך תגית"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16997,7 +17118,7 @@ msgstr "כבר קיימת תבנית עם אותו שם התצוגה „%1$s”.
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17282,12 +17403,12 @@ msgstr "האטה"
 msgid "Thu"
 msgstr "ה"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "עד"
 
@@ -17297,13 +17418,13 @@ msgstr "עד"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17384,7 +17505,7 @@ msgstr "חותמת זמן"
 msgid "To"
 msgstr "עד"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "כדי להגדיר מנשק מארח יש לבחור בסוג פריט אחד לכל הפריטים"
 
@@ -17506,13 +17627,13 @@ msgstr "מגמות"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "הקפצה"
 
@@ -17531,7 +17652,7 @@ msgstr "ההקפצה „%1$s” שייכת לתבניות עם קישוריות
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "ההקפצה „%1$s” תלויה בהקפצה „%2$s”, שאינה קיימת."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr "כתובת הקפצה"
 
@@ -17615,7 +17736,7 @@ msgstr "סקירת הקפצה"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17682,15 +17803,15 @@ msgstr "אבות טיפוס של הקפצות נמחקו"
 msgid "Trigger prototypes updated"
 msgstr "אבות טיפוס של הקפצות עודכנו"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "חומרת הקפצה"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "מצב ההקפצה הוא „תקין“"
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "מצב ההקפצה הוא „תקלה”"
 
@@ -17742,7 +17863,7 @@ msgstr "צמצום"
 msgid "Tue"
 msgstr "ג׳"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "יום שלישי"
 
@@ -17755,7 +17876,7 @@ msgstr "טורקית (tr_TR)"
 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”, מצב כזה עשוי להוביל להתנגשות."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "יש לבחור בשני רכיבים במפה"
 
@@ -17770,15 +17891,16 @@ msgstr "יש לבחור בשני רכיבים במפה"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17845,7 +17967,7 @@ msgid "UNKNOWN"
 msgstr "לא ידוע"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17855,7 +17977,7 @@ msgstr "לא ידוע"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "כתובת"
 
@@ -17901,7 +18023,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "לכתובת אמורים להיות שני השדות: „name” ו־„url” (שם וכתובת) עבור המפה „%1$s”."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "כתובות"
 
@@ -17949,7 +18071,7 @@ msgstr "לא ניתן לטעון את משתני API ההגדרות."
 msgid "Unable to overwrite the existing configuration file."
 msgstr "לא ניתן לשכתב על קובץ התצורה הקיים."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr "לא ניתן לקבל את גרסת מסד הנתונים."
 
@@ -17996,7 +18118,8 @@ msgstr "לשחרר את המשתמשים הנבחרים?"
 msgid "Unexpected response for action %1$s."
 msgstr "תגובה לא צפויה לפעולה %1$s."
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr "שגיאת שרת לא צפויה."
@@ -18015,7 +18138,8 @@ msgstr "יחידות"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18026,9 +18150,9 @@ msgstr "יחידות"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "לא ידוע"
@@ -18047,12 +18171,12 @@ msgstr "שגיאה לא ידועה"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "פריט מארח לא ידוע, אין כזה פריט במארח הנבחר"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "מארח לא ידוע, לא קיים כזה מארח במערכת"
 
@@ -18099,7 +18223,7 @@ msgstr "הפרדה מתבנית"
 msgid "Unlink from templates"
 msgstr "הפרדה מתבניות"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "ביטול השתקה"
 
@@ -18180,27 +18304,28 @@ msgstr "פעיל"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18269,7 +18394,7 @@ msgid "Upper level maps"
 msgstr "מפות ברמות עליונות"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "זמן פעילות"
@@ -18318,37 +18443,37 @@ msgstr "בשימוש בפעולות"
 msgid "User"
 msgstr "משתמש"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "המשתמש „%1$s” לא יכול להיות ללא קבוצת משתמשים."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "המשתמש „%1$s” הוא הבעלים של לוח המחוונים „%2$s”."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "המשתמש „%1$s” הוא הבעלים של המפה „%2$s”."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr "הבעלות על הדוח „%2$s” היא של „%1$s”."
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr "הדוח „%2$s” מיועד להישלח אל „%1$s”."
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "נעשה שימוש במשתמש „%1$s” בפעולה „%2$s”."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr "הדוח „%2$s” נוצר בשם המשתמש „%1$s”."
@@ -18365,13 +18490,13 @@ msgstr "משתמש נוסף"
 msgid "User agent string"
 msgstr "מחרוזת סוכן משתמש"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "המשתמש לא יכול להוסיף את עצמו לקבוצת משתמשים מושבתת או לקבוצה שהגישה שלה למנשק המשתמש הושבתה."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr "המשתמש לא יכול לשנות את התפקיד של עצמו."
 
@@ -18396,32 +18521,32 @@ msgstr[1] "משתמשים נמחקו"
 msgid "User group"
 msgstr "קבוצת משתמשים"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "קבוצת המשתמשים „%1$s” כבר קיימת."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr "קבוצת המשתמשים „%1$s” היא הנמענת של הדוח „%2$s”."
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "כבר נעשה שימוש בקבוצת המשתמשים „%1$s” בפעולה „%2$s”."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "נעשה שימוש בקבוצת המשתמשים „%1$s” בהגדרות לקבלת הודעות על מסד נתונים מושבת."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "נעשה שימוש בקבוצת המשתמשים „%1$s” בקבוצה „%2$s”."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr "נוספה קבוצת משתמשים"
 
@@ -18452,7 +18577,7 @@ msgstr[1] "קבוצות משתמשים עודכנו"
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "קבוצת משתמשים עם המזהה „%1$s” אינה זמינה."
@@ -18460,14 +18585,14 @@ msgstr "קבוצת משתמשים עם המזהה „%1$s” אינה זמינה
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "קבוצות משתמשים"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "למשתמש אין הרשאה למחוק את עצמו."
 
@@ -18516,7 +18641,7 @@ msgstr[1] "תפקידי משתמשים נמחקו"
 msgid "User role updated"
 msgstr "תפקיד המשתמש עודכן"
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr "תפקיד משתמש עם המזהה „%1$s” אינו זמין."
@@ -18550,7 +18675,7 @@ msgstr "הגדרות משתמש"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "לשיתוף משתמשים חסרים משתנים: %1$s עבור המפה „%2$s”."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18571,12 +18696,12 @@ msgstr "משתמש עודכן"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "המשתמש עם המזהה „%1$s” לא זמין."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr "כבר קיים משתמש עם השם „%1$s”."
@@ -18621,7 +18746,7 @@ msgstr "מאפיין שם משתמש"
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18888,23 +19013,23 @@ msgstr "אימות"
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19111,8 +19236,8 @@ msgstr "יישור אנכי"
 msgid "Vietnamese (vi_VN)"
 msgstr "וייטנאמית (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr "תצוגה"
@@ -19139,7 +19264,12 @@ msgstr "שם תצוגה"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "שם התצוגה לא יכול להיות ריק אם אין שם מארח."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "ד׳"
@@ -19156,11 +19286,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "אזהרה"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr "הודעת אזהרה"
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "אנו מתנצלים, כמות הרכיבים המרבית האפשרית נוצלה."
 
@@ -19176,7 +19306,7 @@ msgstr "אנו מתנצלים, כמות הרכיבים המרבית האפשרי
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "אינטרנט"
 
@@ -19245,7 +19375,7 @@ msgstr "להתלייה אין משתנים."
 msgid "Wed"
 msgstr "ד׳"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "יום רביעי"
 
@@ -19256,6 +19386,10 @@ msgstr "יום רביעי"
 msgid "Weekly"
 msgstr "שבועי"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "ברוך בואך"
@@ -19273,7 +19407,7 @@ msgstr "בעת פעילות"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr "הווידג׳ט בנקודה X:%3$d,‏ Y:%4$d בעמוד מס׳ %2$d של לוח המחוונים „%1$s” חורג מגבולות העמוד. "
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "הווידג׳ט קטן לעומת גודל העמודות והשורות שצוין."
 
@@ -19486,8 +19620,8 @@ msgid "YYYY-MM-DD"
 msgstr "YYYY-MM-DD"
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19529,19 +19663,19 @@ msgstr "שנתי"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19609,19 +19743,15 @@ msgstr "לא ציינת יעדים לסקריפט גלובלי לפעילויו�
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "אין לך הרשאה לבצע פעולה זו."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "אין לך הרשאה ליצור משתמשים."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "אין לך הרשאה לגשת לעמוד זה."
@@ -19745,7 +19875,7 @@ msgstr "אמור להיות שם DNS"
 msgid "a boolean is expected"
 msgstr "אמור להיות בוליאני"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19864,7 +19994,6 @@ msgstr "סוכן"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20160,9 +20289,9 @@ msgstr "לא ניתן לשנות"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20242,7 +20371,7 @@ msgstr "אין ליצור תלות מעגלית"
 msgid "circular item dependency is not allowed"
 msgstr "תלות מעגלית לפריט אסורה"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr "צבע"
 
@@ -20289,7 +20418,7 @@ msgstr "count()‎ - מספר ערכי ה־ V שהתקבלו בהצלחה (ומ�
 msgid "countunique() - The number of unique values"
 msgstr "countunique()‎ - מספר הערכים היחודיים"
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20488,13 +20617,13 @@ msgstr "הגדרות תחזוקה כלליות"
 msgid "graph pattern"
 msgstr "תבנית תרשים"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20542,7 +20671,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr "in()‎ - בודקת אם ערך שווה לאחד מהערכים המוגדרים (1 - שווה, 0 - אחרת)"
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "כולל תת־קבוצות"
 
@@ -20768,12 +20897,12 @@ msgstr "כלל גילוי ברמה נמוכה"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr "ltrim()‎ - מסירה תווים מסוימים מהתחלה של מחרוזת"
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20877,8 +21006,8 @@ msgstr "min()‎ - ערך מזערי במשך T"
 msgid "minimum length is %1$s characters"
 msgstr "האורך המזערי הוא %1$s תווים"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "ממ"
 
@@ -20973,7 +21102,7 @@ msgstr "לא יכולה להכיל את השם הפרטי של המשתמש, א�
 msgid "name"
 msgstr "שם"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "חדש"
 
@@ -21040,7 +21169,7 @@ msgstr "now()‎ - מספר השניות מאז ראשית ספירת Epoch"
 msgid "number"
 msgstr "מספר"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "מתוך"
@@ -21108,7 +21237,7 @@ msgstr "פלט"
 msgid "path/to/secret"
 msgstr "נתיב/אל/סוד"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr "נתיב/אל/סוד:מפתח"
 
@@ -21235,7 +21364,7 @@ msgstr "נבחר"
 msgid "service"
 msgstr "שירות"
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "תיאור קצר"
 
@@ -21320,7 +21449,7 @@ msgstr "sum()‎ - סכום הערכים במשך T"
 msgid "sumofsquares() - The sum of squares"
 msgstr "sumofsquares()‎ - סכום ריבועים"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "פרטי הגישה שסופקו אינם יחודיים"
 
@@ -21330,8 +21459,8 @@ msgstr "פרטי הגישה שסופקו אינם יחודיים"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21412,7 +21541,7 @@ msgstr "אמור להיות משתנה שלישי"
 msgid "time filter default period exceeds the max period"
 msgstr "משך הזמן כבררת המחדל של מסנן הזמן חורג ממשך הזמן המרבי"
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "הפרש זמן"
 
@@ -21475,7 +21604,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr "truncate()‎ - קוצץ ערך למקומות עשרוניים"
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "יש להקליד כאן כדי לחפש"
 
@@ -21502,7 +21631,7 @@ msgstr "קבוע לא צפוי „%1$s”"
 msgid "unexpected constant value \"%1$s\""
 msgstr "ערך הקבוע אינו צפוי „%1$s”"
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr "מאקרו סוף ביטוי בלתי צפוי"
 
@@ -21596,7 +21725,7 @@ msgstr "מספר הגרסה אינו נתמך"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21616,7 +21745,7 @@ msgstr "מספר הגרסה אינו נתמך"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "ערך"
 
@@ -21763,7 +21892,7 @@ msgstr "סוג כללי הגילוי שגוי"
 msgid "wrong item type"
 msgstr "סוג פריט שגוי"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/hu/LC_MESSAGES/frontend.po b/ui/locale/hu/LC_MESSAGES/frontend.po
index 6f772b14733..94e2c138671 100644
--- a/ui/locale/hu/LC_MESSAGES/frontend.po
+++ b/ui/locale/hu/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-01-09 22:10+0300\n"
 "Last-Translator: Robert <szenasy.robert@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr "(nincs proxy)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 vagy 1"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "ÉS"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Hozzáférés megtagadva!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Nyugtázom"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Visszaigazolás"
 
@@ -499,7 +499,7 @@ msgstr "Visszaigazolás"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Nyugtázva"
@@ -528,20 +528,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -646,7 +648,7 @@ msgstr "Eljárás frissítve"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -655,7 +657,7 @@ msgstr "Eljárás frissítve"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Eljárások"
@@ -714,8 +716,8 @@ msgstr "Aktív eddig"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -726,7 +728,6 @@ msgstr "Aktív eddig"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -734,11 +735,13 @@ msgstr "Aktív eddig"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -750,15 +753,17 @@ msgstr "Aktív eddig"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -825,7 +830,7 @@ msgstr "Aktív eddig"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Hozzáadás"
 
@@ -833,19 +838,19 @@ msgstr "Hozzáadás"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -862,7 +867,7 @@ msgstr "Új hoszt"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -879,7 +884,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -887,7 +896,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -921,7 +930,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -930,12 +939,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Rendszergazda"
@@ -945,6 +962,10 @@ msgstr "Rendszergazda"
 msgid "Administration"
 msgstr "Adminisztráció"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr ""
@@ -1031,7 +1052,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Mind"
 
@@ -1040,8 +1061,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1049,7 +1070,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1083,7 +1104,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1096,7 +1117,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Engedélyezett hosztok"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1114,7 +1135,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1155,12 +1176,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1180,15 +1201,15 @@ msgstr "Alkalmazás hiba."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Alkalmaz"
 
@@ -1206,7 +1227,7 @@ msgstr ""
 msgid "Apr"
 msgstr "Ápr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Április"
 
@@ -1234,6 +1255,10 @@ msgstr "Terület típusa"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Szövegként"
@@ -1282,8 +1307,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1361,7 +1386,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Augusztus"
 
@@ -1391,7 +1416,7 @@ msgstr "Authentikáció"
 msgid "Authentication algorithm"
 msgstr "Autentikációs algoritmus"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1440,7 +1465,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Automatikus belépés"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1450,7 +1475,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1635,11 +1660,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Alúl"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1720,7 +1745,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Kalkulált"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1740,8 +1765,8 @@ msgstr "Visszahívás"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1758,8 +1783,8 @@ msgstr "Visszahívás"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -1789,7 +1814,7 @@ msgstr "Az eljárást nem lehet felvenni"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1800,7 +1825,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
@@ -1919,7 +1944,7 @@ msgid "Cannot add user"
 msgstr "Felhasználó létrehozása sikertelen"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1927,11 +1952,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2012,7 +2037,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
@@ -2067,7 +2092,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
@@ -2485,7 +2510,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2655,7 +2680,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2717,7 +2742,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2776,7 +2801,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3198,6 +3228,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3339,7 +3370,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3381,11 +3412,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3415,7 +3446,7 @@ msgstr "Óra"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Klón"
 
@@ -3426,8 +3457,8 @@ msgstr "Klón"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Bezár"
 
@@ -3457,8 +3488,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3475,7 +3506,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3543,6 +3574,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Feltétel"
 
@@ -3597,7 +3629,7 @@ msgstr "Feltételek"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Konfiguráció"
 
@@ -3860,7 +3892,7 @@ msgstr "Kapcsolat"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3897,8 +3929,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3959,8 +3991,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Másolás"
 
@@ -4090,11 +4122,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4211,7 +4243,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4227,7 +4259,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Script létrehozása"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4235,7 +4267,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr ""
 
@@ -4455,7 +4487,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4485,7 +4517,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4655,7 +4687,7 @@ msgstr "Hét napja"
 msgid "Days"
 msgstr "Napok"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Hibakeresés"
 
@@ -4669,7 +4701,7 @@ msgstr "Hibakereső mód"
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "December"
 
@@ -4678,13 +4710,17 @@ msgstr "December"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -4754,8 +4790,8 @@ msgid "Delayed by"
 msgstr "Késleltetve"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4769,7 +4805,7 @@ msgstr "Késleltetve"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4801,8 +4837,8 @@ msgstr "Késleltetve"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Törlés"
 
@@ -4831,7 +4867,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4875,7 +4911,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4931,7 +4967,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Törli a kijelölt felderítési szabályokat?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5032,11 +5068,11 @@ msgstr "Törli a kiválasztott szkripteket?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5052,7 +5088,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Törli a kijelölt triggereket?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Törli a kiválasztott felhasználót?"
 
@@ -5103,7 +5139,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Elválasztó"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5117,7 +5153,7 @@ msgstr "Hozzáférés megtagadva"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5125,7 +5161,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Függő"
 
@@ -5133,7 +5169,7 @@ msgstr "Függő"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5161,7 +5197,7 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5325,7 +5361,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5338,14 +5374,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5428,7 +5464,7 @@ msgid "Discovery by proxy"
 msgstr "Felderítés proxy-n keresztül"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Felderítés"
 
@@ -5440,7 +5476,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5540,7 +5576,7 @@ msgstr "Felderítési szabály frissítve"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5551,7 +5587,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr "Felderítési szabályok törölve"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Felderítés állapota"
@@ -5591,7 +5627,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5609,10 +5645,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Ne számoljon"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5627,7 +5659,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5683,7 +5715,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5692,7 +5724,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Kiesés"
@@ -5768,7 +5800,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5790,7 +5822,7 @@ msgstr "Dinamikus elem"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5798,13 +5830,14 @@ msgstr ""
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5816,8 +5849,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -5833,11 +5866,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr ""
 
@@ -6112,7 +6145,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6134,12 +6167,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6198,7 +6231,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6222,7 +6255,7 @@ msgstr "Hiba"
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6262,7 +6295,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Esemény részletei"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Esemény generálás"
 
@@ -6292,7 +6325,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6326,7 +6359,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Kivéve"
 
@@ -6337,7 +6370,7 @@ msgstr "Kivéve"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr ""
 
@@ -6383,7 +6416,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Végrehajtott szkript"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6399,8 +6432,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6467,7 +6500,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6521,7 +6554,7 @@ msgstr "Kifejezések"
 msgid "External check"
 msgstr "Külső ellenőrzés"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6545,7 +6578,7 @@ msgid "Failed"
 msgstr "Hiba"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6554,24 +6587,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6579,7 +6612,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6603,7 +6636,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Február"
 
@@ -6749,8 +6782,8 @@ msgstr "Kitöltés"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6828,6 +6861,10 @@ msgstr ""
 msgid "Fixed"
 msgstr "Fix"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6893,14 +6930,14 @@ msgstr "Francia (fr_FR)"
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Péntek"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6918,7 +6955,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7000,7 +7037,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -7018,7 +7055,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr ""
 
@@ -7067,7 +7104,7 @@ msgstr "Meredek vonal"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7228,7 +7265,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafikonok"
 
@@ -7429,11 +7466,11 @@ msgstr "Segítség"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7478,14 +7515,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Előzmények"
 
@@ -7549,7 +7586,7 @@ msgstr "Vízszintes igazítás"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7557,8 +7594,7 @@ msgstr "Vízszintes igazítás"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7570,7 +7606,7 @@ msgstr "Vízszintes igazítás"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7650,7 +7686,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7658,7 +7694,7 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Hoszt csoport"
@@ -7689,7 +7725,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7706,7 +7742,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7745,7 +7781,7 @@ msgstr ""
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7893,7 +7929,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8125,14 +8161,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8141,12 +8229,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Kép"
 
@@ -8276,7 +8368,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8289,11 +8381,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8319,7 +8411,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Beleértve"
 
@@ -8337,6 +8429,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8727,7 +8824,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Hibás funkció"
 
@@ -8784,7 +8881,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8815,7 +8912,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8955,10 +9052,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9265,9 +9362,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9339,6 +9436,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9350,12 +9451,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9428,7 +9529,7 @@ msgid "Insert"
 msgstr "Beszúrás"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9536,7 +9637,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9584,7 +9685,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9687,8 +9788,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9892,7 +9993,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Leltár"
 
@@ -10082,7 +10183,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10243,7 +10344,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Január"
 
@@ -10265,7 +10366,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Július"
 
@@ -10273,7 +10374,7 @@ msgstr "Július"
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Június"
 
@@ -10307,7 +10408,7 @@ msgstr "Kulcs"
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Kulcsszó"
 
@@ -10377,7 +10478,7 @@ msgstr "Cimke elhelyezkedése"
 msgid "Language"
 msgstr "Nyelv"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10456,11 +10557,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Utolsó ellenőrzés"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Utolsó óra grafikonja"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Utolsó hónap grafikonja"
 
@@ -10498,7 +10599,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Utolsó érték"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Utolsó hét grafikonja"
 
@@ -10511,11 +10612,11 @@ msgstr "Utolsó hét grafikonja"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Legfrissebb adat"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10626,7 +10727,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10704,12 +10805,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10837,7 +10938,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10997,7 +11098,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11026,7 +11127,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Térkép"
 
@@ -11065,7 +11166,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11091,7 +11192,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11127,7 +11228,7 @@ msgstr "Térképek"
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Március"
 
@@ -11154,7 +11255,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11225,9 +11326,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11240,12 +11341,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Május"
 
@@ -11255,8 +11356,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Eszköztípus"
 
@@ -11317,7 +11418,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Eszköztípus frissítve"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11390,8 +11491,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11409,7 +11510,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11437,6 +11538,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11452,11 +11558,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11602,7 +11703,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Hétfő"
 
@@ -11642,11 +11743,11 @@ msgstr "Hónap"
 msgid "Monthly"
 msgstr "Havi"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11662,6 +11763,14 @@ msgstr "Több, mint 10 perc"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr ""
@@ -11671,11 +11780,11 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr ""
 
@@ -11683,6 +11792,18 @@ msgstr ""
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11777,25 +11898,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11938,6 +12060,10 @@ msgstr ""
 msgid "Never"
 msgstr "Soha"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11949,7 +12075,7 @@ msgstr "Új feltétel"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr ""
 
@@ -11973,7 +12099,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Új reguláris kifejezés"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11990,7 +12116,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12008,20 +12134,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12154,7 +12280,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12216,7 +12342,7 @@ msgstr "Nincs kép"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12256,7 +12382,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12269,8 +12395,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12282,7 +12408,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12290,11 +12415,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12412,19 +12538,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12433,15 +12559,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12468,7 +12594,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12484,7 +12610,7 @@ msgstr "Nincs cél kiválasztva"
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12531,7 +12657,7 @@ msgstr "Nincs"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12563,15 +12689,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12603,8 +12729,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Jegyzet"
 
@@ -12634,7 +12760,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "November"
 
@@ -12797,12 +12923,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numerikus (lebegőpontos)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12817,18 +12943,17 @@ msgstr "Numerikus (pozitív egész)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12855,7 +12980,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "VAGY"
 
@@ -12883,13 +13008,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Október"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "KIKAPCSOL"
 
@@ -12901,7 +13026,7 @@ msgstr "KIKAPCSOL"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12920,7 +13045,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "BEKAPCSOL"
 
@@ -12928,7 +13053,7 @@ msgstr "BEKAPCSOL"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr ""
 
@@ -12945,7 +13070,7 @@ msgid "One time only"
 msgstr "Egy alkalommal"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Egyszeri kiesés"
 
@@ -12957,26 +13082,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13017,11 +13130,11 @@ msgid_plural "Only selected problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13054,7 +13167,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13079,7 +13192,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13104,27 +13217,27 @@ msgstr "Műveletek"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operátor"
 
@@ -13149,7 +13262,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13166,8 +13279,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13214,9 +13327,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Eredeti"
 
@@ -13468,7 +13581,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "HIBA"
@@ -13515,7 +13628,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13538,13 +13651,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Paraméter"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13575,9 +13690,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13666,15 +13779,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13748,19 +13865,20 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13782,12 +13900,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Szöveg"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr ""
 
@@ -13817,7 +13935,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr ""
 
@@ -13946,7 +14064,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14004,7 +14122,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14024,12 +14142,12 @@ msgid "Privilege level"
 msgstr ""
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14059,7 +14177,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14077,7 +14195,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -14090,8 +14208,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14104,14 +14222,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Számítás, ha minden alárendelt elem állapota hibás"
-
-#: include/classes/helpers/CServiceHelper.php:26
-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"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14128,7 +14238,7 @@ msgstr "Számítás, ha legalább egy alárendelt elem állapota hibás"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Hibák"
 
@@ -14162,12 +14272,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14189,7 +14299,7 @@ msgstr "Proxik"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14252,7 +14362,7 @@ msgstr "Proxy neve"
 msgid "Proxy updated"
 msgstr "Proxy frissítve"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14346,8 +14456,8 @@ msgstr "Olvasás"
 msgid "Read only"
 msgstr "Csak olvasható"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14355,8 +14465,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14409,7 +14519,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14417,7 +14527,7 @@ msgstr ""
 msgid "Recovery"
 msgstr ""
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14452,7 +14562,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14514,7 +14624,7 @@ msgstr "Reguláris kifejezések"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14546,6 +14656,7 @@ msgstr "Távoli parancs"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14555,7 +14666,7 @@ msgstr "Távoli parancs"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14563,13 +14674,13 @@ msgstr "Távoli parancs"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14579,8 +14690,8 @@ msgstr "Távoli parancs"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14657,8 +14768,8 @@ msgstr "Távoli parancs"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Eltávolítás"
 
@@ -14698,7 +14809,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14727,7 +14838,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14735,7 +14846,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Csere"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14842,7 +14953,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Visszaállítás"
@@ -14876,7 +14987,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr ""
 
@@ -15074,8 +15185,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15133,12 +15244,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Orosz (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15149,10 +15260,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15365,7 +15474,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -15538,7 +15647,7 @@ msgstr "Script frissítve"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Scriptek"
 
@@ -15608,8 +15717,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15617,7 +15726,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Kiválaszt"
 
@@ -15653,19 +15762,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15690,7 +15799,7 @@ msgstr "Küldés csak ide"
 msgid "Send to"
 msgstr "Küldés"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15723,7 +15832,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Szeptember"
 
@@ -15755,34 +15864,29 @@ msgid "Server time"
 msgstr "Szerver idő"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Szolgáltatás"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15790,7 +15894,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15819,7 +15923,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15835,11 +15939,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Szolgáltatási időszakok"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Szerviz típus"
 
@@ -15848,7 +15952,7 @@ msgstr "Szerviz típus"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Szolgáltatás frissítve"
 
@@ -15857,16 +15961,16 @@ msgstr "Szolgáltatás frissítve"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15878,9 +15982,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -15904,10 +16008,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15948,7 +16060,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15994,7 +16106,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16085,7 +16197,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16136,7 +16248,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Munkaidő megjelenítése"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr ""
 
@@ -16245,7 +16357,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16291,7 +16403,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sorba rendezés (0->999)"
 
@@ -16365,7 +16477,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16413,12 +16525,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16429,17 +16543,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16463,13 +16584,10 @@ msgstr ""
 msgid "Status"
 msgstr "Státusz"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Státusz számítás"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Státusz-számítási algoritmus"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16500,6 +16618,10 @@ msgstr "Csak státusz"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16531,8 +16653,8 @@ msgstr ""
 msgid "Steps"
 msgstr "Lépések száma"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr ""
 
@@ -16544,7 +16666,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16576,7 +16698,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16609,7 +16731,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16625,7 +16747,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Sikeres Események"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16638,7 +16760,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Vasárnap"
 
@@ -16730,12 +16852,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16771,8 +16893,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Cimke"
@@ -16812,14 +16934,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16827,10 +16948,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16994,7 +17115,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17279,12 +17400,12 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "-ig"
 
@@ -17294,13 +17415,13 @@ msgstr "-ig"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17381,7 +17502,7 @@ msgstr "Időpecsét"
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17503,13 +17624,13 @@ msgstr "Trendek"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17528,7 +17649,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17612,7 +17733,7 @@ msgstr "Trigger áttekintés"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17679,15 +17800,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger súlyosság"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17739,7 +17860,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -17752,7 +17873,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17767,15 +17888,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17842,7 +17964,7 @@ msgid "UNKNOWN"
 msgstr "ISMERETLEN"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17852,7 +17974,7 @@ msgstr "ISMERETLEN"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17898,7 +18020,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr ""
 
@@ -17946,7 +18068,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17993,7 +18115,8 @@ msgstr "Engedélyezi a kijelölt zárolt felhasználókat?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18012,7 +18135,8 @@ msgstr "Egységek"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18023,9 +18147,9 @@ msgstr "Egységek"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -18044,12 +18168,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -18096,7 +18220,7 @@ msgstr "Eltávolítás a sablonból"
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18177,27 +18301,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18266,7 +18391,7 @@ msgid "Upper level maps"
 msgstr "Felsőbb szintű térképek"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Üzemidő"
@@ -18315,37 +18440,37 @@ msgstr ""
 msgid "User"
 msgstr "Felhasználó"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18362,13 +18487,13 @@ msgstr "Új felhasználó felvéve"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18393,32 +18518,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Felhasználói csoport"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18449,7 +18574,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18457,14 +18582,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Felhasználói csoportok"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18513,7 +18638,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18547,7 +18672,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18568,12 +18693,12 @@ msgstr "Felhasználó frissítve"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18618,7 +18743,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18885,23 +19010,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19108,8 +19233,8 @@ msgstr "Függőleges igazítás"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19136,7 +19261,12 @@ msgstr ""
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19153,11 +19283,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19173,7 +19303,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19242,7 +19372,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -19253,6 +19383,10 @@ msgstr "Szerda"
 msgid "Weekly"
 msgstr "Heti"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19270,7 +19404,7 @@ msgstr "Amikor aktív"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19483,8 +19617,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19526,19 +19660,19 @@ msgstr "Évi"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19606,19 +19740,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr ""
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19739,7 +19869,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19858,7 +19988,6 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20154,9 +20283,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20236,7 +20365,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20283,7 +20412,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20482,13 +20611,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20536,7 +20665,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20762,12 +20891,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20871,8 +21000,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -20967,7 +21096,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21034,7 +21163,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr ""
@@ -21102,7 +21231,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21229,7 +21358,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "rövid leírás"
 
@@ -21314,7 +21443,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21324,8 +21453,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21406,7 +21535,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21469,7 +21598,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21496,7 +21625,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21590,7 +21719,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21610,7 +21739,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "érték"
 
@@ -21757,7 +21886,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "é"
diff --git a/ui/locale/id/LC_MESSAGES/frontend.po b/ui/locale/id/LC_MESSAGES/frontend.po
index e2a108225d0..d9eb9dc7a73 100644
--- a/ui/locale/id/LC_MESSAGES/frontend.po
+++ b/ui/locale/id/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-10-10 08:26+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -170,7 +170,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -182,7 +182,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -209,16 +209,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -237,13 +237,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -290,7 +290,7 @@ msgstr "(tanpa proxy)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 atau 1"
 
@@ -358,7 +358,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "DAN"
 
@@ -375,7 +375,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -437,40 +437,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Akses ditolak!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Ack"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Pemberitahuan"
 
@@ -478,7 +478,7 @@ msgstr "Pemberitahuan"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Pemberitahuan"
@@ -507,20 +507,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -623,7 +625,7 @@ msgstr "Aksi diperbarui"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -632,7 +634,7 @@ msgstr "Aksi diperbarui"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Aksi"
@@ -691,8 +693,8 @@ msgstr "Aktif sampai"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -703,7 +705,6 @@ msgstr "Aktif sampai"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -711,11 +712,13 @@ msgstr "Aktif sampai"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -727,15 +730,17 @@ msgstr "Aktif sampai"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -802,7 +807,7 @@ msgstr "Aktif sampai"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Tambah"
 
@@ -810,19 +815,19 @@ msgstr "Tambah"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -839,7 +844,7 @@ msgstr "Tambah host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -856,7 +861,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -898,7 +907,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -907,12 +916,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -922,6 +939,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrasi"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Advanced labels"
@@ -1008,7 +1029,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Semua"
 
@@ -1017,8 +1038,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1026,7 +1047,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Semua tautan harus memiliki \"Nama\" dan \"URL\""
 
@@ -1060,7 +1081,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1073,7 +1094,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Host yang diizinkan"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1091,7 +1112,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1132,12 +1153,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1157,15 +1178,15 @@ msgstr "Aplikasi bermasalah."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Terapkan"
 
@@ -1183,7 +1204,7 @@ msgstr "Menjelang"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "April"
 
@@ -1211,6 +1232,10 @@ msgstr "Jenis area"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Sebagai teks biasa"
@@ -1259,8 +1284,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1338,7 +1363,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Agu"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Agustus"
 
@@ -1368,7 +1393,7 @@ msgstr "Otentikasi"
 msgid "Authentication algorithm"
 msgstr "Algoritma otentikasi"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1417,7 +1442,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Login-otomatis"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1427,7 +1452,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1612,11 +1637,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Bawah"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1697,7 +1722,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Dihitung"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1717,8 +1742,8 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1735,8 +1760,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Batal"
 
@@ -1766,7 +1791,7 @@ msgstr "Tidak dapat menambah aksi"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1777,7 +1802,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Tidak dapat menambah dependency dari host ke template."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1895,7 +1920,7 @@ msgid "Cannot add user"
 msgstr "Tidak dapat menambah user"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1903,11 +1928,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1985,7 +2010,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2039,7 +2064,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2420,7 +2445,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2588,7 +2613,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2650,7 +2675,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Tidak dapat merubah nama guest user."
 
@@ -2709,7 +2734,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3125,6 +3155,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3266,7 +3297,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Pemeriksaan harus unik."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3308,11 +3339,11 @@ msgstr "Bersihkan riwayat dan tren"
 msgid "Clear when unlinking"
 msgstr "Bersihkan ketika membatalkan penautan"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3342,7 +3373,7 @@ msgstr "Jam"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Klon"
 
@@ -3353,8 +3384,8 @@ msgstr "Klon"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Tutup"
 
@@ -3384,8 +3415,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3402,7 +3433,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3470,6 +3501,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Kondisi"
 
@@ -3524,7 +3556,7 @@ msgstr "Kondisi"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Konfigurasi"
 
@@ -3787,7 +3819,7 @@ msgstr "Kontak"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3824,8 +3856,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3886,8 +3918,8 @@ msgstr "Koordinat"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Salin"
 
@@ -4014,11 +4046,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4135,7 +4167,7 @@ msgstr "Buat peta"
 msgid "Create media type"
 msgstr "Buat tipe media"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4151,7 +4183,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Buat script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4159,7 +4191,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Buat template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Buat trigger"
 
@@ -4378,7 +4410,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4408,7 +4440,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4578,7 +4610,7 @@ msgstr "Hari minggu"
 msgid "Days"
 msgstr "Hari"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debug"
 
@@ -4592,7 +4624,7 @@ msgstr "Mode debug"
 msgid "Dec"
 msgstr "Des"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Desember"
 
@@ -4601,13 +4633,17 @@ msgstr "Desember"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Standar"
 
@@ -4677,8 +4713,8 @@ msgid "Delayed by"
 msgstr "Delay oleh"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4692,7 +4728,7 @@ msgstr "Delay oleh"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4724,8 +4760,8 @@ msgstr "Delay oleh"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Hapus"
 
@@ -4754,7 +4790,7 @@ msgstr "Hapus aksi yang berlaku?"
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4798,7 +4834,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr "Hapus item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Hapus tautan antara elemen yang dipilih?"
 
@@ -4854,7 +4890,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Hapus aturan discovery yang dipilih?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Hapus elemen yang dipilih?"
 
@@ -4955,11 +4991,11 @@ msgstr "Hapus skrip yang dipilih?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -4975,7 +5011,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Hapus trigger yang dipilih?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Hapus user yang dipilih?"
 
@@ -5026,7 +5062,7 @@ msgstr "Dihapus : Template \"%1$s\"."
 msgid "Delimiter"
 msgstr "Pembatas"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5040,7 +5076,7 @@ msgstr "Tolak"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5048,7 +5084,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependensi"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Tergantung"
 
@@ -5056,7 +5092,7 @@ msgstr "Tergantung"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5084,7 +5120,7 @@ msgstr "Status deployment"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5248,7 +5284,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5261,14 +5297,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5351,7 +5387,7 @@ msgid "Discovery by proxy"
 msgstr "Penemuan berdasarkan proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Periksa penemuan"
 
@@ -5363,7 +5399,7 @@ msgstr "Periksa penemuan"
 msgid "Discovery list"
 msgstr "Daftar penemuan"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Obyek penemuan"
 
@@ -5460,7 +5496,7 @@ msgstr "Aturan penemuan diperbarui"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5471,7 +5507,7 @@ msgstr "Aturan penemuan"
 msgid "Discovery rules deleted"
 msgstr "Aturan penemuan dihapus"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Status penemuan"
@@ -5511,7 +5547,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Menampilkan %1$s dari %2$s yang ditemukan"
@@ -5529,10 +5565,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Jangan dikalkulasi"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5547,7 +5579,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Apakah Anda ingin mengganti ekspresi kondisional?"
 
@@ -5603,7 +5635,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Mati"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5612,7 +5644,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Downtime"
@@ -5688,7 +5720,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5710,7 +5742,7 @@ msgstr "Item dinamis"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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 bernama"
 
@@ -5718,13 +5750,14 @@ msgstr "Setiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL ber
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5736,8 +5769,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Ubah"
 
@@ -5753,11 +5786,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Ubah trigger"
 
@@ -6032,7 +6065,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6054,12 +6087,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6118,7 +6151,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6142,7 +6175,7 @@ msgstr "Error"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Error pada permintaan pencarian untuk label \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6182,7 +6215,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Detail event"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Pembuatan event"
 
@@ -6212,7 +6245,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6245,7 +6278,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Kecuali"
 
@@ -6256,7 +6289,7 @@ msgstr "Kecuali"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Jalankan"
 
@@ -6302,7 +6335,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Skrip yang dijalankan"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Konfirmasi eksekusi"
 
@@ -6318,8 +6351,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6386,7 +6419,7 @@ msgstr "Ekspor ke CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6440,7 +6473,7 @@ msgstr "Ekspresi"
 msgid "External check"
 msgstr "Periksa eksternal"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6464,7 +6497,7 @@ msgid "Failed"
 msgstr "Gagal"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6473,24 +6506,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6498,7 +6531,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6522,7 +6555,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Februari"
 
@@ -6668,8 +6701,8 @@ msgstr "Region diisi"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6747,6 +6780,10 @@ msgstr "Paskan pada peta"
 msgid "Fixed"
 msgstr "Tetap"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6812,14 +6849,14 @@ msgstr "French (fr_FR)"
 msgid "Fri"
 msgstr "Jum"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Jumat"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6837,7 +6874,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Akses frontend"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Sistem pesan frontend"
 
@@ -6919,7 +6956,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Ekspresi yang diberikan bukan sebuah macro"
 
@@ -6937,7 +6974,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Lanjut ke"
 
@@ -6986,7 +7023,7 @@ msgstr "Garis gradasi"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7146,7 +7183,7 @@ msgstr "Grafik dengan nama \"%1$s\" sudah ada dalam grafik atau prototipe grafik
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafik"
 
@@ -7346,11 +7383,11 @@ msgstr "Bantuan"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7395,14 +7432,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Riwayat"
 
@@ -7466,7 +7503,7 @@ msgstr "Luruskan horisontal"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7474,8 +7511,7 @@ msgstr "Luruskan horisontal"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7487,7 +7523,7 @@ msgstr "Luruskan horisontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7564,7 +7600,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7572,7 +7608,7 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Host grup"
@@ -7603,7 +7639,7 @@ msgstr "Tipe label grup host"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7620,7 +7656,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7659,7 +7695,7 @@ msgstr "Antarmuka host"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7806,7 +7842,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8038,14 +8074,64 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8054,12 +8140,16 @@ msgstr "Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untu
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Gambar"
 
@@ -8189,7 +8279,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8202,11 +8292,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8232,7 +8322,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Termasuk"
 
@@ -8250,6 +8340,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8640,7 +8735,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Kesalahan fungsi telah digunakan"
 
@@ -8697,7 +8792,7 @@ 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\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8728,7 +8823,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8868,10 +8963,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9178,9 +9273,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9252,6 +9347,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonesian (id_ID)"
@@ -9263,12 +9362,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9341,7 +9440,7 @@ msgid "Insert"
 msgstr "Sisipkan"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9449,7 +9548,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9497,7 +9596,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9600,8 +9699,8 @@ msgstr "Metode parameter tidak sah."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9805,7 +9904,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -9991,7 +10090,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10152,7 +10251,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Januari"
 
@@ -10174,7 +10273,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Juli"
 
@@ -10182,7 +10281,7 @@ msgstr "Juli"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Juni"
 
@@ -10216,7 +10315,7 @@ msgstr "Kunci"
 msgid "Key passphrase"
 msgstr "Kunci passphrase"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Kata kunci"
 
@@ -10286,7 +10385,7 @@ msgstr "Label lokasi"
 msgid "Language"
 msgstr "Bahasa"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10359,11 +10458,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Permeriksaan terakhir"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Grafik jam terakhir"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Grafik bulan terakhir"
 
@@ -10401,7 +10500,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Nilai terakhir"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Grafik minggu terakhir"
 
@@ -10414,11 +10513,11 @@ msgstr "Grafik minggu terakhir"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Data terbaru"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10529,7 +10628,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10607,12 +10706,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10740,7 +10839,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10900,7 +10999,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10929,7 +11028,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Peta"
 
@@ -10968,7 +11067,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -10994,7 +11093,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11030,7 +11129,7 @@ msgstr "Peta"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Maret"
 
@@ -11057,7 +11156,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11128,9 +11227,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11142,12 +11241,12 @@ msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mei"
 
@@ -11157,8 +11256,8 @@ msgid "May"
 msgstr "Mei"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11218,7 +11317,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Tipe media diperbarui"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11291,8 +11390,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Habis waktu pesan"
 
@@ -11310,7 +11409,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Pesan"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Pesan"
 
@@ -11338,6 +11437,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11353,11 +11457,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11498,7 +11597,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Sen"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Senin"
 
@@ -11538,11 +11637,11 @@ msgstr "Bulan"
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11558,6 +11657,14 @@ msgstr "Lebih dari 10 menit"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Lebih dari satu grafik dengan nama \"%1$s\" dengan host."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11567,11 +11674,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Beberapa MASALAH event"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Bisu"
 
@@ -11579,6 +11686,18 @@ msgstr "Bisu"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11673,25 +11792,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11834,6 +11954,10 @@ msgstr ""
 msgid "Never"
 msgstr "Tak pernah"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11845,7 +11969,7 @@ msgstr "Kondisi baru"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Element baru"
 
@@ -11869,7 +11993,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Ekspresi reguler baru"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11886,7 +12010,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -11904,20 +12028,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12050,7 +12174,7 @@ msgstr "Tidak ada detail"
 msgid "No discovery rule IDs given."
 msgstr "Tidak ada aturan ID yang diberikan pada discovery."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12112,7 +12236,7 @@ msgstr "Tidak ada gambar"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Tidak ada interface yang ditemukan"
 
@@ -12152,7 +12276,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12165,8 +12289,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Tidak ada izin untuk akses sistem."
 
@@ -12178,7 +12302,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12186,11 +12309,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12308,19 +12432,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12329,15 +12453,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12364,7 +12488,7 @@ msgstr "Tidak file kunci publik yang dispesifikasikan."
 msgid "No recipients for action operation message."
 msgstr "Tidak ada penerima untuk aksi operasi pesan."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12380,7 +12504,7 @@ msgstr "Tidak ada sasaran yang dipilih"
 msgid "No target selected."
 msgstr "Tidak ada sasaran yang dipilih."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12427,7 +12551,7 @@ msgstr "Tidak ada"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12459,15 +12583,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Tidak diizinkan menggunakan password untuk user \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12499,8 +12623,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Tidak didukung"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Catatan"
 
@@ -12530,7 +12654,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "November"
 
@@ -12693,12 +12817,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numerik (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12713,18 +12837,17 @@ msgstr "Numerik (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12751,7 +12874,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Subnet mask OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "ATAU"
 
@@ -12779,13 +12902,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Oktober"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Mati"
 
@@ -12797,7 +12920,7 @@ msgstr "Mati"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12816,7 +12939,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Nyala"
 
@@ -12824,7 +12947,7 @@ msgstr "Nyala"
 msgid "On status change triggers blink for"
 msgstr "Pada perubahan status trigger berkedip untuk"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Sekali"
 
@@ -12841,7 +12964,7 @@ msgid "One time only"
 msgstr "Satu kali saja"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Satu-kali downtime"
 
@@ -12853,26 +12976,14 @@ msgstr "Hanya Super admin yang bisa membuat grup host."
 msgid "Only Super Admins can create media types."
 msgstr "Hanya Super Admin yang bisa membuat tipe media."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Hanya Super Admin yang bisa menghapus tipe media."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Hanya Super admin yang bisa menghapus grup user."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Hanya Super Admin yang bisa mengubah tipe media."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -12912,11 +13023,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12949,7 +13060,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -12974,7 +13085,7 @@ msgstr "Operasi tidak memiliki grup untuk beroperasi."
 msgid "Operation has no template to operate."
 msgstr "Operasi tidak memiliki template untuk beroperasi."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -12999,27 +13110,27 @@ msgstr "Operasi"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
@@ -13044,7 +13155,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13061,8 +13172,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13109,9 +13220,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Original"
 
@@ -13363,7 +13474,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "MASALAH"
@@ -13410,7 +13521,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13433,13 +13544,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13470,9 +13583,7 @@ msgstr "Item induk"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13561,15 +13672,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13643,19 +13758,20 @@ msgid "Periods"
 msgstr "Periode"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Izin"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Perizinan dapat diberikan hanya untuk grup user."
 
@@ -13677,12 +13793,12 @@ msgstr "Menempatkan algoritma"
 msgid "Plain text"
 msgstr "Plain text"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Mainkan"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Mainkan suara"
 
@@ -13712,7 +13828,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Silahkan pilih dua elemen"
 
@@ -13841,7 +13957,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13899,7 +14015,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -13919,12 +14035,12 @@ msgid "Privilege level"
 msgstr "Tingkatan hak"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13954,7 +14070,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Masalah tampilan"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -13972,7 +14088,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Masalah pada"
 
@@ -13985,8 +14101,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -13999,14 +14115,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Masalah, jika semua turunan memiliki masalah"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Masalah, jika setidaknya satu turunan memiliki masalah"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14023,7 +14131,7 @@ msgstr "Masalah, jika setidaknya satu turunan memiliki masalah"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Masalah"
 
@@ -14057,12 +14165,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14084,7 +14192,7 @@ msgstr "Proxy"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14146,7 +14254,7 @@ msgstr "Nama proxy"
 msgid "Proxy updated"
 msgstr "Proxy diperbarui"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14240,8 +14348,8 @@ msgstr "Baca"
 msgid "Read only"
 msgstr "Hanya baca"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14249,8 +14357,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14303,7 +14411,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14311,7 +14419,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Pemulihan"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14346,7 +14454,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14406,7 +14514,7 @@ msgstr "Ekspresi reguler"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14438,6 +14546,7 @@ msgstr "Perintah jarak jauh"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14447,7 +14556,7 @@ msgstr "Perintah jarak jauh"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14455,13 +14564,13 @@ msgstr "Perintah jarak jauh"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14471,8 +14580,8 @@ msgstr "Perintah jarak jauh"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14549,8 +14658,8 @@ msgstr "Perintah jarak jauh"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Hapus"
 
@@ -14590,7 +14699,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14619,7 +14728,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14627,7 +14736,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Gantikan"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Gantikan dependensi"
 
@@ -14734,7 +14843,7 @@ msgstr "Dibutuhkan kode status"
 msgid "Required string"
 msgstr "Dibutuhkan string"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reset"
@@ -14768,7 +14877,7 @@ msgstr "Konfirmasi reset"
 msgid "Reset defaults"
 msgstr "Reset standar"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Terselesaikan"
 
@@ -14966,8 +15075,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15025,12 +15134,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15041,10 +15150,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15257,7 +15364,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Sab"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sabtu"
 
@@ -15426,7 +15533,7 @@ msgstr "Skrip diperbarui"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Skrip"
 
@@ -15496,8 +15603,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15505,7 +15612,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Pilih"
 
@@ -15541,19 +15648,19 @@ msgstr "Elemen yang dipilih"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15578,7 +15685,7 @@ msgstr "Hanya kirim ke"
 msgid "Send to"
 msgstr "Kirim ke"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15611,7 +15718,7 @@ msgstr "Dipisahkan"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "September"
 
@@ -15643,34 +15750,29 @@ msgid "Server time"
 msgstr "Waktu server"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15678,7 +15780,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15706,7 +15808,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Waktu mulai service harus lebih kecil dari waktu akhir."
 
@@ -15722,11 +15824,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Waktu service"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipe service"
 
@@ -15735,7 +15837,7 @@ msgstr "Tipe service"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Service diperbarui"
 
@@ -15744,16 +15846,16 @@ msgstr "Service diperbarui"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Form service dependensi melingkar."
 
@@ -15765,9 +15867,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sesi dimatikan, mohon login kembali."
 
@@ -15791,10 +15893,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15835,7 +15945,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15881,7 +15991,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -15972,7 +16082,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16023,7 +16133,7 @@ msgstr "Tampilkan peringatan jika server Zabbix mati"
 msgid "Show working time"
 msgstr "Tampilkan waktu kerja"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Ditampilkan"
 
@@ -16132,7 +16242,7 @@ msgstr "Abaikan menyalin grafik \"%1$s\" ke host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Tidur"
 
@@ -16178,7 +16288,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Pengurutan (0->999)"
 
@@ -16252,7 +16362,7 @@ msgstr "Memulai"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16300,12 +16410,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16316,17 +16428,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16350,13 +16469,10 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Status kalkulasi"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Status kalkulasi algoritma"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16387,6 +16503,10 @@ msgstr "Status saja"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16418,8 +16538,8 @@ msgstr ""
 msgid "Steps"
 msgstr "Langkah"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Berhenti"
 
@@ -16431,7 +16551,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16463,7 +16583,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16496,7 +16616,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Submap"
 
@@ -16512,7 +16632,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Audit sukses"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16525,7 +16645,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Sen"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Senin"
 
@@ -16617,12 +16737,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16658,8 +16778,8 @@ msgstr "Tabel \"%1$s\" tidak memiliki field dengan nama \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Label"
@@ -16699,14 +16819,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16714,10 +16833,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16881,7 +17000,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17164,12 +17283,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Kam"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Kamis"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Hingga"
 
@@ -17179,13 +17298,13 @@ msgstr "Hingga"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17266,7 +17385,7 @@ msgstr "Timestamp"
 msgid "To"
 msgstr "Ke"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 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"
 
@@ -17388,13 +17507,13 @@ msgstr "Tren"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17413,7 +17532,7 @@ msgstr ""
 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."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17494,7 +17613,7 @@ msgstr "Rangkuman trigger"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17560,15 +17679,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger keparahan"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17620,7 +17739,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Sel"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Selasa"
 
@@ -17633,7 +17752,7 @@ msgstr ""
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17648,15 +17767,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17723,7 +17843,7 @@ msgid "UNKNOWN"
 msgstr "TIDAK DIKENAL"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17733,7 +17853,7 @@ msgstr "TIDAK DIKENAL"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17779,7 +17899,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URL"
 
@@ -17827,7 +17947,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17874,7 +17994,8 @@ msgstr "Membuka blokir user yang dipilih?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17893,7 +18014,8 @@ msgstr "Unit"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17904,9 +18026,9 @@ msgstr "Unit"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Tidak dikenal"
@@ -17925,12 +18047,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilih"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Host tidak dikenal, tidak ada host yang hadir dalam sistem"
 
@@ -17977,7 +18099,7 @@ msgstr "Putuskan dari template"
 msgid "Unlink from templates"
 msgstr "Putuskan dari template"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Nyalakan suara"
 
@@ -18057,27 +18179,28 @@ msgstr "Nyala"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18146,7 +18269,7 @@ msgid "Upper level maps"
 msgstr "Tingkat peta lebih atas"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Waktu nyala"
@@ -18195,37 +18318,37 @@ msgstr "Digunakan dalam aksi"
 msgid "User"
 msgstr "User"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18242,13 +18365,13 @@ msgstr "User ditambah"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18272,32 +18395,32 @@ msgstr[0] "User dihapus"
 msgid "User group"
 msgstr "Grup user"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Grup user \"%1$s\" digunakan dalam skrip \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18326,7 +18449,7 @@ msgstr[0] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18334,14 +18457,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Grup user"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "User tidak diizinkan menghapus dirinya sendiri."
 
@@ -18389,7 +18512,7 @@ msgstr[0] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18423,7 +18546,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18443,12 +18566,12 @@ msgstr "User diperbarui"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18493,7 +18616,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18760,23 +18883,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18983,8 +19106,8 @@ msgstr "Meluruskan vertikal"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19011,7 +19134,12 @@ msgstr "Nama terlihat"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Nama terlihat tidak boleh kosong jika nama hostnya hilang."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19028,11 +19156,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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."
 
@@ -19048,7 +19176,7 @@ msgstr "Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu dii
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19115,7 +19243,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Rab"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Rabu"
 
@@ -19126,6 +19254,10 @@ msgstr "Rabu"
 msgid "Weekly"
 msgstr "Mingguan"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19143,7 +19275,7 @@ msgstr "Ketidak aktif"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19356,8 +19488,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19399,19 +19531,19 @@ msgstr "Tahunan"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19479,19 +19611,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Anda tidak memiliki hak untuk melakukan operasi ini."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Anda tidak memiliki hak untuk membuat user."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19612,7 +19740,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19731,7 +19859,6 @@ msgstr "agen"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20027,9 +20154,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20109,7 +20236,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20156,7 +20283,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20355,13 +20482,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20409,7 +20536,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20635,12 +20762,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20744,8 +20871,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20840,7 +20967,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -20907,7 +21034,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "dari"
@@ -20975,7 +21102,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21102,7 +21229,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "penjelasan singkat"
 
@@ -21187,7 +21314,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21197,8 +21324,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21279,7 +21406,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21342,7 +21469,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21369,7 +21496,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21463,7 +21590,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21483,7 +21610,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "nilai"
 
@@ -21630,7 +21757,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/it/LC_MESSAGES/frontend.po b/ui/locale/it/LC_MESSAGES/frontend.po
index e79df0956b1..08c3b314b40 100644
--- a/ui/locale/it/LC_MESSAGES/frontend.po
+++ b/ui/locale/it/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2016-04-20 12:06+0300\n"
 "Last-Translator: quadrata <dimitri.bellini@quadrata.it>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d giorno"
 msgstr[1] "%1$d giorni"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] "%1$s messaggi"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s di %2$s elemento in problem state"
 msgstr[1] "%1$s di %2$s elementi in problem state"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s tentativo disponibile"
 msgstr[1] "%1$s tentativi disponibili"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1s secondo"
 msgstr[1] "%1s secondi"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Severità, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, sola lettura"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr "(nessun proxy)"
 msgid "0 - use default port"
 msgstr "0 - usa porta di default"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 o 1"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "AGGIUNGI OVERRIDE"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "E"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Accesso negato"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Accesso negato!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Ack"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Acknowledge"
 
@@ -499,7 +499,7 @@ msgstr "Acknowledge"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Con acknowledge"
@@ -528,20 +528,22 @@ msgstr "Acknowledged RESOLVED events"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -646,7 +648,7 @@ msgstr "Azione aggiornata"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -655,7 +657,7 @@ msgstr "Azione aggiornata"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Azioni"
@@ -714,8 +716,8 @@ msgstr "Attivo fino a"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -726,7 +728,6 @@ msgstr "Attivo fino a"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -734,11 +735,13 @@ msgstr "Attivo fino a"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -750,15 +753,17 @@ msgstr "Attivo fino a"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -825,7 +830,7 @@ msgstr "Attivo fino a"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -833,19 +838,19 @@ msgstr "Aggiungi"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Aggiungi un nuovo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Aggiungi elemento child"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -862,7 +867,7 @@ msgstr "Aggiungi host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Aggiungi mappe multiple"
 
@@ -879,7 +884,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -887,7 +896,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -921,7 +930,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -930,12 +939,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Ammin"
@@ -945,6 +962,10 @@ msgstr "Ammin"
 msgid "Administration"
 msgstr "Amministrazione"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Etichette avanzate"
@@ -1031,7 +1052,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Tutti"
 
@@ -1040,8 +1061,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Tutti i gruppi"
 
@@ -1049,7 +1070,7 @@ msgstr "Tutti i gruppi"
 msgid "All hosts"
 msgstr "Tutti gli host"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tutti i collegamenti devono avere \"Nome\" e \"URL\" definiti"
 
@@ -1083,7 +1104,7 @@ msgstr "Tutti i template"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1096,7 +1117,7 @@ msgstr "Consenti chiusura manuale"
 msgid "Allowed hosts"
 msgstr "Host consentiti"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1114,7 +1135,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1155,12 +1176,12 @@ msgstr "And/Or"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1180,15 +1201,15 @@ msgstr "Errore dell'applicazione."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Applica"
 
@@ -1206,7 +1227,7 @@ msgstr "Prossimo"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Aprile"
 
@@ -1234,6 +1255,10 @@ msgstr "Tipo area"
 msgid "Arithmetic"
 msgstr "Aritmetica"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Come testo semplice"
@@ -1282,8 +1307,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1361,7 +1386,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Agosto"
 
@@ -1391,7 +1416,7 @@ msgstr "Autenticazione"
 msgid "Authentication algorithm"
 msgstr "Algoritmo di autenticazione"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1440,7 +1465,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Auto-login"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Le opzioni Auto-login e auto-logout non possono essere abilitate insieme."
 
@@ -1450,7 +1475,7 @@ msgstr "Auto-logout"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1635,11 +1660,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "In basso"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Porta avanti"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Porta in primopiano"
 
@@ -1720,7 +1745,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculated"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1740,8 +1765,8 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1758,8 +1783,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1789,7 +1814,7 @@ msgstr "Impossibile aggiungere l'azione"
 msgid "Cannot add correlation"
 msgstr "Impossibile aggiungere correllazione"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1800,7 +1825,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Impossibile aggiungere dipendenza da un host a un template"
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1919,7 +1944,7 @@ msgid "Cannot add user"
 msgstr "Impossibile aggiungere l'utente"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1927,11 +1952,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Impossibile aggiungere scenario web"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2012,7 +2037,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "Non è possibile copiare il trigger"
 msgstr[1] "Non è possibile copiare i trigger"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2067,7 +2092,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2484,7 +2509,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2654,7 +2679,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2716,7 +2741,7 @@ msgstr ""
 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Impossibile rinominare utente guest."
 
@@ -2775,7 +2800,12 @@ msgstr "Impossibile impostare campi inventario per un inventario disabilitato."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3197,6 +3227,7 @@ msgid "Change per second"
 msgstr "Cambiamenti al secondo"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3338,7 +3369,7 @@ msgstr "Controllo delle prestazioni del servizio UDP. Restituisce 0 - servizio n
 msgid "Checks should be unique."
 msgstr "I controlli devono essere univoci."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3380,11 +3411,11 @@ msgstr "Pulisci storico e trend"
 msgid "Clear when unlinking"
 msgstr "Pulisci duranto lo scollegamento"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3414,7 +3445,7 @@ msgstr "Orologio"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Clona"
 
@@ -3425,8 +3456,8 @@ msgstr "Clona"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Chiudi"
 
@@ -3456,8 +3487,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Espandi"
 
@@ -3474,7 +3505,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3542,6 +3573,7 @@ msgstr "Sessioni concorrenti"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Condizione"
 
@@ -3596,7 +3628,7 @@ msgstr "Condizioni"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -3859,7 +3891,7 @@ msgstr "Contatto"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3896,8 +3928,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3958,8 +3990,8 @@ msgstr "Coordinate"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Copia"
 
@@ -4090,11 +4122,11 @@ msgstr "Crea correlazione"
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4211,7 +4243,7 @@ msgstr "Crea mappa"
 msgid "Create media type"
 msgstr "Crea tipo di supporto"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Crea nuovo"
 
@@ -4227,7 +4259,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Crea script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4235,7 +4267,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Crea template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Crea trigger"
 
@@ -4455,7 +4487,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4485,7 +4517,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4655,7 +4687,7 @@ msgstr "Giorno della settimana"
 msgid "Days"
 msgstr "Giorni"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debug"
 
@@ -4669,7 +4701,7 @@ msgstr "Modalità debug"
 msgid "Dec"
 msgstr "Dic"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Dicembre"
 
@@ -4678,13 +4710,17 @@ msgstr "Dicembre"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Default"
 
@@ -4754,8 +4790,8 @@ msgid "Delayed by"
 msgstr "Ritardato di"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4769,7 +4805,7 @@ msgstr "Ritardato di"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4801,8 +4837,8 @@ msgstr "Ritardato di"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Rimuovi"
 
@@ -4831,7 +4867,7 @@ msgstr "Rimuovere azione corrente?"
 msgid "Delete current correlation?"
 msgstr "Cancella attuale correlazione?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4875,7 +4911,7 @@ msgstr "Cancella item prototipo?"
 msgid "Delete item?"
 msgstr "Rimuovere item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Rimuovere collegamenti tra gli elementi selezionati?"
 
@@ -4931,7 +4967,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Rimuovere regole di discovery selezionate?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Rimuovere elementi selezionati?"
 
@@ -5032,11 +5068,11 @@ msgstr "Rimuovere script selezionati?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Elimina forme selezionate?"
 
@@ -5052,7 +5088,7 @@ msgstr "Cancella trigger prototipo selezionati?"
 msgid "Delete selected triggers?"
 msgstr "Rimuovere trigger selezionati?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Rimuovere utente selezionato?"
 
@@ -5103,7 +5139,7 @@ msgstr "Rimosso: Template \"%1$s\"."
 msgid "Delimiter"
 msgstr "Separatore"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5117,7 +5153,7 @@ msgstr "Nega"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5125,7 +5161,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dipendenze"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Subordinato"
 
@@ -5133,7 +5169,7 @@ msgstr "Subordinato"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5161,7 +5197,7 @@ msgstr "Stato di deploy"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5325,7 +5361,7 @@ msgstr "Disabilitare scenario web selezionato?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5338,14 +5374,14 @@ msgstr "Disabilitare scenario web selezionato?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5428,7 +5464,7 @@ msgid "Discovery by proxy"
 msgstr "Discovery per proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Controllo discovery"
 
@@ -5440,7 +5476,7 @@ msgstr "Controlli discovery"
 msgid "Discovery list"
 msgstr "Lista discovery"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Oggetto discovery"
 
@@ -5540,7 +5576,7 @@ msgstr "Regola di discovery aggiornata"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5551,7 +5587,7 @@ msgstr "Regole di discovery"
 msgid "Discovery rules deleted"
 msgstr "Regole di discovery rimosse"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stato discovery"
@@ -5591,7 +5627,7 @@ msgstr "Mostra grafico stacked"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Visualizzati %1$s di %2$s trovate"
@@ -5609,10 +5645,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Non calcolare"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5627,7 +5659,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Desideri sostituire l'espressione condizionale?"
 
@@ -5683,7 +5715,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Giù"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5692,7 +5724,7 @@ msgid "Download the configuration file"
 msgstr "Scarica il file di configurazione"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Tempo di inattività"
@@ -5768,7 +5800,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Userid duplicato \"%1$s\" sugli utenti per la mappa \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5790,7 +5822,7 @@ msgstr "Item dinamico"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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"
 
@@ -5798,13 +5830,14 @@ msgstr "Ogni URL deve avere un nome univoco. Per favore assicurarsi che ci sia u
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5816,8 +5849,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Modifica"
 
@@ -5833,11 +5866,11 @@ msgstr "Edita mappa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Modifica trigger"
 
@@ -6112,7 +6145,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6134,12 +6167,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6198,7 +6231,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6222,7 +6255,7 @@ msgstr "Errore"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Errore nella richiesta di ricerca per la tabella \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6261,7 +6294,7 @@ msgstr "Regole correlazione eventi"
 msgid "Event details"
 msgstr "Dettagli evento"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Generazione evento"
 
@@ -6292,7 +6325,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Coppia tag eventi"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo evento"
 
@@ -6326,7 +6359,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Escludi"
 
@@ -6337,7 +6370,7 @@ msgstr "Escludi"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Esegui"
 
@@ -6383,7 +6416,7 @@ msgstr "Eseguito"
 msgid "Executed script"
 msgstr "Script eseguito"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Conferma esecuzione"
 
@@ -6399,8 +6432,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Espandi"
 
@@ -6467,7 +6500,7 @@ msgstr "Esporta in CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6521,7 +6554,7 @@ msgstr "Espressioni"
 msgid "External check"
 msgstr "External check"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "V"
@@ -6545,7 +6578,7 @@ msgid "Failed"
 msgstr "Fallito"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6554,24 +6587,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr "Impossibile analizzare l'URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6579,7 +6612,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Aggiornamento template fallito."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6603,7 +6636,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Febbraio"
 
@@ -6749,8 +6782,8 @@ msgstr "Regione riempita"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6828,6 +6861,10 @@ msgstr "Adatta alla mappa"
 msgid "Fixed"
 msgstr "Fisso"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6893,14 +6930,14 @@ msgstr "Francese (fr_FR)"
 msgid "Fri"
 msgstr "Ven"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Venerdì"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6918,7 +6955,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Accesso frontend"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Messaggi frontend"
 
@@ -7000,7 +7037,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "L'espressione fornita non è una macro"
 
@@ -7018,7 +7055,7 @@ msgstr "Valore globale"
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Vai a"
 
@@ -7067,7 +7104,7 @@ msgstr "Linea sfumata"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7228,7 +7265,7 @@ msgstr "Un grafico con nome \"%1$s\" esiste già tra i grafici o prototipi di gr
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafici"
 
@@ -7428,11 +7465,11 @@ msgstr "Aiuto"
 msgid "Hexadecimal to decimal"
 msgstr "Esadecimale a decimale."
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Nascondi debug"
 
@@ -7477,14 +7514,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Storico"
 
@@ -7548,7 +7585,7 @@ msgstr "Allinea in orizzontale"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7556,8 +7593,7 @@ msgstr "Allinea in orizzontale"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7569,7 +7605,7 @@ msgstr "Allinea in orizzontale"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7649,7 +7685,7 @@ msgstr[1] "Host abilitati"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7657,7 +7693,7 @@ msgstr[1] "Host abilitati"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Gruppo host"
@@ -7688,7 +7724,7 @@ msgstr "Tipo etichetta gruppo host"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Host group con ID \"%1$s\" non è disponibile."
@@ -7705,7 +7741,7 @@ msgstr "Host group con ID \"%1$s\" non è disponibile."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7744,7 +7780,7 @@ msgstr "Interfaccia host"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7892,7 +7928,7 @@ msgstr "Host con nome visibile \"%1$s\" gia' presente."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8124,14 +8160,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Identificazione del sistema. Restituisce stringa"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8140,12 +8228,16 @@ msgstr "Se pensi che questo messaggio sia sbagliato, per favore contatta il tuo
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Immagine"
 
@@ -8275,7 +8367,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8288,11 +8380,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8318,7 +8410,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Includi"
 
@@ -8336,6 +8428,11 @@ msgstr "Includi sottogruppi"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statistiche di traffico in ingresso sull'interfaccia di rete. Restituice intero"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8727,7 +8824,7 @@ msgstr "Errato filtro \"tipo di condizione\" per azione \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Funzione errata utilizzata"
 
@@ -8784,7 +8881,7 @@ 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\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8815,7 +8912,7 @@ msgstr "ID tipo media errato."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Metodo non corretto \"%1$s.%2$s\"."
@@ -8955,10 +9052,10 @@ msgstr "ID utente specificato errato per la mappa \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "ID gruppo utente specificato errato per la mappa \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9265,9 +9362,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9339,6 +9436,10 @@ msgstr "Valore utilizzato non corretto per il campo PSK. Deve essere composto da
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Valore errato utilizzato per lo stato proxy \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonesiano (id_ID)"
@@ -9350,12 +9451,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9428,7 +9529,7 @@ msgid "Insert"
 msgstr "Inserisci"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Inserire espressione"
 
@@ -9536,7 +9637,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9584,7 +9685,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9687,8 +9788,8 @@ msgstr "Parametri del metodo non validi."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9892,7 +9993,7 @@ msgstr "Periodo di tempo non valido."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -10082,7 +10183,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10243,7 +10344,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Gen"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Gennaio"
 
@@ -10265,7 +10366,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Lug"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Luglio"
 
@@ -10273,7 +10374,7 @@ msgstr "Luglio"
 msgid "Jun"
 msgstr "Giu"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Giugno"
 
@@ -10307,7 +10408,7 @@ msgstr "Chiave"
 msgid "Key passphrase"
 msgstr "Passphrase della chiave"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Parola chiave"
 
@@ -10377,7 +10478,7 @@ msgstr "Posizione etichetta"
 msgid "Language"
 msgstr "Lingua"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10456,11 +10557,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Ultimo controllo"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Grafico dell'ultima ora"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Grafico ultimo mese"
 
@@ -10498,7 +10599,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Ultimo valore"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Grafico ultima settimana"
 
@@ -10511,11 +10612,11 @@ msgstr "Grafico ultima settimana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Ultimi dati"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Ultimi valori"
 
@@ -10626,7 +10727,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10704,12 +10805,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Elenco condivisioni per gruppo utenti"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Lista condivisioni utente"
@@ -10837,7 +10938,7 @@ msgstr "Regola discovery di basso livello in stato \"non supportata\"."
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "L"
@@ -10997,7 +11098,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11026,7 +11127,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Mappa"
 
@@ -11065,7 +11166,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11091,7 +11192,7 @@ msgstr "Proprietario mappa non puo' essere assente."
 msgid "Map shape"
 msgstr "Condividi mappa"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Aggiornamento mappa fallito."
 
@@ -11127,7 +11228,7 @@ msgstr "Mappe"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Marzo"
 
@@ -11154,7 +11255,7 @@ msgstr "Maschera"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11225,9 +11326,9 @@ msgstr "Numero massimo di file aperti supportati dal Sistema Operativo. Restitui
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Numero massimo di processi supportati dal Sistema Operativo. Restituisce intero"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11240,12 +11341,12 @@ 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."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Maggio"
 
@@ -11255,8 +11356,8 @@ msgid "May"
 msgstr "Maggio"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Supporti"
 
@@ -11317,7 +11418,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Tipo di supporto aggiornato"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Tipo Media con ID \"%1$s\" non e' valido."
@@ -11390,8 +11491,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Timeout messaggio"
 
@@ -11409,7 +11510,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Messaggi"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Messaggi"
 
@@ -11437,6 +11538,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11452,11 +11558,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11602,7 +11703,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Lun"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Lunedì"
 
@@ -11642,11 +11743,11 @@ msgstr "Mese"
 msgid "Monthly"
 msgstr "Per mesi"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Più corrispondenze trovate..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11662,6 +11763,14 @@ msgstr "Più di 10 minuti"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Più di un grafico con nome \"%1$s\" all'interno dell'host."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11671,11 +11780,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Multiplo"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Eventi PROBLEMA multipli"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Muto"
 
@@ -11683,6 +11792,18 @@ msgstr "Muto"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11777,25 +11898,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11938,6 +12060,10 @@ msgstr ""
 msgid "Never"
 msgstr "Mai"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11949,7 +12075,7 @@ msgstr "Nuova condizione"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nuovo elemento"
 
@@ -11973,7 +12099,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nuova espressione regolare"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11990,7 +12116,7 @@ msgid "New triggers"
 msgstr "Nuovi trigger"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12008,20 +12134,20 @@ msgstr "Prossimo step"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12154,7 +12280,7 @@ msgstr "Nessun dettaglio"
 msgid "No discovery rule IDs given."
 msgstr "Nessun ID regola di discovery fornito."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12216,7 +12342,7 @@ msgstr "Nessuna immagine"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Nessuna interfaccia trovata"
 
@@ -12256,7 +12382,7 @@ msgstr "Nessuna macro trovata."
 msgid "No maps added."
 msgstr "Nessuna mappa aggiunta."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Nessuna corrispondenza trovata"
 
@@ -12269,8 +12395,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Nessun tipo operazione fornita per la correlazione \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Nessun permesso per l'accesso al sistema."
 
@@ -12282,7 +12408,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12290,11 +12415,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12412,19 +12538,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12433,15 +12559,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12468,7 +12594,7 @@ msgstr "Nessun file di chiave pubblica specificato."
 msgid "No recipients for action operation message."
 msgstr "Nessun destinatario per il messaggio dell'operazione azione."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12484,7 +12610,7 @@ msgstr "Nessun target selezionato"
 msgid "No target selected."
 msgstr "Nessun target selezionato."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12531,7 +12657,7 @@ msgstr "Nessuno"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12563,15 +12689,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Non autorizzato ad impostare la password per l'utente \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12603,8 +12729,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Non supportato"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
 
@@ -12634,7 +12760,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Novembre"
 
@@ -12797,12 +12923,12 @@ msgstr "Sistema numerico"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numerico (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12817,18 +12943,17 @@ msgstr "Numerico (senza segno)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12856,7 +12981,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Maschera sottorete OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "O"
 
@@ -12884,13 +13009,13 @@ msgstr "Ott"
 msgid "Octal to decimal"
 msgstr "Ottale a decimale"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Ottobre"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Off"
 
@@ -12902,7 +13027,7 @@ msgstr "Off"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12921,7 +13046,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "On"
 
@@ -12929,7 +13054,7 @@ msgstr "On"
 msgid "On status change triggers blink for"
 msgstr "Al cambio di stato i trigger lampeggiano per"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Una volta"
 
@@ -12946,7 +13071,7 @@ msgid "One time only"
 msgstr "Solo una volta"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Inattività una-volta"
 
@@ -12958,26 +13083,14 @@ msgstr "Solo i Super Amministratori possono creare gruppi host."
 msgid "Only Super Admins can create media types."
 msgstr "Solo i Super Amministratori possono tipi di supporto."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Solo i Super Admin possono creare gruppi utenti."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Solo i Super Amministratori possono rimuovere tipi di supporto."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Solo i Super Amministratori possono cancellare i gruppi utente."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Solo i Super Amministratori possono modificare i tipi di supporto."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Solo i Super Admin possono aggiornare un gruppo utenti."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Solo i check Zabbix agent, SNMPv1, SNMPv2 e SNMPv3 possono essere unici."
@@ -13018,11 +13131,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Solo problema selezionato"
 msgstr[1] "Solo problemi selezionati"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13055,7 +13168,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informazioni Sistema Operativo. Restituisce stringa"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13080,7 +13193,7 @@ msgstr "L'operazione non ha gruppi per operare."
 msgid "Operation has no template to operate."
 msgstr "L'operazione non ha template per operare."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13105,27 +13218,27 @@ msgstr "Operazioni"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operatore"
 
@@ -13150,7 +13263,7 @@ msgstr "Opzioni"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13167,8 +13280,8 @@ msgstr "Or"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13215,9 +13328,9 @@ msgstr "Or"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Originale"
 
@@ -13469,7 +13582,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEMA"
@@ -13516,7 +13629,7 @@ msgstr "PSK identity"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK troppo corta. Minimo è %1$s hex-digits."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13539,13 +13652,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametro"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13576,9 +13691,7 @@ msgstr "Item primari"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13667,15 +13780,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Incolla"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Incolla senza link esterni"
 
@@ -13749,19 +13866,20 @@ msgid "Periods"
 msgstr "Periodi"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Permessi"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "I permessi possono esser assegnati solo per i gruppi utente."
 
@@ -13783,12 +13901,12 @@ msgstr "Algoritmo di posizionamento"
 msgid "Plain text"
 msgstr "Testo semplice"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Riproduci"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Riproduci suono"
 
@@ -13818,7 +13936,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Si prega di inserire il nome host o indirizzo IP dell'host e porta del server Zabbix, ed eventuale nome dell'installazione (opzionale)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Per favore seleziona due elementi"
 
@@ -13947,7 +14065,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14005,7 +14123,7 @@ msgstr "Passphrase di privacy"
 msgid "Privacy protocol"
 msgstr "Protocollo di privacy"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privato"
@@ -14025,12 +14143,12 @@ msgid "Privilege level"
 msgstr "Livello privilegi"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14060,7 +14178,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Mostra problema"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Espressione problema"
@@ -14078,7 +14196,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problema su"
 
@@ -14091,8 +14209,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14105,14 +14223,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problema, se tutti i figli hanno problemi"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problema, se almeno un servizio derivato ha un problema"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14129,7 +14239,7 @@ msgstr "Problema, se almeno un servizio derivato ha un problema"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problemi"
 
@@ -14163,12 +14273,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Proprietà"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14190,7 +14300,7 @@ msgstr "Proxy"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14253,7 +14363,7 @@ msgstr "Nome proxy"
 msgid "Proxy updated"
 msgstr "Proxy aggiornato"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Pubblico"
@@ -14347,8 +14457,8 @@ msgstr "Lettura"
 msgid "Read only"
 msgstr "Sola lettura"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14356,8 +14466,8 @@ msgstr "Sola-lettura"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14410,7 +14520,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14418,7 +14528,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Ripristino"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14453,7 +14563,7 @@ msgstr "Rettangolo"
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14514,7 +14624,7 @@ msgstr "Espressioni regolari"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14546,6 +14656,7 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14555,7 +14666,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14563,13 +14674,13 @@ msgstr "Comando remoto"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14579,8 +14690,8 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14657,8 +14768,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -14698,7 +14809,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14727,7 +14838,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14735,7 +14846,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Sostituisci dipendenze"
 
@@ -14842,7 +14953,7 @@ msgstr "Status Code atteso"
 msgid "Required string"
 msgstr "Stringa attesa"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Azzera"
@@ -14876,7 +14987,7 @@ msgstr "Conferma ripristino"
 msgid "Reset defaults"
 msgstr "Ripristina predefiniti"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Risolto"
 
@@ -15074,8 +15185,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Trim destro"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15133,12 +15244,12 @@ msgstr "Esegui comando specificato sull'host. Restituisce risultati di tipo test
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15149,10 +15260,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15365,7 +15474,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sab"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sabato"
 
@@ -15538,7 +15647,7 @@ msgstr "Script aggiornato"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Script"
 
@@ -15608,8 +15717,8 @@ msgid "Security name"
 msgstr "Nome di sicurezza"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15617,7 +15726,7 @@ msgstr "Nome di sicurezza"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Seleziona"
 
@@ -15653,19 +15762,19 @@ msgstr "Elementi selezionati"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Manda indietro"
 
@@ -15690,7 +15799,7 @@ msgstr "Invia solo a"
 msgid "Send to"
 msgstr "Invia a"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Mandare indietro"
 
@@ -15723,7 +15832,7 @@ msgstr "Separati"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Settembre"
 
@@ -15755,34 +15864,29 @@ msgid "Server time"
 msgstr "Ora server"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Servizio"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15790,7 +15894,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Servizio creato"
 
@@ -15819,7 +15923,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "L'ora di partenza del servizio deve essere minore dell'ora di fine."
 
@@ -15835,11 +15939,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Orari servizio"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo servizio"
 
@@ -15848,7 +15952,7 @@ msgstr "Tipo servizio"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Servizio aggiornato"
 
@@ -15857,16 +15961,16 @@ msgstr "Servizio aggiornato"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Servizi"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "I servizi formano una dipendenza circolare."
 
@@ -15878,9 +15982,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sessione terminata, rieffettua il login, per favore."
 
@@ -15904,10 +16008,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Definisci modalita' inventario per host"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15948,7 +16060,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15994,7 +16106,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Condivisioni"
 
@@ -16085,7 +16197,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16136,7 +16248,7 @@ msgstr "Mostra avvertimento se Zabbix Server non risponde"
 msgid "Show working time"
 msgstr "Mostra orario di lavoro"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Visibile"
 
@@ -16245,7 +16357,7 @@ msgstr "Saltata copia del grafico \"%1$s\" sull'host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovacco (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Posponi"
 
@@ -16291,7 +16403,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordina voci per"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Ordinamento (0->999)"
 
@@ -16365,7 +16477,7 @@ msgstr "Inizia in"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16413,12 +16525,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16429,17 +16543,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16463,13 +16584,10 @@ msgstr ""
 msgid "Status"
 msgstr "Stato"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Calcolo dello stato"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritmo di calcolo dello stato"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16500,6 +16618,10 @@ msgstr "Solo lo stato"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16531,8 +16653,8 @@ msgstr "Il passo con nome \"%1$s\" esiste già."
 msgid "Steps"
 msgstr "Passi"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Ferma"
 
@@ -16544,7 +16666,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16576,7 +16698,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16609,7 +16731,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Oggetto"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Sottomappa"
 
@@ -16625,7 +16747,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Riuscita Audit"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16638,7 +16760,7 @@ msgstr "Somma delle statistiche di traffico in entrata ed in uscita su un'interf
 msgid "Sun"
 msgstr "Dom"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -16730,12 +16852,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "System uptime in secondi. Restituisce intero"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "G"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "M"
@@ -16771,8 +16893,8 @@ msgstr "La tavola \"%1$s\" non contiene un campo chiamato \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tag"
@@ -16812,14 +16934,13 @@ msgstr "Valore tag"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16827,10 +16948,10 @@ msgstr "Valore tag"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16994,7 +17115,7 @@ msgstr "Template con stesso nome visibile \"%1$s\" gia' presente."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17279,12 +17400,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Gio"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Fino a"
 
@@ -17294,13 +17415,13 @@ msgstr "Fino a"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17381,7 +17502,7 @@ msgstr "Data e ora"
 msgid "To"
 msgstr "A"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 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"
 
@@ -17503,13 +17624,13 @@ msgstr "Trend"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17528,7 +17649,7 @@ msgstr "Trigger \"%1$s\" appartiene a template con diversi collegamenti."
 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."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17612,7 +17733,7 @@ msgstr "Panoramica Trigger"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17679,15 +17800,15 @@ msgstr "Prototipo Trigger cancellato"
 msgid "Trigger prototypes updated"
 msgstr "Prototipi Trigger aggiornati"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severity trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Trigger stato \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Trigger con stato \"Problema\""
 
@@ -17739,7 +17860,7 @@ msgstr "Trim"
 msgid "Tue"
 msgstr "Mar"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Martedì"
 
@@ -17752,7 +17873,7 @@ msgstr "Turco (tr_TR)"
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17767,15 +17888,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17842,7 +17964,7 @@ msgid "UNKNOWN"
 msgstr "SCONOSCIUT0"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17852,7 +17974,7 @@ msgstr "SCONOSCIUT0"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17898,7 +18020,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL deve avere entrambe i campi \"nome\" e \"url\" per la mappa \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17946,7 +18068,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Impossibile sovrascrivere il file di configurazione esistente."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17993,7 +18115,8 @@ msgstr "Sbloccare utenti selezionati?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18012,7 +18135,8 @@ msgstr "Unità"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18023,9 +18147,9 @@ msgstr "Unità"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -18044,12 +18168,12 @@ msgstr "Errore sconosciuto"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item host sconosciuto, nessun item di questo tipo nell'host selezionato"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Host sconosciuto, nessun host di questo tipo presente nel sistema"
 
@@ -18096,7 +18220,7 @@ msgstr "Scollega dal template"
 msgid "Unlink from templates"
 msgstr "Scollega dai template"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Disattiva muto"
 
@@ -18177,27 +18301,28 @@ msgstr "Su"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18266,7 +18391,7 @@ msgid "Upper level maps"
 msgstr "Mappe al livello superiore"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Tempo di attività"
@@ -18315,37 +18440,37 @@ msgstr "Utilizzato nelle azioni"
 msgid "User"
 msgstr "Utente"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "L'utente \"%1$s\" non può esistere senza un gruppo utenti"
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Utente \"%1$s\" e' il proprietario della mappa \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "Utente \"%1$s\" e' utilizzato nell'azione \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18362,13 +18487,13 @@ msgstr "Utente aggiunto"
 msgid "User agent string"
 msgstr "Stringa user agent"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18393,32 +18518,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Gruppo utenti"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Gruppo utenti \"%1$s\" gia' presente."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Gruppo utenti \"%1$s\" viene utilizzato nell'azione \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, 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."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Il gruppo utenti \"%1$s\" è utilizzato nello script \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18449,7 +18574,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Gruppo utenti con ID \"%1$s\" non è disponibile."
@@ -18457,14 +18582,14 @@ msgstr "Gruppo utenti con ID \"%1$s\" non è disponibile."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Gruppi utenti"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "L'utente non ha i permessi per cancellare se stesso."
 
@@ -18513,7 +18638,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18547,7 +18672,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Condivisioni utente assenza parametri: %1$s per la mappa \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18568,12 +18693,12 @@ msgstr "Utente aggiornato"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "L'utente con ID \"%1$s\" non è disponibile."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18618,7 +18743,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18885,23 +19010,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19108,8 +19233,8 @@ msgstr "Allineamento verticale"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamita (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19136,7 +19261,12 @@ msgstr "Nome visibile"
 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:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19153,11 +19283,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Attenzione"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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."
 
@@ -19173,7 +19303,7 @@ msgstr "Siamo spiacenti, il numero massimo possibile di elementi da conservare �
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19242,7 +19372,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mer"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Mercoledì"
 
@@ -19253,6 +19383,10 @@ msgstr "Mercoledì"
 msgid "Weekly"
 msgstr "Per settimane"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Benvenuto"
@@ -19270,7 +19404,7 @@ msgstr "Quando attivo"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19483,8 +19617,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19526,19 +19660,19 @@ msgstr "Per anni"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19606,19 +19740,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Non hai i permessi per eseguire questa operazione."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Non hai i permessi per creare utenti."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Non hai i permessi per accedere a questa pagina."
@@ -19739,7 +19869,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "è previsto un booleano"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19858,7 +19988,6 @@ msgstr "agente"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20154,9 +20283,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20236,7 +20365,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20283,7 +20412,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20482,13 +20611,13 @@ msgstr "Impostazioni di housekeeping globali"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20536,7 +20665,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "inclusione sottogruppi"
 
@@ -20762,12 +20891,12 @@ msgstr "regola discovery di basso-livello"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20871,8 +21000,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr "lunghezza carattari minima è %1$s"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20967,7 +21096,7 @@ msgstr ""
 msgid "name"
 msgstr "nome"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "nuovo"
 
@@ -21034,7 +21163,7 @@ msgstr ""
 msgid "number"
 msgstr "numero"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "di"
@@ -21102,7 +21231,7 @@ msgstr "output"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21229,7 +21358,7 @@ msgstr "selezionato"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "breve descrizione"
 
@@ -21314,7 +21443,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21324,8 +21453,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21406,7 +21535,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21469,7 +21598,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "digita qui per cercare"
 
@@ -21496,7 +21625,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21590,7 +21719,7 @@ msgstr "numero versione non supportata"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21610,7 +21739,7 @@ msgstr "numero versione non supportata"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "valore"
 
@@ -21757,7 +21886,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/ja/LC_MESSAGES/frontend.po b/ui/locale/ja/LC_MESSAGES/frontend.po
index 8446a32259d..07234cd38ea 100644
--- a/ui/locale/ja/LC_MESSAGES/frontend.po
+++ b/ui/locale/ja/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
-"PO-Revision-Date: 2021-08-24 12:54+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
+"PO-Revision-Date: 2021-09-02 13:31+0300\n"
 "Last-Translator: Atsushi <a.tanaka77@gmail.com>\n"
 "Language-Team: Zabbix\n"
 "Language: ja\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.5.1.3\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1629802474.000000\n"
+"X-POOTLE-MTIME: 1630582292.000000\n"
 
 #: include/classes/db/MysqlDbBackend.php:70
 #: include/classes/db/OracleDbBackend.php:142
@@ -93,7 +93,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 日"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -171,7 +171,7 @@ msgstr[0] "メッセージ%1$s件"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -183,7 +183,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%2$s台中%1$s台の要素で障害発生中"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -210,16 +210,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "リトライ残り%1$s回"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s秒"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s文字入力可"
@@ -238,13 +238,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$sの深刻度は%2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$sは読み込み専用です"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -291,7 +291,7 @@ msgstr "(プロキシなし)"
 msgid "0 - use default port"
 msgstr "0 - デフォルトのポート番号を使用"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0または1"
 
@@ -359,7 +359,7 @@ msgstr "<サブメニュー/サブメニュー/...>"
 msgid "ADD OVERRIDE"
 msgstr "オーバーライドの追加"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "AND"
 
@@ -376,7 +376,7 @@ msgstr "APIメソッド"
 msgid "API token"
 msgstr "APIトークン"
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr "ユーザーID\"%2$s\"用のAPIトークン\"%1$s\"がすでに存在します。"
@@ -438,40 +438,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "アクセスは拒否されました"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "アクセスは拒否されました！"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr "APIへのアクセス"
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "UI要素へのアクセス"
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr "アクションへのアクセス"
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr "モジュールへのアクセス"
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "確認済"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "障害確認"
 
@@ -479,7 +479,7 @@ msgstr "障害確認"
 msgid "Acknowledge problems"
 msgstr "障害の確認"
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "確認済"
@@ -508,20 +508,22 @@ msgstr "確認済の解決済イベント"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -624,7 +626,7 @@ msgstr "アクションを更新しました"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -633,7 +635,7 @@ msgstr "アクションを更新しました"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "アクション"
@@ -692,8 +694,8 @@ msgstr "設定有効期間の終了日時"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -704,7 +706,6 @@ msgstr "設定有効期間の終了日時"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -712,11 +713,13 @@ msgstr "設定有効期間の終了日時"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -728,15 +731,17 @@ msgstr "設定有効期間の終了日時"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -803,7 +808,7 @@ msgstr "設定有効期間の終了日時"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "追加"
 
@@ -811,19 +816,19 @@ msgstr "追加"
 msgid "Add (message type limit reached)"
 msgstr "追加 (メッセージタイプのリミットに到達)"
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "新しいウィジェットを追加"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "子の要素を追加"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -840,7 +845,7 @@ msgstr "ホストを追加"
 msgid "Add missing"
 msgstr "未設定時に追加"
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "複数のマップを追加"
 
@@ -857,7 +862,11 @@ msgstr "新しいインターフェースの追加"
 msgid "Add new override"
 msgstr "新しいオーバーライドの追加"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -865,7 +874,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr "障害対応メッセージの追加"
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -881,7 +890,7 @@ msgstr "サブマップを追加"
 
 #: app/controllers/CControllerFavouriteDelete.php:70 include/html.inc.php:153
 msgid "Add to favorites"
-msgstr ""
+msgstr "お気に入りに追加"
 
 #: include/actions.inc.php:1033
 msgid "Add to host group"
@@ -899,7 +908,7 @@ msgstr "ユーザーを追加"
 msgid "Add user group"
 msgstr "ユーザーグループを追加"
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "ウィジェットの追加"
 
@@ -908,12 +917,20 @@ msgstr "ウィジェットの追加"
 msgid "Added"
 msgstr "追加しました"
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "%1$sを追加しました"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -923,6 +940,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "管理"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "拡張ラベル"
@@ -1009,7 +1030,7 @@ msgstr "グリッドに揃える"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "すべて"
 
@@ -1018,8 +1039,8 @@ msgid "All dashboards"
 msgstr "すべてのダッシュボード"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "すべてのグループ"
 
@@ -1027,7 +1048,7 @@ msgstr "すべてのグループ"
 msgid "All hosts"
 msgstr "すべてのホスト"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "すべてのリンクに\"名前\"と\"URL\"を設定する必要があります"
 
@@ -1061,7 +1082,7 @@ msgstr "すべてのテンプレート"
 msgid "Allow list"
 msgstr "許可リスト"
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1074,7 +1095,7 @@ msgstr "手動クローズを許可"
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr "許可されたメソッド"
 
@@ -1092,7 +1113,7 @@ msgstr "ゲストの物理メモリページをバックアップするために
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1133,12 +1154,12 @@ msgstr "And/Or"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1158,15 +1179,15 @@ msgstr "アプリケーションエラー。"
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "適用"
 
@@ -1184,7 +1205,7 @@ msgstr "メンテナンス待ち"
 msgid "Apr"
 msgstr "4月"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "4月"
 
@@ -1212,6 +1233,10 @@ msgstr "エリアタイプ"
 msgid "Arithmetic"
 msgstr "計算"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "プレーンテキスト"
@@ -1260,8 +1285,8 @@ msgstr "少なくとも1つのUI要素をチェックしてください。"
 msgid "At least one action is mandatory."
 msgstr "少なくとも1つのアクションが必要です。"
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr "少なくとも1人の有効なユーザーを役割\"%1$s\"と共に指定してください。"
@@ -1333,13 +1358,13 @@ msgstr "監査ログ"
 
 #: app/views/administration.housekeeping.edit.php:179
 msgid "Audit settings"
-msgstr ""
+msgstr "監査設定"
 
 #: include/func.inc.php:227
 msgid "Aug"
 msgstr "8月"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "8月"
 
@@ -1369,7 +1394,7 @@ msgstr "認証"
 msgid "Authentication algorithm"
 msgstr "認証アルゴリズム"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "認証に失敗しました：%1$s。"
@@ -1418,7 +1443,7 @@ msgstr "自動"
 msgid "Auto-login"
 msgstr "自動ログイン (1ヶ月)"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "自動ログインと自動ログアウトを同時に有効にすることはできません。"
 
@@ -1428,7 +1453,7 @@ msgstr "自動ログアウト"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1613,11 +1638,11 @@ msgstr "両方のパスワードが一致している必要があります。"
 msgid "Bottom"
 msgstr "下"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "前面へ"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "最前面へ"
 
@@ -1678,7 +1703,7 @@ msgstr "インターバル中のCPU使用率、<url> - VMwareサービスURL、<
 #: include/classes/items/CHelpItems.php:233
 #: include/classes/items/CHelpItems.php:615
 msgid "CPU utilization percentage. Returns float"
-msgstr ""
+msgstr "CPU使用率。浮動小数点値を返す"
 
 #: app/views/popup.itemtestedit.view.php:301
 msgid "CRLF"
@@ -1698,7 +1723,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "計算"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "カレンダー"
 
@@ -1718,8 +1743,8 @@ msgstr "コールバック"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1736,8 +1761,8 @@ msgstr "コールバック"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -1767,7 +1792,7 @@ msgstr "アクションを追加できません"
 msgid "Cannot add correlation"
 msgstr "相関関係を追加できません"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr "ダッシュボードページが追加できません： 最大数%1$dのダッシュボードページが追加されています。"
@@ -1778,7 +1803,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "ホストからテンプレートへの依存関係は作成できません。"
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"への依存関係を追加できません。"
@@ -1896,7 +1921,7 @@ msgid "Cannot add user"
 msgstr "ユーザーを追加できません"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr "ユーザーグループを追加できません"
 
@@ -1904,11 +1929,11 @@ msgstr "ユーザーグループを追加できません"
 msgid "Cannot add web scenario"
 msgstr "Webシナリオを追加できません"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "ウィジェットが追加できません: ダッシュボードの空き領域が足りません。"
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1986,7 +2011,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] "トリガーをコピーできません"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "条件式に複数のホストが使用されているため、トリガー\"%1$s:%2$s\"をコピーできません。"
@@ -2040,7 +2065,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] "APIトークンを削除できません"
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Zabbixユーザー\"%1$s\"を削除できません。ユーザーを無効に設定してください。"
@@ -2417,7 +2442,7 @@ msgstr "条件式を評価できません"
 msgid "Cannot execute script."
 msgstr "スクリプトを実行できません。"
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "マクロを展開できません。"
 
@@ -2585,7 +2610,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] "%1$sにあるモジュールをロードできません。"
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2647,7 +2672,7 @@ msgstr "YAML: %1$sが読み込めません。"
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "レスポンスを読めません。Zabbixサーバー\"%1$s\"との接続を確認してください。"
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "ゲストユーザーの名前は変更できません。"
 
@@ -2706,7 +2731,12 @@ msgstr "無効の状態のインベントリのフィールドは設定できま
 msgid "Cannot set session cookie."
 msgstr "セッションクッキーを設定できません。"
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr "このデバイスでは音声通知をサポートしません。"
 
@@ -3060,7 +3090,7 @@ msgstr "大文字小文字を区別"
 #: app/views/administration.authentication.edit.php:193
 #: app/views/administration.authentication.edit.php:316
 msgid "Case-sensitive login"
-msgstr ""
+msgstr "ログイン時に大文字小文字を区別"
 
 #: include/locales.inc.php:48
 msgid "Catalan (ca_ES)"
@@ -3122,6 +3152,7 @@ msgid "Change per second"
 msgstr "1秒あたりの差分"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "深刻度の変更"
 
@@ -3263,7 +3294,7 @@ msgstr "UDPサービスのパフォーマンスをチェック。サービスが
 msgid "Checks should be unique."
 msgstr "チェックは重複できません"
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3305,11 +3336,11 @@ msgstr "ヒストリとトレンドを削除"
 msgid "Clear when unlinking"
 msgstr "リンク削除時にクリア"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "希望のサイズにクリックしてドラッグします。"
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "クリックして表示または変更"
 
@@ -3339,7 +3370,7 @@ msgstr "時刻"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "複製"
 
@@ -3350,8 +3381,8 @@ msgstr "複製"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "閉じる"
 
@@ -3381,8 +3412,8 @@ msgid "Close problems"
 msgstr "障害のクローズ"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "縮小"
 
@@ -3399,7 +3430,7 @@ msgstr "サイドバーの縮小"
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3467,6 +3498,7 @@ msgstr "並列実行数"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "トリガー条件式"
 
@@ -3521,7 +3553,7 @@ msgstr "実行条件"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "設定"
 
@@ -3795,7 +3827,7 @@ msgstr "連絡先"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3832,8 +3864,8 @@ msgstr "含む"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3894,8 +3926,8 @@ msgstr "座標"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "コピー"
 
@@ -4022,11 +4054,11 @@ msgstr "相関関係の作成"
 msgid "Create dashboard"
 msgstr "ダッシュボードの作成"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "依存するディスカバリルールの作成"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "依存アイテムの作成"
 
@@ -4143,7 +4175,7 @@ msgstr "マップの作成"
 msgid "Create media type"
 msgstr "メディアタイプの作成"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "新規作成"
 
@@ -4159,7 +4191,7 @@ msgstr "レポートの作成"
 msgid "Create script"
 msgstr "スクリプトの作成"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4167,7 +4199,7 @@ msgstr ""
 msgid "Create template"
 msgstr "テンプレートの作成"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "トリガーの作成"
 
@@ -4386,7 +4418,7 @@ msgstr "ダッシュボードページのプロパティ"
 msgid "Dashboard properties"
 msgstr "ダッシュボードのプロパティ"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "ダッシュボードの共有"
 
@@ -4416,7 +4448,7 @@ msgstr "ID\"%1$s\"のダッシュボードは使用できません。"
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "ダッシュボード"
 
@@ -4586,7 +4618,7 @@ msgstr "曜日"
 msgid "Days"
 msgstr "日"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "デバッグ"
 
@@ -4600,7 +4632,7 @@ msgstr "デバッグモード"
 msgid "Dec"
 msgstr "12月"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "12月"
 
@@ -4609,13 +4641,17 @@ msgstr "12月"
 msgid "Decimal places"
 msgstr "小数点以下桁数"
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "標準"
 
@@ -4685,8 +4721,8 @@ msgid "Delayed by"
 msgstr "遅延時間"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4700,7 +4736,7 @@ msgstr "遅延時間"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4732,8 +4768,8 @@ msgstr "遅延時間"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "削除"
 
@@ -4762,7 +4798,7 @@ msgstr "現在のアクションを削除しますか？"
 msgid "Delete current correlation?"
 msgstr "現在の相関関係を削除しますか？"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "ダッシュボードを削除しますか？"
 
@@ -4806,7 +4842,7 @@ msgstr "アイテムのプロトタイプを削除しますか？"
 msgid "Delete item?"
 msgstr "アイテムを削除しますか？"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "選択した要素間のリンクを削除しますか？"
 
@@ -4862,7 +4898,7 @@ msgstr "選択したダッシュボードを削除しますか？"
 msgid "Delete selected discovery rules?"
 msgstr "選択したディスカバリルールを削除しますか？"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "選択した要素を削除しますか？"
 
@@ -4963,11 +4999,11 @@ msgstr "選択したスクリプトを削除しますか？"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "選択した図形を削除しますか？"
 
@@ -4983,7 +5019,7 @@ msgstr "選択したトリガーのプロトタイプを削除しますか？"
 msgid "Delete selected triggers?"
 msgstr "選択したトリガーを削除しますか？"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "選択したユーザーを削除しますか？"
 
@@ -5034,7 +5070,7 @@ msgstr "削除: テンプレート\"%1$s\"。"
 msgid "Delimiter"
 msgstr "区切り文字"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr "拒否されたメソッド"
 
@@ -5048,7 +5084,7 @@ msgstr "拒否"
 msgid "Deny list"
 msgstr "拒否リスト"
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5056,7 +5092,7 @@ msgstr "拒否リスト"
 msgid "Dependencies"
 msgstr "依存関係"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "依存先"
 
@@ -5064,7 +5100,7 @@ msgstr "依存先"
 msgid "Dependent item"
 msgstr "依存アイテム"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5092,7 +5128,7 @@ msgstr "配布ステータス"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5256,7 +5292,7 @@ msgstr "選択したWebシナリオを無効にしますか？"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5269,14 +5305,14 @@ msgstr "選択したWebシナリオを無効にしますか？"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5359,7 +5395,7 @@ msgid "Discovery by proxy"
 msgstr "プロキシによるディスカバリ"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "ディスカバリチェック"
 
@@ -5371,7 +5407,7 @@ msgstr "ディスカバリチェック"
 msgid "Discovery list"
 msgstr "ディスカバリリスト"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "ディスカバリオブジェクト"
 
@@ -5467,7 +5503,7 @@ msgstr "ディスカバリのルールを更新しました"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5478,7 +5514,7 @@ msgstr "ディスカバリルール"
 msgid "Discovery rules deleted"
 msgstr "ディスカバリのルールを削除しました"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "ディスカバリのステータス"
@@ -5518,7 +5554,7 @@ msgstr "積算グラフ表示"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "%2$s件のうち%1$s件を表示しています"
@@ -5536,10 +5572,6 @@ msgstr "表示オプション"
 msgid "Division denominator"
 msgstr "除算分母"
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "計算しない"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5554,7 +5586,7 @@ msgstr "ヒストリを保存しない"
 msgid "Do not keep trends"
 msgstr "トレンドを保存しない"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "条件式を置き換えますか？"
 
@@ -5610,7 +5642,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr "イメージのダウンロード"
 
@@ -5619,7 +5651,7 @@ msgid "Download the configuration file"
 msgstr "設定ファイルのダウンロード"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "ダウンタイム"
@@ -5695,7 +5727,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のためのユーザー内のuserid \"%1$s\"が重複しています。"
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5717,7 +5749,7 @@ msgstr "ダイナミックアイテム"
 msgid "Dynamic items"
 msgstr "ダイナミックアイテム"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "各URLの名前は重複できません。同じURL名が使用されていないか確認してください"
 
@@ -5725,13 +5757,14 @@ msgstr "各URLの名前は重複できません。同じURL名が使用されて
 msgid "Each item"
 msgstr "アイテムごと"
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5743,8 +5776,8 @@ msgstr "アイテムごと"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "変更"
 
@@ -5760,11 +5793,11 @@ msgstr "マップの変更"
 msgid "Edit operation"
 msgstr "実行内容の変更"
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "ツリー要素の変更"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "トリガーの変更"
 
@@ -5921,7 +5954,7 @@ msgstr "SAML認証の有効化"
 
 #: app/views/administration.audit.settings.edit.php:43
 msgid "Enable audit logging"
-msgstr ""
+msgstr "監査ログの有効化"
 
 #: app/views/administration.housekeeping.edit.php:160
 msgid "Enable compression"
@@ -6039,7 +6072,7 @@ msgstr "トラッピングの有効化"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6061,12 +6094,12 @@ msgstr "トラッピングの有効化"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6125,7 +6158,7 @@ msgstr "UUID \\\"%1$s\\\"のエントリはすでに存在します。"
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6149,7 +6182,7 @@ msgstr "エラー"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "テーブル\"%1$s\"の検索リクエストに失敗しました。"
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "エラーメッセージ"
 
@@ -6188,7 +6221,7 @@ msgstr "イベント相関関係ルール"
 msgid "Event details"
 msgstr "イベント詳細"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "イベント生成"
 
@@ -6218,7 +6251,7 @@ msgstr "イベント名"
 msgid "Event tag pair"
 msgstr "イベントタグのペア"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "イベントタイプ"
 
@@ -6251,7 +6284,7 @@ msgstr "選択したものを除く"
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "含めない"
 
@@ -6262,7 +6295,7 @@ msgstr "含めない"
 msgid "Exclude host groups"
 msgstr "除外するホストグループ"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "実行"
 
@@ -6308,7 +6341,7 @@ msgstr "実行"
 msgid "Executed script"
 msgstr "実行するスクリプト"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "実行の確認"
 
@@ -6324,8 +6357,8 @@ msgid "Exists"
 msgstr "存在する"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "展開"
 
@@ -6392,7 +6425,7 @@ msgstr "CSVエクスポート"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6446,7 +6479,7 @@ msgstr "条件式"
 msgid "External check"
 msgstr "外部チェック"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6470,7 +6503,7 @@ msgid "Failed"
 msgstr "失敗"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "ダッシュボードの作成に失敗しました"
 
@@ -6479,24 +6512,24 @@ msgstr "ダッシュボードの作成に失敗しました"
 msgid "Failed to parse URL."
 msgstr "URLを解析できませんでした。"
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr "ダッシュボードページの貼り付けに失敗しました。"
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr "ウィジェットの貼り付けに失敗しました。"
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "ダッシュボードの更新に失敗しました"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr "ダッシュボードページのプロパティの変更に失敗しました。"
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr "ダッシュボードのプロパティの変更に失敗しました。"
 
@@ -6504,7 +6537,7 @@ msgstr "ダッシュボードのプロパティの変更に失敗しました。
 msgid "Failed to update template."
 msgstr "テンプレートの更新の失敗。"
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr "ウィジェットのプロパティの変更に失敗しました。"
 
@@ -6528,7 +6561,7 @@ msgstr ""
 msgid "Feb"
 msgstr "2月"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "2月"
 
@@ -6674,8 +6707,8 @@ msgstr "面"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6753,6 +6786,10 @@ msgstr "マップに合わせる"
 msgid "Fixed"
 msgstr "固定"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6818,14 +6855,14 @@ msgstr "フランス語 (fr_FR)"
 msgid "Fri"
 msgstr "金"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "金曜"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6843,7 +6880,7 @@ msgstr "WebインターフェースURL"
 msgid "Frontend access"
 msgstr "Webインターフェースへのアクセス"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Webインターフェースのアラート表示"
 
@@ -6925,7 +6962,7 @@ msgid "Get value from host"
 msgstr "ホストから値を取得"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "設定した条件式はマクロではありません"
 
@@ -6943,7 +6980,7 @@ msgstr "グローバル値"
 msgid "Go back to %1$s"
 msgstr "%1$sに戻る"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "次のページへ移動"
 
@@ -6992,7 +7029,7 @@ msgstr "グラデーションライン"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7152,7 +7189,7 @@ msgstr "\"%1$s\"の名前を持つグラフはグラフもしくはグラフの�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "グラフ"
 
@@ -7351,11 +7388,11 @@ msgstr "ヘルプ"
 msgid "Hexadecimal to decimal"
 msgstr "16進数から10進数"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "非表示"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "デバッグを隠す"
 
@@ -7400,14 +7437,14 @@ msgstr "行を強調表示"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "ヒストリ"
 
@@ -7471,7 +7508,7 @@ msgstr "横位置"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7479,8 +7516,7 @@ msgstr "横位置"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7492,7 +7528,7 @@ msgstr "横位置"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7569,7 +7605,7 @@ msgstr[0] "ホストを有効にしました"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7577,7 +7613,7 @@ msgstr[0] "ホストを有効にしました"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "ホストグループ"
@@ -7608,7 +7644,7 @@ msgstr "ホストグループのラベルタイプ"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のホストグループは使用できません。"
@@ -7625,7 +7661,7 @@ msgstr "ID \"%1$s\"のホストグループは使用できません。"
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7664,7 +7700,7 @@ msgstr "ホストインターフェース"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7811,7 +7847,7 @@ msgstr "同じホストの表示名\"%1$s\"を持つホストがすでに存在�
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8043,14 +8079,64 @@ msgstr "同一のネームスペース(%1$s)は%2$sにあるモジュールで�
 msgid "Identification of the system. Returns string"
 msgstr "システムの識別文字列。文字列値を返す。"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr "フィルターが一致した場合"
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr "ユーザーグループを指定しない場合は、少なくともメーリングリストに1人のユーザーを含める必要があります。"
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "このメッセージが間違っている場合は、必要な権限を得るために管理者に問い合わせてください"
@@ -8059,12 +8145,16 @@ msgstr "このメッセージが間違っている場合は、必要な権限を
 msgid "Iframe sandboxing exceptions"
 msgstr "Iframeサンドボックスの例外"
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "イメージ"
 
@@ -8194,7 +8284,7 @@ msgstr "アクセスできないアイテムのプロトタイプ"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8207,11 +8297,11 @@ msgstr "アクセスできないマップ"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "アクセスできないテンプレート"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "アクセスできないトリガー"
 
@@ -8237,7 +8327,7 @@ msgstr "アクセスできないユーザーグループ"
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "含める"
 
@@ -8255,6 +8345,11 @@ msgstr "サブグループを含める"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "ネットワークインターフェースの受信統計。整数値を返す。"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8645,7 +8740,7 @@ msgstr "アクション\"%1$s\"のフィルター条件タイプが正しくあ�
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "間違った関数が使用されています"
 
@@ -8702,7 +8797,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "トリガー条件式\"%2$s\"に正しくないアイテムキー\"%1$s\"が使用されています。"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "アイテムのデータ型が正しくありません"
 
@@ -8733,7 +8828,7 @@ msgstr "メディアタイプIDが正しくありません。"
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "メソッド\"%1$s.%2$s\"が正しくありません。"
@@ -8873,10 +8968,10 @@ msgstr "マップ\"%1$s\"の指定されたユーザーIDが正しくありま�
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "マップ\"%1$s\"の指定されたユーザーグループIDが正しくありません。"
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr "不正なユーザー名やパスワードまたはアカウントは一時的にブロックされます。"
@@ -9183,9 +9278,9 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。"
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9257,6 +9352,10 @@ msgstr "PSKフィールドに利用された値が正しくありません。16�
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "プロキシのステータス\"%1$s\"に使用されている値が正しくありません。"
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "インドネシア語 (id_ID)"
@@ -9268,12 +9367,12 @@ msgstr "無限大"
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9346,7 +9445,7 @@ msgid "Insert"
 msgstr "挿入"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "条件式の挿入"
 
@@ -9454,7 +9553,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9502,7 +9601,7 @@ msgstr "日付が正しくありません。"
 msgid "Invalid email address \"%1$s\"."
 msgstr "メールアドレス\"%1$s\"が正しくありません。"
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが正しくありません。"
@@ -9605,8 +9704,8 @@ msgstr "メソッドのパラメータが正しくありません。"
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9810,7 +9909,7 @@ msgstr "期間が正しくありません。"
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "インベントリ"
 
@@ -9996,7 +10095,7 @@ msgstr "アイテムのプロトタイプを更新しました"
 msgid "Item tags"
 msgstr "アイテムタグ"
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr "アイテムタイプはインターフェースを使用しません"
 
@@ -10157,7 +10256,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "1月"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "1月"
 
@@ -10179,7 +10278,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "7月"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "7月"
 
@@ -10187,7 +10286,7 @@ msgstr "7月"
 msgid "Jun"
 msgstr "6月"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "6月"
 
@@ -10221,7 +10320,7 @@ msgstr "キー"
 msgid "Key passphrase"
 msgstr "キーのパスフレーズ"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "キーワード"
 
@@ -10291,7 +10390,7 @@ msgstr "ラベルの位置"
 msgid "Language"
 msgstr "言語"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr "言語\"%1$s\"はサポートしていません。"
@@ -10364,11 +10463,11 @@ msgstr "最終アクセス日時"
 msgid "Last check"
 msgstr "最新のチェック時刻"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "最新1時間のグラフ"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "最新1ヶ月のグラフ"
 
@@ -10377,7 +10476,7 @@ msgstr "最新1ヶ月のグラフ"
 #: app/views/administration.user.list.php:71
 #: app/views/administration.user.list.php:109
 msgid "Last name"
-msgstr ""
+msgstr "姓"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:62
 #: app/controllers/CControllerPopupTriggerExpr.php:76
@@ -10406,7 +10505,7 @@ msgstr "最終送信日時"
 msgid "Last value"
 msgstr "最新の値"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "最新1週間のグラフ"
 
@@ -10419,11 +10518,11 @@ msgstr "最新1週間のグラフ"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "最新データ"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "最新の値"
 
@@ -10534,7 +10633,7 @@ msgid "Link new templates"
 msgstr "新規テンプレートをリンク"
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10612,12 +10711,12 @@ msgstr "Windowsパフォーマンスカウンターのオブジェクトイン�
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr "Windowsパフォーマンスカウンターのオブジェクトインスタンスのリスト。JSONで返す"
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "共有するユーザーグループ"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "共有するユーザー"
@@ -10745,7 +10844,7 @@ msgstr "ローレベルディスカバリが\"取得不可\"の状態"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10901,11 +11000,11 @@ msgstr "定期レポートの管理"
 
 #: include/classes/helpers/CRoleHelper.php:503
 msgid "Manage services"
-msgstr ""
+msgstr "サービスの管理"
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10934,7 +11033,7 @@ msgstr "手動クローズ済"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "マップ"
 
@@ -10973,7 +11072,7 @@ msgstr "アイコンのラベルの位置"
 msgid "Map element label type"
 msgstr "アイコンのラベルのタイプ"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr "マップを更新しました！ マップ一覧に戻りますか？"
 
@@ -10999,7 +11098,7 @@ msgstr "マップの所有者は必須項目です。"
 msgid "Map shape"
 msgstr "マップ図形"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "マップの更新に失敗しました。"
 
@@ -11035,7 +11134,7 @@ msgstr "マップ"
 msgid "Mar"
 msgstr "3月"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "3月"
 
@@ -11062,7 +11161,7 @@ msgstr "マスク"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11133,10 +11232,10 @@ msgstr "OSがサポートしている最大ファイルオープン数。整数�
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "OSがサポートしている最大プロセス数。整数値を返す。"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
-msgstr "要求されるデータベースの最大バージョンは%1$sです。"
+msgid "Maximum required %1$s database version is %2$s."
+msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
 #: include/classes/mvc/CController.php:259
@@ -11147,12 +11246,12 @@ 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日です。"
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが最大長を超えています。"
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "5月"
 
@@ -11162,8 +11261,8 @@ msgid "May"
 msgstr "5月"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "メディア"
 
@@ -11221,7 +11320,7 @@ msgstr "メディアタイプのテストに成功しました。"
 msgid "Media type updated"
 msgstr "メディアタイプを更新しました"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のメディアタイプは使用できません。"
@@ -11294,8 +11393,8 @@ msgstr "メッセージテンプレート"
 msgid "Message templates"
 msgstr "メッセージテンプレート"
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "表示期間"
 
@@ -11313,7 +11412,7 @@ msgstr "メッセージ/コマンド"
 msgid "Messages"
 msgstr "メッセージ"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "アラート表示"
 
@@ -11341,6 +11440,11 @@ msgstr "最小値"
 msgid "Minimum password length"
 msgstr "最小パスワード長"
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11356,11 +11460,6 @@ msgstr "PHPアップロードファイルサイズの最小値は%1$sです (\"u
 msgid "Minimum required PHP version is %1$s."
 msgstr "最低限必要なPHPのバージョンは%1$sです。"
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr "要求されるデータベースの最小バージョンは%1$sです。"
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11501,7 +11600,7 @@ msgstr "モジュールを更新しました"
 msgid "Mon"
 msgstr "月"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "月曜"
 
@@ -11541,11 +11640,11 @@ msgstr "月"
 msgid "Monthly"
 msgstr "毎月"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "条件に一致するデータがさらに存在します..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11561,6 +11660,14 @@ msgstr "10分以上"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "ホストに\"%1$s\"の名前を持つグラフが1つ以上存在します。"
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11570,11 +11677,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "複数"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "障害イベントを継続して生成"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "ミュート"
 
@@ -11582,6 +11689,18 @@ msgstr "ミュート"
 msgid "My"
 msgstr "私が作成"
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11676,25 +11795,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11837,6 +11957,10 @@ msgstr "インターバル中のネットワーク使用率(送信レートと�
 msgid "Never"
 msgstr "未監視"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11848,7 +11972,7 @@ msgstr "新規条件"
 msgid "New dashboard"
 msgstr "新規ダッシュボード"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "新規要素"
 
@@ -11872,7 +11996,7 @@ msgstr "実行内容の作成"
 msgid "New regular expression"
 msgstr "正規表現の作成"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11889,7 +12013,7 @@ msgid "New triggers"
 msgstr "新規トリガー"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr "次のページ"
 
@@ -11907,20 +12031,20 @@ msgstr "次のステップ"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12053,7 +12177,7 @@ msgstr "詳細がありません"
 msgid "No discovery rule IDs given."
 msgstr "ディスカバリルールIDが設定されていません。"
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr "有効なモジュールがありません。"
@@ -12115,7 +12239,7 @@ msgstr "イメージは存在しません"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "インターフェースが見つかりません。"
 
@@ -12155,7 +12279,7 @@ msgstr "マクロが設定されていません。"
 msgid "No maps added."
 msgstr "マップが追加されていません。"
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "条件に一致するデータはありません"
 
@@ -12168,8 +12292,8 @@ msgstr "新しいモジュールは見つかりませんでした"
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "相関関係\"%1$s\"に実行内容のタイプが定義されていません。"
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "システムへのアクセス権がありません。"
 
@@ -12181,7 +12305,6 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12189,11 +12312,12 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12311,19 +12435,19 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12332,15 +12456,15 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12367,7 +12491,7 @@ msgstr "公開鍵ファイルが設定されていません。"
 msgid "No recipients for action operation message."
 msgstr "実行するアクションのメッセージに送信先が設定されていません。"
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "リフレッシュなし"
 
@@ -12383,7 +12507,7 @@ msgstr "何も選択されていません"
 msgid "No target selected."
 msgstr "何も選択されていません。"
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12430,7 +12554,7 @@ msgstr "なし"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12462,15 +12586,15 @@ msgstr "すべての結果が表示されるわけではありません。 よ�
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "すべてのテンプレートは\"%1$s\"にリンクされていません。"
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "\"guest\"ユーザーは言語を設定できません。"
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "ゲストユーザーはパスワードを設定できません。"
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "\"guest\"ユーザーはテーマを設定できません。"
 
@@ -12502,8 +12626,8 @@ msgstr "継承していないアイテム"
 msgid "Not supported"
 msgstr "取得不可"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "説明"
 
@@ -12533,7 +12657,7 @@ msgstr "障害通知送信済のユーザーすべてにメッセージを送信
 msgid "Nov"
 msgstr "11月"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "11月"
 
@@ -12696,12 +12820,12 @@ msgstr "数値変換"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "数値 (浮動小数)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "数値 (整数)"
 
@@ -12716,18 +12840,17 @@ msgstr "数値 (整数)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "正常"
@@ -12754,7 +12877,7 @@ msgstr "OOBルータ"
 msgid "OOB subnet mask"
 msgstr "OOBサブネットマスク"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "OR"
 
@@ -12782,13 +12905,13 @@ msgstr "10月"
 msgid "Octal to decimal"
 msgstr "8進数から10進数"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "10月"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "OFF"
 
@@ -12800,7 +12923,7 @@ msgstr "OFF"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "正常"
@@ -12819,7 +12942,7 @@ msgstr "古いタグ名"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "ON"
 
@@ -12827,7 +12950,7 @@ msgstr "ON"
 msgid "On status change triggers blink for"
 msgstr "ステータスが変化したイベントの点滅期間"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "一度だけ"
 
@@ -12844,7 +12967,7 @@ msgid "One time only"
 msgstr "一度限り"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "一時的なダウンタイム"
 
@@ -12856,26 +12979,14 @@ msgstr "特権管理者のみがホストグループを作成できます。"
 msgid "Only Super Admins can create media types."
 msgstr "特権管理者のみがメディアタイプを作成できます。"
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "特権管理者のみがユーザーグループを作成できます。"
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "特権管理者のみがメディアタイプを削除できます。"
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "特権管理者のみがユーザーグループを削除できます。"
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "特権管理者のみがメディアタイプを修正できます。"
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "特権管理者のみがユーザーグループを更新できます。"
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Zabbixエージェント、SNMPv1、SNMPv2、SNMPv3がユニークかどうかだけチェックします。"
@@ -12915,11 +13026,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] "選択した障害のみ"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12952,7 +13063,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "OS情報。文字列値を返す。"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr "処理内容"
 
@@ -12977,7 +13088,7 @@ msgstr "操作対象のグループがありません。"
 msgid "Operation has no template to operate."
 msgstr "操作対象のテンプレートがありません。"
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13002,27 +13113,27 @@ msgstr "実行内容"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "オペレータ"
 
@@ -13047,7 +13158,7 @@ msgstr "オプション"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13064,8 +13175,8 @@ msgstr "Or"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13112,9 +13223,9 @@ msgstr "Or"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "変更なし"
 
@@ -13366,7 +13477,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "障害"
@@ -13413,7 +13524,7 @@ msgstr "PSKアイデンティティ"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSKが短すぎます。最低%1$s桁の16進数で設定してください。"
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr "ページ %1$d"
@@ -13436,13 +13547,15 @@ msgstr "ページャー"
 msgid "Parameter"
 msgstr "パラメータ"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13473,9 +13586,7 @@ msgstr "親アイテム"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13552,7 +13663,7 @@ msgstr "パスワードは内部認証タイプ以外には必須ではありま
 
 #: app/views/administration.authentication.edit.php:45
 msgid "Password must contain"
-msgstr ""
+msgstr "パスワード必須項目"
 
 #: app/views/administration.authentication.edit.php:39
 msgid "Password policy"
@@ -13564,15 +13675,19 @@ msgstr "パスワードポリシー"
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "貼り付け"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr "ウィジェットの貼り付け"
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "リンクなしで貼り付け"
 
@@ -13646,19 +13761,20 @@ msgid "Periods"
 msgstr "監視対象のメンテナンス期間"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "権限"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "権限はユーザーグループにのみ割り当てることができます。"
 
@@ -13680,12 +13796,12 @@ msgstr "配置アルゴリズム"
 msgid "Plain text"
 msgstr "プレーンテキスト"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "再生"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "サウンド再生"
 
@@ -13715,7 +13831,7 @@ msgstr "\"allow_url_fopen\"ディレクティブを有効にしてください�
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Zabbixサーバーのホスト名かホストのIPアドレスとポート番号をを入力してください。必要に応じて名前も入力してください。"
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "2つの要素を選択してください"
 
@@ -13844,7 +13960,7 @@ msgid "Previous month"
 msgstr "先月"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr "前のページ"
 
@@ -13902,7 +14018,7 @@ msgstr "プライバシーパスフレーズ"
 msgid "Privacy protocol"
 msgstr "プライバシープロトコル"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "非公開"
@@ -13922,12 +14038,12 @@ msgid "Privilege level"
 msgstr "特権レベル"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13957,7 +14073,7 @@ msgstr "障害発生"
 msgid "Problem display"
 msgstr "障害の表示"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "障害の条件式"
@@ -13975,7 +14091,7 @@ msgstr "メンテナンス期間外"
 msgid "Problem is suppressed"
 msgstr "メンテナンス期間中"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "障害"
 
@@ -13988,8 +14104,8 @@ msgstr "障害復旧"
 msgid "Problem resolved"
 msgstr "障害解決済"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14002,14 +14118,6 @@ msgstr ""
 msgid "Problem update"
 msgstr "障害更新"
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "すべての子に障害があった場合に障害として検知"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "子に一つでも障害があった場合に障害として検知"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14026,7 +14134,7 @@ msgstr "子に一つでも障害があった場合に障害として検知"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "障害"
 
@@ -14060,12 +14168,12 @@ msgid "Prometheus to JSON"
 msgstr "PrometheusからJSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "プロパティ"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14087,7 +14195,7 @@ msgstr "プロキシ"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14149,7 +14257,7 @@ msgstr "プロキシ名"
 msgid "Proxy updated"
 msgstr "プロキシを更新しました"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "公開"
@@ -14243,8 +14351,8 @@ msgstr "表示のみ"
 msgid "Read only"
 msgstr "表示のみ"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14252,8 +14360,8 @@ msgstr "表示のみ"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14306,7 +14414,7 @@ msgstr "受信者"
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14314,7 +14422,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "復旧"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14349,7 +14457,7 @@ msgstr "長方形"
 msgid "Refresh"
 msgstr "リフレッシュ"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "リフレッシュ間隔"
 
@@ -14409,7 +14517,7 @@ msgstr "正規表現"
 msgid "Related reports"
 msgstr "関連するレポート"
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr "作成したウィジェットを離す。"
 
@@ -14441,6 +14549,7 @@ msgstr "リモートコマンド"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14450,7 +14559,7 @@ msgstr "リモートコマンド"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14458,13 +14567,13 @@ msgstr "リモートコマンド"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14474,8 +14583,8 @@ msgstr "リモートコマンド"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14552,8 +14661,8 @@ msgstr "リモートコマンド"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "削除"
 
@@ -14593,7 +14702,7 @@ msgstr "%1$sの削除"
 msgid "Removed"
 msgstr "削除しました"
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14622,7 +14731,7 @@ msgstr "繰り返し"
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14630,7 +14739,7 @@ msgstr "繰り返し"
 msgid "Replace"
 msgstr "置換"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "依存関係を置換"
 
@@ -14737,7 +14846,7 @@ msgstr "要求ステータスコード"
 msgid "Required string"
 msgstr "要求文字列"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "リセット"
@@ -14771,7 +14880,7 @@ msgstr "リセットの確認"
 msgid "Reset defaults"
 msgstr "デフォルトにリセット"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "解決済"
 
@@ -14969,8 +15078,8 @@ msgstr "右側Y軸"
 msgid "Right trim"
 msgstr "末尾文字列削除"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr "ユーザーの役割"
 
@@ -15028,12 +15137,12 @@ msgstr "ホスト上で指定したコマンドの実行。コマンドの実行
 msgid "Russian (ru_RU)"
 msgstr "ロシア語 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15044,10 +15153,8 @@ msgstr "SAML認証の設定"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15260,7 +15367,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "土"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "土曜"
 
@@ -15429,7 +15536,7 @@ msgstr "スクリプトを更新しました"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "スクリプト"
 
@@ -15499,8 +15606,8 @@ msgid "Security name"
 msgstr "セキュリティ名"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15508,7 +15615,7 @@ msgstr "セキュリティ名"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "選択"
 
@@ -15544,19 +15651,19 @@ msgstr "選択した要素"
 msgid "Selected items only"
 msgstr "選択したアイテムのみ"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "%3$dの%2$dの位置にある%1$sを選択しました"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "%3$dの%2$dの位置にある読み込み専用の%1$sを選択しました"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "後面へ"
 
@@ -15581,7 +15688,7 @@ msgstr "次のメディアのみ使用"
 msgid "Send to"
 msgstr "送信先"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "再後面へ"
 
@@ -15614,7 +15721,7 @@ msgstr "障害数と未確認数を表示"
 msgid "Separately"
 msgstr "別々に"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "9月"
 
@@ -15646,48 +15753,43 @@ msgid "Server time"
 msgstr "サーバー時間"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "サービス"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
 #: include/views/configuration.action.list.php:28
 msgid "Service actions"
-msgstr ""
+msgstr "サービスアクション"
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "サービスを作成しました"
 
 #: app/views/administration.housekeeping.edit.php:58
 msgid "Service data storage period"
-msgstr ""
+msgstr "サービスデータの保存期間"
 
 #: app/controllers/CControllerServiceDelete.php:64
 #, fuzzy
@@ -15709,7 +15811,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "サービス開始時刻は終了時刻よりも前でなければなりません。"
 
@@ -15725,11 +15827,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "サービスタイム"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "サービスのタイプ"
 
@@ -15738,7 +15840,7 @@ msgstr "サービスのタイプ"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "サービスを更新しました"
 
@@ -15747,16 +15849,16 @@ msgstr "サービスを更新しました"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "サービス"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "サービスの依存関係が循環設定されています。"
 
@@ -15768,9 +15870,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr "セッション初期化エラー。"
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "セッションが切断されました。再度ログインしてください。"
 
@@ -15794,10 +15896,18 @@ msgstr "有効期限の設定"
 msgid "Set host inventory mode"
 msgstr "インベントリモードの設定"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr "新しい値を設定"
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15838,7 +15948,7 @@ msgstr "設定"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15884,7 +15994,7 @@ msgstr "Share"
 msgid "Shared"
 msgstr "共有済"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "共有"
 
@@ -15975,7 +16085,7 @@ msgstr "サイドバーを表示"
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16026,7 +16136,7 @@ msgstr "Zabbixサーバー停止時にワーニングを表示"
 msgid "Show working time"
 msgstr "ワーキングタイムの表示"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "表示"
 
@@ -16135,7 +16245,7 @@ msgstr "ホスト\"%2$s\"へのグラフ\"%1$s\"のコピーをスキップし�
 msgid "Slovak (sk_SK)"
 msgstr "スロバキア語 (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "スヌーズ"
 
@@ -16181,7 +16291,7 @@ msgstr "このアイテムのヒストリの一部は圧縮されている可能
 msgid "Sort entries by"
 msgstr "次による項目のソート"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "ソート順(0->999)"
 
@@ -16255,7 +16365,7 @@ msgstr "開始時刻"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr "スライドショーの開始"
 
@@ -16303,12 +16413,14 @@ msgstr "Zabbixの書き込みキャッシュの統計。cacheがvaluesならmode
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16319,17 +16431,24 @@ msgstr "Zabbixの書き込みキャッシュの統計。cacheがvaluesならmode
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16353,13 +16472,10 @@ msgstr "Zabbixの書き込みキャッシュの統計。cacheがvaluesならmode
 msgid "Status"
 msgstr "ステータス"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "ステータスの計算"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "ステータスの計算方法"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16390,6 +16506,10 @@ msgstr "ステータスのみ"
 msgid "Status problem"
 msgstr "障害"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16421,8 +16541,8 @@ msgstr "\"%1$s\"の名前を持つステップがすでに存在します。"
 msgid "Steps"
 msgstr "ステップ"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "停止"
 
@@ -16434,7 +16554,7 @@ msgstr "処理の停止"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr "スライドショーの停止"
 
@@ -16466,7 +16586,7 @@ msgid "Strict"
 msgstr "限定"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr "文字列"
 
@@ -16499,7 +16619,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "サブジェクト"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "サブマップ"
 
@@ -16515,7 +16635,7 @@ msgstr "配信先"
 msgid "Success Audit"
 msgstr "成功の監査"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "成功メッセージ"
 
@@ -16528,7 +16648,7 @@ msgstr "ネットワークインターフェースの送受信合計値。整数
 msgid "Sun"
 msgstr "日"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "日曜"
 
@@ -16620,12 +16740,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "システムの稼働秒数。整数値を返す。"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16661,8 +16781,8 @@ msgstr "テーブル\"%1$s\"にフィールド名\"%2$s\"が存在しません�
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "タグ"
@@ -16702,14 +16822,13 @@ msgstr "タグの値"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16717,10 +16836,10 @@ msgstr "タグの値"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16884,7 +17003,7 @@ msgstr "同じ表示名\"%1$s\"を持つテンプレートがすでに存在し�
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17167,12 +17286,12 @@ msgstr "絞り込み"
 msgid "Thu"
 msgstr "木"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "木曜"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "終了"
 
@@ -17182,13 +17301,13 @@ msgstr "終了"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17269,7 +17388,7 @@ msgstr "タイムスタンプ"
 msgid "To"
 msgstr "終了"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "すべてのアイテムのため1つのホストインターフェースを選択する必要があります"
 
@@ -17391,13 +17510,13 @@ msgstr "トレンド"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "トリガー"
 
@@ -17416,7 +17535,7 @@ msgstr "トリガー\"%1$s\"はリンクされている他のテンプレート�
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "トリガー\"%1$s\"は存在しないトリガー\"%2$s\"に依存しています。"
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr "トリガーURL"
 
@@ -17497,7 +17616,7 @@ msgstr "トリガーの概要"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17563,15 +17682,15 @@ msgstr "トリガーのプロトタイプを削除しました"
 msgid "Trigger prototypes updated"
 msgstr "トリガーのプロトタイプを更新しました"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "トリガーの深刻度"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "トリガーのステータス \"正常\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "トリガーのステータス \"障害\""
 
@@ -17623,7 +17742,7 @@ msgstr "前後文字列削除"
 msgid "Tue"
 msgstr "火"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "火曜"
 
@@ -17636,7 +17755,7 @@ msgstr "トルコ語 (tr_TR)"
 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\"を自動的に設定することはできません。"
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "2つのマップ要素を選択する必要があります"
 
@@ -17651,15 +17770,16 @@ msgstr "2つのマップ要素を選択する必要があります"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17726,7 +17846,7 @@ msgid "UNKNOWN"
 msgstr "不明"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17736,7 +17856,7 @@ msgstr "不明"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17782,7 +17902,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "マップ\"%1$s\"のURLには\"name\"と\"url\"の両方のフィールドが必要です。"
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URL"
 
@@ -17830,7 +17950,7 @@ msgstr "設定APIの引数が読み込めません。"
 msgid "Unable to overwrite the existing configuration file."
 msgstr "設定ファイルが上書きできません。"
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr "データベースのバージョンを取得できません。"
 
@@ -17877,7 +17997,8 @@ msgstr "選択したユーザーのブロックを解除しますか？"
 msgid "Unexpected response for action %1$s."
 msgstr "アクション%1$sから想定外の応答を受信しました。"
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17896,7 +18017,8 @@ msgstr "単位"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17907,9 +18029,9 @@ msgstr "単位"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "不明"
@@ -17928,12 +18050,12 @@ msgstr "不明なエラー"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "不明なアイテム。選択したホストにそのようなアイテムは存在しません"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "不明なホスト。そのようなホストは存在しません"
 
@@ -17980,7 +18102,7 @@ msgstr "テンプレートとのリンクを解除"
 msgid "Unlink from templates"
 msgstr "テンプレートとのリンクを解除"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "ミュートを解除"
 
@@ -18060,27 +18182,28 @@ msgstr "Up"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18149,7 +18272,7 @@ msgid "Upper level maps"
 msgstr "上位レベルのマップ"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "アップタイム"
@@ -18198,37 +18321,37 @@ msgstr "アクションで使用"
 msgid "User"
 msgstr "ユーザー"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "ユーザー\"%1$s\"にユーザーグループを設定してください。"
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "ユーザー\"%1$s\"はダッシュボード\"%2$s\"の所有者です。"
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "ユーザー\"%1$s\"はマップ\"%2$s\"の所有者です。"
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr "ユーザー\"%1$s\"はレポート\"%2$s\"の所有者です。"
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr "ユーザー\"%1$s\"はレポート\"%2$s\"の受信者です。"
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "ユーザー\"%1$s\"は\"%2$s\"アクション内で使用されています。"
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr "ユーザー\"%1$s\"は代わりにレポート\"%2$s\"を作成したユーザーです。"
@@ -18245,13 +18368,13 @@ msgstr "ユーザーを追加しました"
 msgid "User agent string"
 msgstr "ユーザーエージェント文字列"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "ユーザーは無効のグループやGUIアクセスが無効のグループに自分自身を追加できません。"
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr "ユーザーは自分の役割を変更できません。"
 
@@ -18275,32 +18398,32 @@ msgstr[0] "ユーザーを削除しました"
 msgid "User group"
 msgstr "ユーザーグループ"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "ユーザーグループ\"%1$s\"はすでに存在します。"
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr "ユーザーグループ\"%1$s\"はレポート\"%2$s\"の受信者です。"
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "ユーザーグループ\"%1$s\"は\"%2$s\"アクション内で使用されています。"
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "ユーザーグループ\"%1$s\"はデータベース停止メッセージの設定に利用されています。"
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "ユーザーグループ\"%1$s\"はスクリプト\"%2$s\"に利用されています。"
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr "ユーザーグループを追加しました"
 
@@ -18329,7 +18452,7 @@ msgstr[0] "ユーザーグループを更新しました"
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のユーザーグループは使用できません。"
@@ -18337,14 +18460,14 @@ msgstr "ID \"%1$s\"のユーザーグループは使用できません。"
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "ユーザーグループ"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "自身のユーザーアカウントは削除できません。"
 
@@ -18392,7 +18515,7 @@ msgstr[0] "ユーザーの役割を削除しました"
 msgid "User role updated"
 msgstr "ユーザーの役割を更新しました"
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr "ID\"%1$s\"のユーザーの役割は存在しません。"
@@ -18426,7 +18549,7 @@ msgstr "ユーザー設定"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のユーザーでの共有にはパラメータ:%1$s が必要です。"
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18446,12 +18569,12 @@ msgstr "ユーザーを更新しました"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のユーザーは使用できません。"
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr "\"%1$s\"というユーザー名のユーザーはすでに存在します。"
@@ -18496,7 +18619,7 @@ msgstr "ユーザー名の属性"
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18763,23 +18886,23 @@ msgstr "バリデーション"
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18986,8 +19109,8 @@ msgstr "縦位置"
 msgid "Vietnamese (vi_VN)"
 msgstr "ベトナム語 (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr "ビュー"
@@ -19014,7 +19137,12 @@ msgstr "表示名"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "ホスト名を設定しない場合、表示名は必須項目です。"
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19031,11 +19159,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "警告"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr "警告メッセージ"
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "要素を保存できる最大値に達しました"
 
@@ -19051,7 +19179,7 @@ msgstr "要素を保存できる最大値に達しました"
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19118,7 +19246,7 @@ msgstr "Webhookにはパラメータがありません。"
 msgid "Wed"
 msgstr "水"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "水曜"
 
@@ -19129,6 +19257,10 @@ msgstr "水曜"
 msgid "Weekly"
 msgstr "毎週"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "ようこそ"
@@ -19146,7 +19278,7 @@ msgstr "有効な時間帯"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr "ダッシュボード\"%1$s\"のページ#%2$d上の X:%3$d, Y:%4$d のウィジェットは範囲外です。"
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "指定された列と行の数に対してウィジェットが小さすぎます。"
 
@@ -19359,8 +19491,8 @@ msgid "YYYY-MM-DD"
 msgstr "YYYY-MM-DD"
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19402,19 +19534,19 @@ msgstr "毎年"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19482,19 +19614,15 @@ msgstr "アクションのグローバルスクリプト\"%1$s\"のターゲッ�
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "操作に対する権限がありません。"
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "ユーザーを作成する権限がありません。"
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "このページを表示する権限がありません。"
@@ -19615,7 +19743,7 @@ msgstr "DNS名を指定してください"
 msgid "a boolean is expected"
 msgstr "論理値で指定してください"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19630,7 +19758,7 @@ msgstr "日付はYYYY-MM-DDフォーマットで指定してください。"
 
 #: app/views/administration.authentication.edit.php:80
 msgid "a digit"
-msgstr ""
+msgstr "数字"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
 #: include/classes/validators/CApiInputValidator.php:697
@@ -19682,7 +19810,7 @@ msgstr "相対的な時間で指定してください"
 
 #: app/views/administration.authentication.edit.php:87
 msgid "a special character"
-msgstr ""
+msgstr "特殊記号"
 
 #: include/classes/validators/CApiInputValidator.php:2233
 msgid "a string, number or null value is expected"
@@ -19716,7 +19844,7 @@ msgstr "abs() - 絶対値"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:308
 msgid "acos() - The arccosine of a value as an angle, expressed in radians"
-msgstr ""
+msgstr "acos() - 角度の値のアークコサイン、ラジアンで示す"
 
 #: include/forms.inc.php:157
 msgid "affects only filtered data"
@@ -19734,7 +19862,6 @@ msgstr "エージェント"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -19826,7 +19953,7 @@ msgstr "符号なし整数で指定してください"
 
 #: app/views/administration.authentication.edit.php:73
 msgid "an uppercase and a lowercase Latin letter"
-msgstr ""
+msgstr "英字の大文字と小文字"
 
 #: include/views/monitoring.history.php:186
 msgid "as Blue"
@@ -19857,7 +19984,7 @@ msgstr "ascii() - 値の左端の文字のASCIIコードを返す"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:322
 msgid "asin() - The arcsine of a value as an angle, expressed in radians"
-msgstr ""
+msgstr "asin() - 角度の値のアークサイン、ラジアンで示す"
 
 #: app/controllers/CControllerPopupScheduledReportCreate.php:71
 #: app/controllers/CControllerScheduledReportCreate.php:83
@@ -19871,11 +19998,11 @@ msgstr "少なくとも1つのオーバーライドオプションを指定す�
 
 #: app/controllers/CControllerPopupTriggerExpr.php:329
 msgid "atan() - The arctangent of a value as an angle, expressed in radians"
-msgstr ""
+msgstr "atan() - 角度の値のアークタンジェント、ラジアンで示す"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:336
 msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
-msgstr ""
+msgstr "atan2() - ラジアンで表された角度として指定された縦座標(exprue)と横座標のアークタンジェント"
 
 #: include/events.inc.php:63
 msgid "autoregistered host"
@@ -20030,9 +20157,9 @@ msgstr "変更できません"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20112,7 +20239,7 @@ msgstr "循環する依存関係は許可されていません"
 msgid "circular item dependency is not allowed"
 msgstr "循環するアイテムの依存関係は許可されていません"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20137,15 +20264,15 @@ msgstr "含む"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:500
 msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
-msgstr ""
+msgstr "cos() - 値のコサイン、ラジアンで示された角度の値"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:507
 msgid "cosh() - The hyperbolic cosine of a value"
-msgstr ""
+msgstr "cosh() - 値のハイパボリックコサイン"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:514
 msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
-msgstr ""
+msgstr "cot() - 値のコタンジェント、ラジアンで示された角度の値"
 
 #: include/graphs.inc.php:82
 msgid "count"
@@ -20157,9 +20284,9 @@ msgstr "count() - 期間Tで収集された値V(オペレータOを満たす)の
 
 #: app/controllers/CControllerPopupTriggerExpr.php:528
 msgid "countunique() - The number of unique values"
-msgstr ""
+msgstr "countunique() - ユニークな値の数"
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20197,7 +20324,7 @@ msgstr "デフォルト"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:553
 msgid "degrees() - Converts a value from radians to degrees"
-msgstr ""
+msgstr "degrees() - 値をラジアンから角度に変換"
 
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
@@ -20272,7 +20399,7 @@ msgstr "一致しない"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:560
 msgid "e() - Returns Euler's number"
-msgstr ""
+msgstr "e() - オイラー数を返す"
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
 #: include/actions.inc.php:24 include/correlation.inc.php:31
@@ -20298,11 +20425,11 @@ msgstr "存在する"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:565
 msgid "exp() - Euler's number at a power of a value"
-msgstr ""
+msgstr "exp() - オイラー数の累乗値"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:572
 msgid "expm1() - Euler's number at a power of a value minus 1"
-msgstr ""
+msgstr "expm1() - オイラー数の累乗値マイナス1"
 
 #: include/classes/parsers/CConditionFormula.php:214
 msgid "expression is empty"
@@ -20314,7 +20441,7 @@ msgstr "JSONの解析に失敗しました"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
-msgstr ""
+msgstr "find() - 期間TでのパターンV(演算子0を満たす)の発生チェック(1 - 合致する、0 - 合致しない)"
 
 #: app/views/popup.maintenance.period.php:124 include/graphs.inc.php:86
 #: include/maintenances.inc.php:105
@@ -20328,7 +20455,7 @@ msgstr "最初のパラメータを指定してください"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:586
 msgid "first() - The oldest value in the specified time interval"
-msgstr ""
+msgstr "first() - 指定された時間間隔で最も古い値"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:593
 msgid "floor() - Rounds down to the nearest smaller integer"
@@ -20358,13 +20485,13 @@ msgstr "データの保存期間設定(全体設定)"
 msgid "graph pattern"
 msgstr "グラフのパターン"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20412,7 +20539,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr "in() - 値がリストアップされた値と同じかチェック (1 - 同じ、0 - その他)"
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "サブグループを含む"
 
@@ -20454,7 +20581,7 @@ msgstr "関数\"%1$s\"の使い方が正しくありません"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:627
 msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
-msgstr ""
+msgstr "insert() - 文字列内の指定した開始位置から指定した文字列かスペースを挿入する"
 
 #: include/events.inc.php:37
 msgctxt "event source"
@@ -20600,11 +20727,11 @@ msgstr "左"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:664
 msgid "left() - Returns the leftmost count characters"
-msgstr ""
+msgstr "left() - 左端の文字をカウント"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:677
 msgid "length() - Length of last (most recent) T value in characters"
-msgstr ""
+msgstr "length() - 文字列内の最後(最新)のT値の長さ"
 
 #: include/forms.inc.php:1282 include/views/js/item.preprocessing.js.php:134
 msgid "list of characters"
@@ -20636,14 +20763,14 @@ msgstr "ローレベルディスカバリルール"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:718
 msgid "ltrim() - Remove specified characters from the beginning of a string"
-msgstr ""
+msgstr "ltrim() - 文字列の先頭から指定した文字列を削除"
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20668,7 +20795,7 @@ msgstr "マクロ"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:731
 msgid "mad() - Median absolute deviation"
-msgstr ""
+msgstr "mad() - 中央絶対偏差"
 
 #: include/classes/validators/CHistFunctionValidator.php:91
 #, c-format
@@ -20747,14 +20874,14 @@ msgstr "min() - 期間Tでの最小値"
 msgid "minimum length is %1$s characters"
 msgstr "%1$s文字以上で指定してください"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:770
 msgid "mod() - Division remainder"
-msgstr ""
+msgstr "mod() - 割り算の余り"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:783
 msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
@@ -20843,7 +20970,7 @@ msgstr ""
 msgid "name"
 msgstr "名前"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "新規"
 
@@ -20910,7 +21037,7 @@ msgstr "now() - エポックを基準とした経過秒数"
 msgid "number"
 msgstr "数値"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "of"
@@ -20978,7 +21105,7 @@ msgstr "出力"
 msgid "path/to/secret"
 msgstr "path/to/secret"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr "path/to/secret:key"
 
@@ -21007,7 +21134,7 @@ msgstr "障害パターン"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:835
 msgid "radians() - Converts a value from degrees to radians"
-msgstr ""
+msgstr "radians() - 値を角度からラジアンに変換"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:842
 msgid "rand() - A random integer value"
@@ -21105,7 +21232,7 @@ msgstr "選択"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "説明"
 
@@ -21156,15 +21283,15 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
-msgstr ""
+msgstr "sin() - 値のサイン、ラジアンで示された角度の値"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sinh() - The hyperbolic sine of a value"
-msgstr ""
+msgstr "sinh() - 値のハイパボリックサイン"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "skewness() - Measures the asymmetry of the probability distribution"
-msgstr ""
+msgstr "skewness() - 確率分布の非対称性を測定"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "sqrt() - Square root of a value"
@@ -21172,11 +21299,11 @@ msgstr "sqrt() - 値の平方根"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "stddevpop() - Population standard deviation"
-msgstr ""
+msgstr "stddevpop() - 母標準偏差"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevsamp() - Sample standard deviation"
-msgstr ""
+msgstr "stddevsamp() - サンプル標準偏差"
 
 #: include/graphs.inc.php:84
 msgid "sum"
@@ -21188,9 +21315,9 @@ msgstr "sum() - 期間Tでの合計値"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sumofsquares() - The sum of squares"
-msgstr ""
+msgstr "sumofsquares() - 平方和"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "指定された資格情報はユニークではありません"
 
@@ -21200,8 +21327,8 @@ msgstr "指定された資格情報はユニークではありません"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21214,7 +21341,7 @@ msgstr "タグ"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "tan() - The tangent of a value"
-msgstr ""
+msgstr "tan() - 値のタンジェント"
 
 #: include/classes/api/services/CHostBase.php:64
 #, c-format
@@ -21282,7 +21409,7 @@ msgstr "3番目のパラメータを指定してください"
 msgid "time filter default period exceeds the max period"
 msgstr "デフォルトのフィルタ期間が最大期間を超えました"
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "タイムシフト"
 
@@ -21300,7 +21427,7 @@ msgstr "trendavg() - 期間のシフトを含む期間Tでの平均値"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendcount() - Number of successfully retrieved values for period T"
-msgstr ""
+msgstr "trendcount() - 期間Tで正常に取得した値の数"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendmax() - Maximum value for period T with exact period shift"
@@ -21338,14 +21465,14 @@ msgstr "リンクのあるトリガーは他のテンプレートやホストに
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
-msgstr ""
+msgstr "trim() - 文字列の先頭から最後までより指定した文字列を削除"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1048
 msgid "truncate() - Truncates a value to decimal places"
 msgstr "truncate() - 小数点以下桁数で切り捨て"
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "検索文字列を入力"
 
@@ -21372,7 +21499,7 @@ msgstr "定数 \"%1$s\" が間違っています"
 msgid "unexpected constant value \"%1$s\""
 msgstr "定数値 \"%1$s\" が間違っています"
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr "条件式のマクロの末尾が間違っています"
 
@@ -21466,7 +21593,7 @@ msgstr "サポートされていないバージョン番号です"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21486,7 +21613,7 @@ msgstr "サポートされていないバージョン番号です"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "値"
 
@@ -21633,7 +21760,7 @@ msgstr "ディスカバリルールのタイプが間違っている"
 msgid "wrong item type"
 msgstr "アイテムのタイプが間違っている"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/ka/LC_MESSAGES/frontend.po b/ui/locale/ka/LC_MESSAGES/frontend.po
index 495e9fc7aeb..4f9171bdb08 100644
--- a/ui/locale/ka/LC_MESSAGES/frontend.po
+++ b/ui/locale/ka/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-03-19 18:13+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d დღე"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -170,7 +170,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -182,7 +182,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -209,16 +209,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "დარჩა %1$s მცდელობა"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s წამი"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -237,13 +237,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -290,7 +290,7 @@ msgstr "(პროქსის გარეშე)"
 msgid "0 - use default port"
 msgstr "0 - ნაგულისხმები პორტის გამოყენება"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 ან 1"
 
@@ -358,7 +358,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 #, fuzzy
 msgid "AND"
 msgstr "AND"
@@ -376,7 +376,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -438,33 +438,33 @@ msgstr ""
 msgid "Access denied"
 msgstr "წვდომა აკრძალულია"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "წვდომა აკრძალულია!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
@@ -472,7 +472,7 @@ msgstr ""
 msgid "Ack"
 msgstr "დადასტ"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "დადასტურება"
 
@@ -480,7 +480,7 @@ msgstr "დადასტურება"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "დადასტურებულია"
@@ -509,20 +509,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -625,7 +627,7 @@ msgstr "მოქმედება განახლდა"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -634,7 +636,7 @@ msgstr "მოქმედება განახლდა"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "მოქმედებები"
@@ -694,8 +696,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -706,7 +708,6 @@ msgstr ""
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -714,11 +715,13 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -730,15 +733,17 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -805,7 +810,7 @@ msgstr ""
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "დამატება"
 
@@ -813,19 +818,19 @@ msgstr "დამატება"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -842,7 +847,7 @@ msgstr "ჰოსტის დამატება"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -859,7 +864,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -867,7 +876,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -901,7 +910,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -910,12 +919,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "ადმინისტრატორი"
@@ -925,6 +942,10 @@ msgstr "ადმინისტრატორი"
 msgid "Administration"
 msgstr "ადმინისტრაცია"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr ""
@@ -1011,7 +1032,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "ყველა"
 
@@ -1020,8 +1041,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1029,7 +1050,7 @@ msgstr ""
 msgid "All hosts"
 msgstr "ყველა ჰოსტი"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1063,7 +1084,7 @@ msgstr "ყველა შაბლონი"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1076,7 +1097,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "დაშვებული ჰოსტები"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1094,7 +1115,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1135,12 +1156,12 @@ msgstr "და/ან"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1160,15 +1181,15 @@ msgstr "პროგრამის შეცდომა."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "გამოყენება"
 
@@ -1186,7 +1207,7 @@ msgstr ""
 msgid "Apr"
 msgstr "აპრ"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "აპრილი"
 
@@ -1214,6 +1235,10 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "ჩვეულებრივი ტექსტივით"
@@ -1262,8 +1287,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1341,7 +1366,7 @@ msgstr ""
 msgid "Aug"
 msgstr "აგვ"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "აგვისტო"
 
@@ -1371,7 +1396,7 @@ msgstr "ავთენტიფიკაცია"
 msgid "Authentication algorithm"
 msgstr "ავთენტიფიკაციის ალგორითმი"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1420,7 +1445,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "ავტო-შესვლა"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1430,7 +1455,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1616,11 +1641,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "ქვედა"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1704,7 +1729,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "გამოთვლადი"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1724,8 +1749,8 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1742,8 +1767,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "გაუქმება"
 
@@ -1773,7 +1798,7 @@ msgstr "მოქმედების დამატება ვერ მო
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1784,7 +1809,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "ჰოსტიდან შაბლონში დამოკიდებულების დამატება ვერ მოხერხდა."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
@@ -1902,7 +1927,7 @@ msgid "Cannot add user"
 msgstr "მომხმარებლის დამატება ვერ მოხერხდა"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1910,11 +1935,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "ვებ სცენარის დამატება ვერ მოხერხდა"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1992,7 +2017,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
@@ -2046,7 +2071,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Zabbix-ის შიდა მომხმარებლის \"%1$s\" წაშლა ვერ მოხერხდა, სცადეთ ამ მომხმარებლის გათიშვა."
@@ -2423,7 +2448,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2591,7 +2616,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2653,7 +2678,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2712,7 +2737,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3128,6 +3158,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3269,7 +3300,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3311,11 +3342,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3345,7 +3376,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr ""
 
@@ -3356,8 +3387,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr ""
 
@@ -3387,8 +3418,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3405,7 +3436,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3473,6 +3504,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr ""
 
@@ -3527,7 +3559,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr ""
 
@@ -3790,7 +3822,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3827,8 +3859,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3889,8 +3921,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr ""
 
@@ -4017,11 +4049,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4138,7 +4170,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4154,7 +4186,7 @@ msgstr ""
 msgid "Create script"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4162,7 +4194,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr ""
 
@@ -4381,7 +4413,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4411,7 +4443,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4581,7 +4613,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr ""
 
@@ -4595,7 +4627,7 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr ""
 
@@ -4604,13 +4636,17 @@ msgstr ""
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr ""
 
@@ -4680,8 +4716,8 @@ msgid "Delayed by"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4695,7 +4731,7 @@ msgstr ""
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4727,8 +4763,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr ""
 
@@ -4757,7 +4793,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4801,7 +4837,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4857,7 +4893,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -4958,11 +4994,11 @@ msgstr ""
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -4978,7 +5014,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5029,7 +5065,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5043,7 +5079,7 @@ msgstr ""
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5051,7 +5087,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr ""
 
@@ -5059,7 +5095,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5087,7 +5123,7 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5251,7 +5287,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5264,14 +5300,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5354,7 +5390,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5366,7 +5402,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5462,7 +5498,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5473,7 +5509,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5513,7 +5549,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5531,10 +5567,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr ""
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5549,7 +5581,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5605,7 +5637,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5614,7 +5646,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr ""
@@ -5690,7 +5722,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5712,7 +5744,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5720,13 +5752,14 @@ msgstr ""
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5738,8 +5771,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr ""
 
@@ -5755,11 +5788,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr ""
 
@@ -6034,7 +6067,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6056,12 +6089,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6120,7 +6153,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6144,7 +6177,7 @@ msgstr ""
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6183,7 +6216,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr ""
 
@@ -6213,7 +6246,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6246,7 +6279,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr ""
 
@@ -6257,7 +6290,7 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr ""
 
@@ -6303,7 +6336,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6319,8 +6352,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6387,7 +6420,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6441,7 +6474,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6465,7 +6498,7 @@ msgid "Failed"
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6474,24 +6507,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6499,7 +6532,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6523,7 +6556,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr ""
 
@@ -6669,8 +6702,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6748,6 +6781,10 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6813,14 +6850,14 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr ""
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6838,7 +6875,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -6920,7 +6957,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -6938,7 +6975,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr ""
 
@@ -6987,7 +7024,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7147,7 +7184,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr ""
 
@@ -7346,11 +7383,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7395,14 +7432,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr ""
 
@@ -7466,7 +7503,7 @@ msgstr ""
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7474,8 +7511,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7487,7 +7523,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7564,7 +7600,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7572,7 +7608,7 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr ""
@@ -7603,7 +7639,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7620,7 +7656,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7659,7 +7695,7 @@ msgstr ""
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7806,7 +7842,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8038,14 +8074,64 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8054,12 +8140,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr ""
 
@@ -8189,7 +8279,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8202,11 +8292,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8232,7 +8322,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr ""
 
@@ -8250,6 +8340,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8640,7 +8735,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr ""
 
@@ -8697,7 +8792,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8728,7 +8823,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8868,10 +8963,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9178,9 +9273,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9252,6 +9347,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9263,12 +9362,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9341,7 +9440,7 @@ msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9449,7 +9548,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9497,7 +9596,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9600,8 +9699,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9805,7 +9904,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr ""
 
@@ -9991,7 +10090,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10152,7 +10251,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr ""
 
@@ -10174,7 +10273,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr ""
 
@@ -10182,7 +10281,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr ""
 
@@ -10216,7 +10315,7 @@ msgstr ""
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr ""
 
@@ -10286,7 +10385,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10359,11 +10458,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr ""
 
@@ -10401,7 +10500,7 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr ""
 
@@ -10414,11 +10513,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10529,7 +10628,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10607,12 +10706,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10740,7 +10839,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10900,7 +10999,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10929,7 +11028,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -10968,7 +11067,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -10994,7 +11093,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11030,7 +11129,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr ""
 
@@ -11057,7 +11156,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11128,9 +11227,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11142,12 +11241,12 @@ msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr ""
 
@@ -11157,8 +11256,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11216,7 +11315,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11289,8 +11388,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11308,7 +11407,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11336,6 +11435,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11351,11 +11455,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11496,7 +11595,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr ""
 
@@ -11536,11 +11635,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11556,6 +11655,14 @@ msgstr ""
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr ""
@@ -11565,11 +11672,11 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr ""
 
@@ -11577,6 +11684,18 @@ msgstr ""
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr ""
@@ -11671,25 +11790,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11832,6 +11952,10 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11843,7 +11967,7 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr ""
 
@@ -11867,7 +11991,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11884,7 +12008,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -11902,20 +12026,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12048,7 +12172,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12110,7 +12234,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12150,7 +12274,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12163,8 +12287,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12176,7 +12300,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12184,11 +12307,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12306,19 +12430,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12327,15 +12451,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12362,7 +12486,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12378,7 +12502,7 @@ msgstr ""
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12425,7 +12549,7 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12457,15 +12581,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12497,8 +12621,8 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
 
@@ -12528,7 +12652,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr ""
 
@@ -12691,12 +12815,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr ""
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12711,18 +12835,17 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr ""
@@ -12749,7 +12872,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr ""
 
@@ -12777,13 +12900,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr ""
 
@@ -12795,7 +12918,7 @@ msgstr ""
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr ""
@@ -12814,7 +12937,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr ""
 
@@ -12822,7 +12945,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr ""
 
@@ -12839,7 +12962,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
@@ -12851,26 +12974,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -12910,11 +13021,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12947,7 +13058,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -12972,7 +13083,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -12997,27 +13108,27 @@ msgstr ""
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13042,7 +13153,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13059,8 +13170,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13107,9 +13218,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr ""
 
@@ -13361,7 +13472,7 @@ msgstr ""
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr ""
@@ -13408,7 +13519,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13431,13 +13542,15 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13468,9 +13581,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13559,15 +13670,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13641,19 +13756,20 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13675,12 +13791,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr ""
 
@@ -13710,7 +13826,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr ""
 
@@ -13839,7 +13955,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13897,7 +14013,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -13917,12 +14033,12 @@ msgid "Privilege level"
 msgstr ""
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13952,7 +14068,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -13970,7 +14086,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -13983,8 +14099,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -13997,14 +14113,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr ""
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr ""
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14021,7 +14129,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14055,12 +14163,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14082,7 +14190,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14144,7 +14252,7 @@ msgstr ""
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14238,8 +14346,8 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14247,8 +14355,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14301,7 +14409,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14309,7 +14417,7 @@ msgstr ""
 msgid "Recovery"
 msgstr ""
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14344,7 +14452,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14404,7 +14512,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14436,6 +14544,7 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14445,7 +14554,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14453,13 +14562,13 @@ msgstr ""
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14469,8 +14578,8 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14547,8 +14656,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr ""
 
@@ -14588,7 +14697,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14617,7 +14726,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14625,7 +14734,7 @@ msgstr ""
 msgid "Replace"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14732,7 +14841,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
@@ -14766,7 +14875,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr ""
 
@@ -14964,8 +15073,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15023,12 +15132,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15039,10 +15148,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr ""
 
@@ -15255,7 +15362,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr ""
 
@@ -15424,7 +15531,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr ""
 
@@ -15494,8 +15601,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15503,7 +15610,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr ""
 
@@ -15539,19 +15646,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15576,7 +15683,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15609,7 +15716,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr ""
 
@@ -15641,34 +15748,29 @@ msgid "Server time"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15676,7 +15778,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15703,7 +15805,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15719,11 +15821,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -15732,7 +15834,7 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr ""
 
@@ -15741,16 +15843,16 @@ msgstr ""
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15762,9 +15864,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -15788,10 +15890,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15832,7 +15942,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15878,7 +15988,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -15969,7 +16079,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16020,7 +16130,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr ""
 
@@ -16129,7 +16239,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16175,7 +16285,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16249,7 +16359,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16297,12 +16407,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16313,17 +16425,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16347,12 +16466,9 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr ""
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
@@ -16384,6 +16500,10 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16415,8 +16535,8 @@ msgstr ""
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr ""
 
@@ -16428,7 +16548,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16460,7 +16580,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16493,7 +16613,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16509,7 +16629,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16522,7 +16642,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr ""
 
@@ -16614,12 +16734,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16655,8 +16775,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16696,14 +16816,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16711,10 +16830,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16878,7 +16997,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17161,12 +17280,12 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr ""
 
@@ -17176,13 +17295,13 @@ msgstr ""
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17263,7 +17382,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17385,13 +17504,13 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr ""
 
@@ -17410,7 +17529,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17491,7 +17610,7 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17557,15 +17676,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17617,7 +17736,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr ""
 
@@ -17630,7 +17749,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17645,15 +17764,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17720,7 +17840,7 @@ msgid "UNKNOWN"
 msgstr ""
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17730,7 +17850,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr ""
 
@@ -17776,7 +17896,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr ""
 
@@ -17824,7 +17944,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17871,7 +17991,8 @@ msgstr ""
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17890,7 +18011,8 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17901,9 +18023,9 @@ msgstr ""
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -17922,12 +18044,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -17974,7 +18096,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18054,27 +18176,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18143,7 +18266,7 @@ msgid "Upper level maps"
 msgstr ""
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr ""
@@ -18192,37 +18315,37 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18239,13 +18362,13 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18269,32 +18392,32 @@ msgstr[0] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18323,7 +18446,7 @@ msgstr[0] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18331,14 +18454,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18386,7 +18509,7 @@ msgstr[0] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18420,7 +18543,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18440,12 +18563,12 @@ msgstr ""
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18490,7 +18613,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18757,23 +18880,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18980,8 +19103,8 @@ msgstr ""
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19008,7 +19131,12 @@ msgstr ""
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19025,11 +19153,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19045,7 +19173,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr ""
 
@@ -19112,7 +19240,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr ""
 
@@ -19123,6 +19251,10 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19140,7 +19272,7 @@ msgstr ""
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19353,8 +19485,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19396,19 +19528,19 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19476,19 +19608,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr ""
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19609,7 +19737,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19728,7 +19856,6 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20024,9 +20151,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20106,7 +20233,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20153,7 +20280,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20352,13 +20479,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20406,7 +20533,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20632,12 +20759,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20741,8 +20868,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -20837,7 +20964,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -20904,7 +21031,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr ""
@@ -20972,7 +21099,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21099,7 +21226,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr ""
 
@@ -21184,7 +21311,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21194,8 +21321,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21276,7 +21403,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21339,7 +21466,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21366,7 +21493,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21460,7 +21587,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21480,7 +21607,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr ""
 
@@ -21627,7 +21754,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/ko/LC_MESSAGES/frontend.po b/ui/locale/ko/LC_MESSAGES/frontend.po
index 0ecba9462b8..89ee9ed8747 100644
--- a/ui/locale/ko/LC_MESSAGES/frontend.po
+++ b/ui/locale/ko/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2016-01-22 16:15+0300\n"
 "Last-Translator: JONGKWON <jkkim.photo@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -93,7 +93,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 일"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -171,7 +171,7 @@ msgstr[0] "메세지 %1$s건"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -183,7 +183,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%2$s대 중 %1$s대의 요소에서 장애발생중"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -210,16 +210,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "%1$s 의 재시도 가능"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s 초"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -238,13 +238,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s의 심각도는, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s는 읽기전용 입니다."
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -291,7 +291,7 @@ msgstr "(프록시 없음)"
 msgid "0 - use default port"
 msgstr "0 - 기본 포트 사용"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 또는 1"
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "오버라이드 추가"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "AND"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -438,40 +438,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "엑세스가 거부되었습니다"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "엑세스가 거부되었습니다!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "인지"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "인지"
 
@@ -479,7 +479,7 @@ msgstr "인지"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "장애대응 완료"
@@ -508,20 +508,22 @@ msgstr "대응 완료된 해결 이벤트"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -624,7 +626,7 @@ msgstr "액션을 갱신하였습니다"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -633,7 +635,7 @@ msgstr "액션을 갱신하였습니다"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "액션"
@@ -692,8 +694,8 @@ msgstr "종료시간"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -704,7 +706,6 @@ msgstr "종료시간"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -712,11 +713,13 @@ msgstr "종료시간"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -728,15 +731,17 @@ msgstr "종료시간"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -803,7 +808,7 @@ msgstr "종료시간"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "추가"
 
@@ -811,19 +816,19 @@ msgstr "추가"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "새로운 위젯을 추가"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "하위 요소 추가"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -840,7 +845,7 @@ msgstr "호스트 추가"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "복수의 맵을 추가"
 
@@ -857,7 +862,11 @@ msgstr ""
 msgid "Add new override"
 msgstr "새로운 오버라이드를 추가"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -865,7 +874,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -899,7 +908,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "위젯을 추가"
 
@@ -908,12 +917,20 @@ msgstr "위젯을 추가"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "%1$s을 추가했습니다."
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -923,6 +940,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "관리"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "확장 라벨"
@@ -1009,7 +1030,7 @@ msgstr "그리드에 정렬하기"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "모두"
 
@@ -1018,8 +1039,8 @@ msgid "All dashboards"
 msgstr "전체 대시보드"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "모든 그룹"
 
@@ -1027,7 +1048,7 @@ msgstr "모든 그룹"
 msgid "All hosts"
 msgstr "모든 호스트"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "모든 링크는 반드시 \"이름\"과 \"URL\"을 설정할 필요가 있습니다"
 
@@ -1061,7 +1082,7 @@ msgstr "모든 템플릿"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1074,7 +1095,7 @@ msgstr "수동으로 클로즈 허가"
 msgid "Allowed hosts"
 msgstr "허가된 호스트"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1092,7 +1113,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1133,12 +1154,12 @@ msgstr "And/Or"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1158,15 +1179,15 @@ msgstr "어플리케이션 에러."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "적용"
 
@@ -1184,7 +1205,7 @@ msgstr "메인터넌스 중"
 msgid "Apr"
 msgstr "4월"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "4월"
 
@@ -1212,6 +1233,10 @@ msgstr "에리어 타입"
 msgid "Arithmetic"
 msgstr "계산"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "일반 텍스트로 보기"
@@ -1260,8 +1285,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1339,7 +1364,7 @@ msgstr ""
 msgid "Aug"
 msgstr "8월"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "8월"
 
@@ -1369,7 +1394,7 @@ msgstr "인증"
 msgid "Authentication algorithm"
 msgstr "인증 알고리즘"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "인증에 실패하였습니다 : %1$s"
@@ -1418,7 +1443,7 @@ msgstr "자동"
 msgid "Auto-login"
 msgstr "자동 로그인 (1개월)"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "자동 로그인과 자동 로그아웃을 동시에 활성화 할 수는 없습니다."
 
@@ -1428,7 +1453,7 @@ msgstr "자동 로그아웃"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1613,11 +1638,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "아래쪽"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "앞면으로"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "가장 앞면으로"
 
@@ -1698,7 +1723,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "자동 계산"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "달력"
 
@@ -1718,8 +1743,8 @@ msgstr "콜백"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1736,8 +1761,8 @@ msgstr "콜백"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "취소"
 
@@ -1767,7 +1792,7 @@ msgstr "액션을 추가할 수 없습니다"
 msgid "Cannot add correlation"
 msgstr "상관관계를 추가할 수 없습니다"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1778,7 +1803,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "호스트에서 템플릿에 의존관계는 작성할 수 없습니다."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"에 의존관계는 추가할 수 없습니다."
@@ -1896,7 +1921,7 @@ msgid "Cannot add user"
 msgstr "사용자를 추가할 수 없습니다"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1904,11 +1929,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Web시나리오를 추가할 수 없습니다"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1986,7 +2011,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] "트리거를 복사할 수 없습니다"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "조건식에 복수의 호스트가 이용되고 있기 때문에, 트리거 \"%1$s:%2$s\"를 복사할 수 없습니다."
@@ -2040,7 +2065,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Zabbix 유저 \"%1$s\"를 삭제할 수 없습니다. 유저를 비활성으로 설정해 주십시오."
@@ -2419,7 +2444,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "매크로를 전개할 수 없습니다."
 
@@ -2587,7 +2612,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2649,7 +2674,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "응답을 받을 수 없습니다. Zabbix서버 \"%1$s\"의 접속을 확인해 주십시오."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "게스트 사용자의 이름을 변경할 수 없습니다"
 
@@ -2708,7 +2733,12 @@ msgstr "비활성의 상태의 인벤토리 항목은 설정할 수 없습니다
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3124,6 +3154,7 @@ msgid "Change per second"
 msgstr "1초 단위의 변경 (per second)"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "심각도의 변경"
 
@@ -3265,7 +3296,7 @@ msgstr "UDP서비스의 퍼포먼스를 체크. 서비스가 다운된 경우엔
 msgid "Checks should be unique."
 msgstr "체크는 중복되지 않습니다."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3307,11 +3338,11 @@ msgstr "히스토리와 트렌드를 삭제"
 msgid "Clear when unlinking"
 msgstr "링크 삭제시 클리어"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3341,7 +3372,7 @@ msgstr "시각"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "복제"
 
@@ -3352,8 +3383,8 @@ msgstr "복제"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "닫기"
 
@@ -3383,8 +3414,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "축소"
 
@@ -3401,7 +3432,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3469,6 +3500,7 @@ msgstr "동시 세션의 숫자"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "조건"
 
@@ -3523,7 +3555,7 @@ msgstr "조건"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "설정"
 
@@ -3786,7 +3818,7 @@ msgstr "연락처"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3823,8 +3855,8 @@ msgstr "포함"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3885,8 +3917,8 @@ msgstr "좌표"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "복사"
 
@@ -4014,11 +4046,11 @@ msgstr "상관관계의 작성"
 msgid "Create dashboard"
 msgstr "대시보드의 작성"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "의존 아이템의 작성"
 
@@ -4135,7 +4167,7 @@ msgstr "맵 작성"
 msgid "Create media type"
 msgstr "연락 방법 작성"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "새 작성"
 
@@ -4151,7 +4183,7 @@ msgstr ""
 msgid "Create script"
 msgstr "스크립트 작성"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4159,7 +4191,7 @@ msgstr ""
 msgid "Create template"
 msgstr "템플릿 작성"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "트리거 작성"
 
@@ -4378,7 +4410,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "대시보드의 설정"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "대시보드의 공유"
 
@@ -4408,7 +4440,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "대시보드"
 
@@ -4578,7 +4610,7 @@ msgstr "요일"
 msgid "Days"
 msgstr "일"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "디버그"
 
@@ -4592,7 +4624,7 @@ msgstr "디버그 모드"
 msgid "Dec"
 msgstr "12월"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "12월"
 
@@ -4601,13 +4633,17 @@ msgstr "12월"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "디폴트"
 
@@ -4677,8 +4713,8 @@ msgid "Delayed by"
 msgstr "연장 시간"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4692,7 +4728,7 @@ msgstr "연장 시간"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4724,8 +4760,8 @@ msgstr "연장 시간"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "삭제"
 
@@ -4754,7 +4790,7 @@ msgstr "현재 액션을 삭제하시겠습니까?"
 msgid "Delete current correlation?"
 msgstr "현재의 상관관계를 삭제하시겠습니다?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "대시보드를 삭제하시겠습니까?"
 
@@ -4798,7 +4834,7 @@ msgstr "아이템 프로토타입을 삭제하시겠습니까?"
 msgid "Delete item?"
 msgstr "아이템를 삭제하시겠습니까?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "선택한 요소간의 링크를 삭제하시겠습니까?"
 
@@ -4854,7 +4890,7 @@ msgstr "선택한 대시보드를 삭제하시겠습니까?"
 msgid "Delete selected discovery rules?"
 msgstr "선택한 디스커버리 규칙를 삭제하시겠습니까?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "선택한 요소를 삭제하시겠습니까?"
 
@@ -4955,11 +4991,11 @@ msgstr "선택한 스크립트를 삭제하시겠습니까?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "선택한 도형을 삭제하시겠습니까?"
 
@@ -4975,7 +5011,7 @@ msgstr "선택한 트리거 프로토타입을 삭제하시겠습니까?"
 msgid "Delete selected triggers?"
 msgstr "선택한 트리거를 삭제하시겠습니까?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "선택한 사용자를 삭제하시겠습니까?"
 
@@ -5026,7 +5062,7 @@ msgstr "삭제: 템플릿 \"%1$s\"."
 msgid "Delimiter"
 msgstr "구분 문자"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5040,7 +5076,7 @@ msgstr "거부"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5048,7 +5084,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "의존관계"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "의존처"
 
@@ -5056,7 +5092,7 @@ msgstr "의존처"
 msgid "Dependent item"
 msgstr "의존 아이템"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5084,7 +5120,7 @@ msgstr "배포상태"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5248,7 +5284,7 @@ msgstr "선택한 Web시나리오를 비활성으로 하시겠습니까?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5261,14 +5297,14 @@ msgstr "선택한 Web시나리오를 비활성으로 하시겠습니까?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5351,7 +5387,7 @@ msgid "Discovery by proxy"
 msgstr "프록시에 의한 디스커버리"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "디스커버리 체크"
 
@@ -5363,7 +5399,7 @@ msgstr "디스커버리 체크"
 msgid "Discovery list"
 msgstr "디스커버리 리스트"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "디스커버리 오브젝트"
 
@@ -5461,7 +5497,7 @@ msgstr "디스커버리 규칙을 갱신하였습니다"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5472,7 +5508,7 @@ msgstr "디스커버리 규칙"
 msgid "Discovery rules deleted"
 msgstr "디스커버리 규칙을 삭제하였습니다"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "디스커버리 상태"
@@ -5512,7 +5548,7 @@ msgstr "누계 그래프 표시"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "%2$s 중 %1$s건을 표시하고 있습니다"
@@ -5530,10 +5566,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "계산 안함"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5548,7 +5580,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "조건식을 치환하시겠습니까?"
 
@@ -5604,7 +5636,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5613,7 +5645,7 @@ msgid "Download the configuration file"
 msgstr "설정 파일 다운로드"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "정지 시간"
@@ -5689,7 +5721,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "맵 \"%2$s\"를 위한 유저 내의 userid \"%1$s\"가 중복되었습니다."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5711,7 +5743,7 @@ msgstr "다이내믹 아이템"
 msgid "Dynamic items"
 msgstr "다이나믹 아이템"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "각URL의 이름은 중복될 수 없습니다. 같은 URL 이름이 이용되지 않는지 확인해 주세요"
 
@@ -5719,13 +5751,14 @@ msgstr "각URL의 이름은 중복될 수 없습니다. 같은 URL 이름이 이
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5737,8 +5770,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "편집"
 
@@ -5754,11 +5787,11 @@ msgstr "맵 변경"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "트리 요소의 변경"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "트리거의 변경"
 
@@ -6033,7 +6066,7 @@ msgstr "트래핑의 활성화"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6055,12 +6088,12 @@ msgstr "트래핑의 활성화"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6119,7 +6152,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6143,7 +6176,7 @@ msgstr "에러"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "테이블 \"%1$s\"의 검색 리퀘스트를 실패하였습니다."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "에러 메세지"
 
@@ -6182,7 +6215,7 @@ msgstr "이벤트 상관관계 규칙"
 msgid "Event details"
 msgstr "이벤트 세부 내용"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "이벤트 생성"
 
@@ -6212,7 +6245,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "이벤트 태그의 짝"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "이벤트타입"
 
@@ -6245,7 +6278,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "포함하지 않음"
 
@@ -6256,7 +6289,7 @@ msgstr "포함하지 않음"
 msgid "Exclude host groups"
 msgstr "제외할 호스트그룹"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "실행"
 
@@ -6302,7 +6335,7 @@ msgstr "실행"
 msgid "Executed script"
 msgstr "실행 스크립트"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "실행 확인"
 
@@ -6318,8 +6351,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "전개"
 
@@ -6386,7 +6419,7 @@ msgstr "CSV 내보내기"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6440,7 +6473,7 @@ msgstr "조건식"
 msgid "External check"
 msgstr "외부 검사"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6464,7 +6497,7 @@ msgid "Failed"
 msgstr "실패"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "대시보드의 작성에 실패하였습니다."
 
@@ -6473,24 +6506,24 @@ msgstr "대시보드의 작성에 실패하였습니다."
 msgid "Failed to parse URL."
 msgstr "URL을 해석할 수 없었습니다."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "대시보드의 변경에 실패하였습니다"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6498,7 +6531,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "템플릿의 갱신 실패."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6522,7 +6555,7 @@ msgstr ""
 msgid "Feb"
 msgstr "2월"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "2월"
 
@@ -6668,8 +6701,8 @@ msgstr "면"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6747,6 +6780,10 @@ msgstr "맵에 맞춘다"
 msgid "Fixed"
 msgstr "고정"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6812,14 +6849,14 @@ msgstr "프랑스어 (fr_FR)"
 msgid "Fri"
 msgstr "금"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "금"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6837,7 +6874,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Web 인터페이스에 액세스"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Web 인터페이스 알림 표시"
 
@@ -6919,7 +6956,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "설정한 조건식은 매크로가 아닙니다"
 
@@ -6937,7 +6974,7 @@ msgstr "글로벌 값"
 msgid "Go back to %1$s"
 msgstr "%1$s에 돌아감"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "다음 페이지로 이동"
 
@@ -6986,7 +7023,7 @@ msgstr "그라데이션 라인"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7146,7 +7183,7 @@ msgstr "\"%1$s\"의 이름을 지닌 그래프는 그래프 혹은 그래프 프
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "그래프"
 
@@ -7345,11 +7382,11 @@ msgstr "도움말"
 msgid "Hexadecimal to decimal"
 msgstr "16진수에서 10진수로"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "표시하지 않음"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "디버그를 감추기"
 
@@ -7394,14 +7431,14 @@ msgstr "행을 강조표시"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "이력"
 
@@ -7465,7 +7502,7 @@ msgstr "가로 위치"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7473,8 +7510,7 @@ msgstr "가로 위치"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7486,7 +7522,7 @@ msgstr "가로 위치"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7563,7 +7599,7 @@ msgstr[0] "호스트를 활성화 하였습니다"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7571,7 +7607,7 @@ msgstr[0] "호스트를 활성화 하였습니다"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "호스트 그룹"
@@ -7602,7 +7638,7 @@ msgstr "호스트 그룹의 라벨타입"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 호스트그룹은 사용할 수 없습니다."
@@ -7619,7 +7655,7 @@ msgstr "ID \"%1$s\"의 호스트그룹은 사용할 수 없습니다."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7658,7 +7694,7 @@ msgstr "호스트 인터페이스"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7805,7 +7841,7 @@ msgstr "같은 호스트의 표시 이름 \"%1$s\"를 지닌 호스트가 이미
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8037,14 +8073,64 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "시스템의 식별문자. string을 리턴."
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "이 메시지가 잘못된 경우엔, 필요한 권한을 얻기 위하여 관리자에게 문의하여 주십시오."
@@ -8053,12 +8139,16 @@ msgstr "이 메시지가 잘못된 경우엔, 필요한 권한을 얻기 위하�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "이미지"
 
@@ -8188,7 +8278,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8201,11 +8291,11 @@ msgstr "접근할 수 없는 맵"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "접근할 수 없는 템플릿"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "접속이 안되는 트리거"
 
@@ -8231,7 +8321,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "포함"
 
@@ -8249,6 +8339,11 @@ msgstr "서브 그룹을 포함"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "네트워크 인터페이스의 수신통계. integer를 리턴."
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8639,7 +8734,7 @@ msgstr "액션 \"%1$s\"의 필터 조건타입이 올바르지 않습니다."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "잘못된 함수가 이용되어 있습니다."
 
@@ -8696,7 +8791,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "트리거 조건식 \"%2$s\"에 올바르지 않은 아이템키 \"%1$s\"가 이용되어 있습니다."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "아이템의 데이터 타입이 올바르지 않습니다."
 
@@ -8727,7 +8822,7 @@ msgstr "미디어 타입 ID가 올바르지 않습니다."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "메소트 \"%1$s.%2$s\"가 올바르지 않습니다."
@@ -8867,10 +8962,10 @@ msgstr "맵 \"%1$s\"의 지정된 유저ID가 올바르지 않습니다."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "맵 \"%1$s\"의 지정된 유저 그룹ID가 올바르지 않습니다."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9177,9 +9272,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9251,6 +9346,10 @@ msgstr "PSK 필드에 이용된 값이 올바르지 않습니다. 16진수 문�
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "프록시 상태 \"%1$s\"에 이용되는 값이 올바르지 않습니다."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "인도네시아어 (id_ID)"
@@ -9262,12 +9361,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9340,7 +9439,7 @@ msgid "Insert"
 msgstr "삽입"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "조건식의 삽입"
 
@@ -9448,7 +9547,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9496,7 +9595,7 @@ msgstr "날짜가 올바르지 않습니다."
 msgid "Invalid email address \"%1$s\"."
 msgstr "메일 주소 \"%1$s\"가 올바르지 않습니다."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "ID \"%1$s\"의 미디어 타입의 메일 주소가 올바르지 않습니다."
@@ -9599,8 +9698,8 @@ msgstr "메소드의 파라미터가 올바르지 않습니다."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9804,7 +9903,7 @@ msgstr "기간이 올바르지 않습니다."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "인벤토리"
 
@@ -9990,7 +10089,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10151,7 +10250,7 @@ msgstr ""
 msgid "Jan"
 msgstr "1월"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "1월"
 
@@ -10173,7 +10272,7 @@ msgstr ""
 msgid "Jul"
 msgstr "7월"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "7월"
 
@@ -10181,7 +10280,7 @@ msgstr "7월"
 msgid "Jun"
 msgstr "6월"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "6월"
 
@@ -10215,7 +10314,7 @@ msgstr "키"
 msgid "Key passphrase"
 msgstr "키의 패스프레이즈"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "키워드"
 
@@ -10285,7 +10384,7 @@ msgstr "라벨 위치"
 msgid "Language"
 msgstr "언어"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10358,11 +10457,11 @@ msgstr ""
 msgid "Last check"
 msgstr "최근 검사"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "최근 1시간의 그래프"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "최근 1개월의 그래프"
 
@@ -10400,7 +10499,7 @@ msgstr ""
 msgid "Last value"
 msgstr "최근 값"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "최근 1주일의 그래프"
 
@@ -10413,11 +10512,11 @@ msgstr "최근 1주일의 그래프"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "최근 데이터"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "최근 값"
 
@@ -10528,7 +10627,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10606,12 +10705,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "공유 유저 그룹"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "공유 유저"
@@ -10739,7 +10838,7 @@ msgstr "Low-level 디스커버리가 \"취득불가\" 상태"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10899,7 +10998,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10928,7 +11027,7 @@ msgstr "수동 클로즈 완료"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "맵"
 
@@ -10967,7 +11066,7 @@ msgstr "맵 요소의 레이블 위치"
 msgid "Map element label type"
 msgstr "맵 요소의 레이블 타입"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -10993,7 +11092,7 @@ msgstr "맵의 소유자는 필수항목입니다."
 msgid "Map shape"
 msgstr "맵 형태"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "맵 갱신에 실패하였습니다."
 
@@ -11029,7 +11128,7 @@ msgstr "맵"
 msgid "Mar"
 msgstr "3월"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "3월"
 
@@ -11056,7 +11155,7 @@ msgstr "마스크"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11127,9 +11226,9 @@ msgstr "OS가 지원하고 있는 최대 파일 오픈 수. integer를 리턴."
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "OS가 지원하고 있는 최대 프로세스 수. integer를 리턴"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11141,12 +11240,12 @@ 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일 입니다."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "ID \"%1$s\"의 미디어 타입의 메일주소가 최대 길이를 넘었습니다."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "5월"
 
@@ -11156,8 +11255,8 @@ msgid "May"
 msgstr "5월"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "연락 방법"
 
@@ -11215,7 +11314,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "연락 방법을 갱신하였습니다"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 미디어 타입은 사용할 수 없습니다."
@@ -11288,8 +11387,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "표시기간"
 
@@ -11307,7 +11406,7 @@ msgstr "메세지/커맨드"
 msgid "Messages"
 msgstr "메시지"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "알림 표시"
 
@@ -11335,6 +11434,11 @@ msgstr "최소치"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11350,11 +11454,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11495,7 +11594,7 @@ msgstr ""
 msgid "Mon"
 msgstr "월"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "월"
 
@@ -11535,11 +11634,11 @@ msgstr "월"
 msgid "Monthly"
 msgstr "월간"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "조건에 일치하는 데이터가 더 존재합니다..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11555,6 +11654,14 @@ msgstr "10분 이상"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "호스트에 \"%1$s\"의 이름을 지닌 그래프가 하나 이상 존재합니다."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11564,11 +11671,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "복수"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "장애이벤트를 계속해서 생성"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "음소거"
 
@@ -11576,6 +11683,18 @@ msgstr "음소거"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11670,25 +11789,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11831,6 +11951,10 @@ msgstr ""
 msgid "Never"
 msgstr "없음"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11842,7 +11966,7 @@ msgstr "새 조건"
 msgid "New dashboard"
 msgstr "신규 대시보드"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "새 요소"
 
@@ -11866,7 +11990,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "정규표현식 작성"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11883,7 +12007,7 @@ msgid "New triggers"
 msgstr "신규 트리거"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -11901,20 +12025,20 @@ msgstr "다음 스텝"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12047,7 +12171,7 @@ msgstr "자세한 내용이 없습니다"
 msgid "No discovery rule IDs given."
 msgstr "디스커버리 규칙ID이 설정되어 있지 않습니다"
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12109,7 +12233,7 @@ msgstr "이미지는 존재하지 않습니다"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "인터페이스를 찾을 수 없습니다."
 
@@ -12149,7 +12273,7 @@ msgstr "매크로가 설정되어 있지 않습니다"
 msgid "No maps added."
 msgstr "맵이 추가되어 있지 않습니다."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "조건에 일치하는 데이터가 없습니다"
 
@@ -12162,8 +12286,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "상관관계 \"%1$s\"에 실행내용 타입이 정의되어 있지 않습니다."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "시스템 액세스 권한이 없습니다."
 
@@ -12175,7 +12299,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12183,11 +12306,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12305,19 +12429,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12326,15 +12450,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12361,7 +12485,7 @@ msgstr "공개키 파일이 설정되어 있지 않습니다"
 msgid "No recipients for action operation message."
 msgstr "실행하는 액션의 메시지에 송신처가 설정되어 있지 않습니다"
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "새로고침 없음"
 
@@ -12377,7 +12501,7 @@ msgstr "아무 것도 선택되어 있지 않습니다"
 msgid "No target selected."
 msgstr "아무 것도 선택되어 있지 않습니다."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12424,7 +12548,7 @@ msgstr "없음"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12456,15 +12580,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "\"손님\" 사용자는 패스워드를 설정할 수 없습니다."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12496,8 +12620,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "취득 불가"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "설명"
 
@@ -12527,7 +12651,7 @@ msgstr "관계자 전원에게 통지"
 msgid "Nov"
 msgstr "11월"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "11월"
 
@@ -12690,12 +12814,12 @@ msgstr "수치변환"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "수치 (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "수치 (integer)"
 
@@ -12710,18 +12834,17 @@ msgstr "수치 (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "정상"
@@ -12748,7 +12871,7 @@ msgstr "OOB라우터"
 msgid "OOB subnet mask"
 msgstr "OOB서브넷 마스크"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "OR"
 
@@ -12776,13 +12899,13 @@ msgstr "10월"
 msgid "Octal to decimal"
 msgstr "8진수에서 10진수로"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "10월"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "OFF"
 
@@ -12794,7 +12917,7 @@ msgstr "OFF"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "OK"
@@ -12813,7 +12936,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "ON"
 
@@ -12821,7 +12944,7 @@ msgstr "ON"
 msgid "On status change triggers blink for"
 msgstr "상태가 바뀐 트리거의 점멸기간"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "한번"
 
@@ -12838,7 +12961,7 @@ msgid "One time only"
 msgstr "한번만"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "일시적인 정지 시간"
 
@@ -12850,26 +12973,14 @@ msgstr "최고관리자만 호스트 그룹을 작성할 수 있습니다."
 msgid "Only Super Admins can create media types."
 msgstr "최고관리자만 미디어 타입을 작성할 수 있습니다."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "최고 관리자만 미디어타입을 작성할 수 있습니다."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "최고관리자만 미디어 타입을 삭제할 수 있습니다."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "최고관리자만 유저 그룹을 삭제할 수 있습니다."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "최고관리자만 미디어 타입을 수정할 수 있습니다."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "최고관리자만 유저 그룹을 갱신할 수 있습니다."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Zabbix에이전트, SNMPv1, SNMPv2, SNMPv3의 유니크 여부를 체크합니다."
@@ -12909,11 +13020,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] "선택한 장애만"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12946,7 +13057,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "OS정보. string값을 리턴"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -12971,7 +13082,7 @@ msgstr "조작대상의 그룹이 없습니다."
 msgid "Operation has no template to operate."
 msgstr "조작대상의 템플릿이 없습니다."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -12996,27 +13107,27 @@ msgstr "오퍼레이션"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "오퍼레이터"
 
@@ -13041,7 +13152,7 @@ msgstr "옵션"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13058,8 +13169,8 @@ msgstr "Or"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13106,9 +13217,9 @@ msgstr "Or"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "변경 안함"
 
@@ -13360,7 +13471,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "장애"
@@ -13407,7 +13518,7 @@ msgstr "PSK 아이덴티티"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK가 너무 짧습니다. %1$s 자리의 16진수로 설정해 주십시오."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13430,13 +13541,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "파라미터"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13467,9 +13580,7 @@ msgstr "상위 아이템"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13558,15 +13669,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "링크 없이 붙여넣기"
 
@@ -13640,19 +13755,20 @@ msgid "Periods"
 msgstr "기간"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "권한"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "권한은 사용자그룹만 할당할 수 있습니다."
 
@@ -13674,12 +13790,12 @@ msgstr "배치 알고리즘"
 msgid "Plain text"
 msgstr "일반 텍스트"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "재생"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "사운드 재생"
 
@@ -13709,7 +13825,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Zabbix 서버의 호스트명이나 호스트 IP주소와 포트 번호를 입력해주세요. 필요하다면 이름도 입력해주세요 (옵션)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "2개의 요소를 선택하여 주십시오"
 
@@ -13838,7 +13954,7 @@ msgid "Previous month"
 msgstr "저번 달"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13896,7 +14012,7 @@ msgstr "프라이버시 패스프레이즈"
 msgid "Privacy protocol"
 msgstr "프라이버시 프로토콜"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "비공개"
@@ -13916,12 +14032,12 @@ msgid "Privilege level"
 msgstr "특권 레벨"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13951,7 +14067,7 @@ msgstr "장애 발생"
 msgid "Problem display"
 msgstr "장애의 표시"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "장애의 조건식"
@@ -13969,7 +14085,7 @@ msgstr "장애가 억제되지 않습니다"
 msgid "Problem is suppressed"
 msgstr "장애가 억제되었습니다"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "장애"
 
@@ -13982,8 +14098,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "장애 해결됨"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -13996,14 +14112,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "모든 자식에 문제가 있는 경우 장애로 검사"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "자식에 하나라도 문제가 발생한 경우 장애로 검사"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14020,7 +14128,7 @@ msgstr "자식에 하나라도 문제가 발생한 경우 장애로 검사"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "장애"
 
@@ -14054,12 +14162,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "속성"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14081,7 +14189,7 @@ msgstr "프록시"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14143,7 +14251,7 @@ msgstr "프록시명"
 msgid "Proxy updated"
 msgstr "프록시를 갱신하였습니다"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "공개"
@@ -14237,8 +14345,8 @@ msgstr "읽기"
 msgid "Read only"
 msgstr "읽기 전용"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14246,8 +14354,8 @@ msgstr "읽기 전용"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14300,7 +14408,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14308,7 +14416,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "복구"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14343,7 +14451,7 @@ msgstr "직사각형"
 msgid "Refresh"
 msgstr "새로고침"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "새로고침 간격"
 
@@ -14403,7 +14511,7 @@ msgstr "정규표현식"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14435,6 +14543,7 @@ msgstr "원격 명령"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14444,7 +14553,7 @@ msgstr "원격 명령"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14452,13 +14561,13 @@ msgstr "원격 명령"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14468,8 +14577,8 @@ msgstr "원격 명령"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14546,8 +14655,8 @@ msgstr "원격 명령"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "삭제"
 
@@ -14587,7 +14696,7 @@ msgstr "%1$s의 삭제"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14616,7 +14725,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14624,7 +14733,7 @@ msgstr ""
 msgid "Replace"
 msgstr "치환"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "의존관계를 치환"
 
@@ -14731,7 +14840,7 @@ msgstr "요구 스테이터스 코드"
 msgid "Required string"
 msgstr "요구문자열"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "리셋"
@@ -14765,7 +14874,7 @@ msgstr "리셋 확인"
 msgid "Reset defaults"
 msgstr "기본값으로 설정"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "해결됨"
 
@@ -14963,8 +15072,8 @@ msgstr "우측 Y"
 msgid "Right trim"
 msgstr "오른쪽 trim"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15022,12 +15131,12 @@ msgstr "호스트 상에서 지정한 커맨드를 실행. 커맨드의 실행�
 msgid "Russian (ru_RU)"
 msgstr "러시아어 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15038,10 +15147,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15254,7 +15361,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "토"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "토"
 
@@ -15423,7 +15530,7 @@ msgstr "스크립트를 갱신하였습니다"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "스크립트"
 
@@ -15493,8 +15600,8 @@ msgid "Security name"
 msgstr "보안 이름"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15502,7 +15609,7 @@ msgstr "보안 이름"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "선택"
 
@@ -15538,19 +15645,19 @@ msgstr "선택한 요소"
 msgid "Selected items only"
 msgstr "선택한 아이템만"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "%3$d의 %2$d위치에 있는 %1$s를 선택하였습니다"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "%3$d의 %2$d 위치에 있는 읽기 전용 %1$s를 선택하였습니다"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "뒤로 보내기"
 
@@ -15575,7 +15682,7 @@ msgstr "다른 미디어만 사용"
 msgid "Send to"
 msgstr "수신처"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "맨 뒤로 보내기"
 
@@ -15608,7 +15715,7 @@ msgstr "장애와 미대응 보이기"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "9월"
 
@@ -15640,34 +15747,29 @@ msgid "Server time"
 msgstr "서버 시간"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "서비스"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15675,7 +15777,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "서비스을 작성하였습니다"
 
@@ -15703,7 +15805,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "서비스시작시간은 종료시간보다 빠르게 설정해주십시오."
 
@@ -15719,11 +15821,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "서비스 시간"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "서비스 종류"
 
@@ -15732,7 +15834,7 @@ msgstr "서비스 종류"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "서비스를 갱신하였습니다"
 
@@ -15741,16 +15843,16 @@ msgstr "서비스를 갱신하였습니다"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "서비스"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "서비스의 의존관계가 모순되어있습니다."
 
@@ -15762,9 +15864,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "세션이 끊겼습니다. 다시 로그인하여 주십시오."
 
@@ -15788,10 +15890,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "인벤토리 모드의 설정"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15832,7 +15942,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15878,7 +15988,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "공유"
 
@@ -15969,7 +16079,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16020,7 +16130,7 @@ msgstr "Zabbix 서버 정지시 경고 보이기"
 msgid "Show working time"
 msgstr "워킹 타임 표시"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "표시"
 
@@ -16129,7 +16239,7 @@ msgstr "호스트\"%2$s\"에 그래프\"%1$s\"의 복사를 스킵하였습니�
 msgid "Slovak (sk_SK)"
 msgstr "슬로바키아어 (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "스누즈"
 
@@ -16175,7 +16285,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "다음에 의한 항목의 정렬"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "정렬 순서(0->999)"
 
@@ -16249,7 +16359,7 @@ msgstr "시작시간"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16297,12 +16407,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16313,17 +16425,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16347,13 +16466,10 @@ msgstr ""
 msgid "Status"
 msgstr "상태"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "상태 계산"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "상태 계산 알고리즘"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16384,6 +16500,10 @@ msgstr "상태만"
 msgid "Status problem"
 msgstr "장애"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16415,8 +16535,8 @@ msgstr "\"%1$s\"의 이름를 지닌 스텝이 이미 존재합니다."
 msgid "Steps"
 msgstr "스텝"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "정지"
 
@@ -16428,7 +16548,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16460,7 +16580,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16493,7 +16613,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "서브젝트"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "서브맵"
 
@@ -16509,7 +16629,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "성공 감사"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "성공 메세지"
 
@@ -16522,7 +16642,7 @@ msgstr "네트워크 인터페이스의 송수신합계치. integer를 리턴."
 msgid "Sun"
 msgstr "일"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "일"
 
@@ -16614,12 +16734,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "시스템 가동 시간(초). integer를 리턴."
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16655,8 +16775,8 @@ msgstr "테이블\"%1$s\"에 항목 이름 \"%2$s\"가 존재하지 않습니다
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "태그"
@@ -16696,14 +16816,13 @@ msgstr "태그 값"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16711,10 +16830,10 @@ msgstr "태그 값"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16878,7 +16997,7 @@ msgstr "같은 표시 이름\"%1$s\"를 지닌 템플릿이 이미 존재합니�
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17161,12 +17280,12 @@ msgstr ""
 msgid "Thu"
 msgstr "목"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "목"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "종료"
 
@@ -17176,13 +17295,13 @@ msgstr "종료"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17263,7 +17382,7 @@ msgstr "타임 스탬프"
 msgid "To"
 msgstr "종료"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "모든 아이템은 하나의 호스트 인터페이스를 선택할 필요가 있습니다"
 
@@ -17385,13 +17504,13 @@ msgstr "트렌드"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "트리거"
 
@@ -17410,7 +17529,7 @@ msgstr "트리거 \"%1$s\"는 링크되어 있는 다른 템플릿에 포함됩�
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "트리거 \"%1$s\"는 존재하지않는 트리거\"%2$s\"에 의존하고 있습니다."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17491,7 +17610,7 @@ msgstr "트리거 개요"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17557,15 +17676,15 @@ msgstr "트리거 프로토타입을 삭제하였습니다"
 msgid "Trigger prototypes updated"
 msgstr "트리거 프로토타입을 갱신하였습니다"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "트리거 심각도"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "트리거의 상태 \"정상\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "트리거의 상태 \"장애\""
 
@@ -17617,7 +17736,7 @@ msgstr "Trim"
 msgid "Tue"
 msgstr "화"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "화"
 
@@ -17630,7 +17749,7 @@ msgstr "터키어 (tr_TR)"
 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\")에서 하나의 호스트의 인벤토리 항목 \"%3$s\"을 자동적으로 설정할 수는 없습니다."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "2개의 타입요소를 선택할 필요가 있습니다"
 
@@ -17645,15 +17764,16 @@ msgstr "2개의 타입요소를 선택할 필요가 있습니다"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17720,7 +17840,7 @@ msgid "UNKNOWN"
 msgstr "알 수 없음"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17730,7 +17850,7 @@ msgstr "알 수 없음"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17776,7 +17896,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "맵 \"%1$s\"의 URL에는 \"name\"과 \"url\" 필드가 둘다 필요합니다."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URL"
 
@@ -17824,7 +17944,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "설정 파일을 덮어쓰기 할 수 없습니다."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17871,7 +17991,8 @@ msgstr "선택한 사용자의 블록을 해제하시겠습니까?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17890,7 +18011,8 @@ msgstr "단위"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17901,9 +18023,9 @@ msgstr "단위"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "알 수 없음"
@@ -17922,12 +18044,12 @@ msgstr "알 수 없는 에러"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "알 수 없는 아이템. 선택한 호스트에 그런 아이템은 존재하지 않습니다"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "알 수 없는 호스트. 그런 호스트는 존재하지 않습니다"
 
@@ -17974,7 +18096,7 @@ msgstr "템플릿과의 링크 삭제"
 msgid "Unlink from templates"
 msgstr "템플릿과의 링크를 해제"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "음소거 해제"
 
@@ -18054,27 +18176,28 @@ msgstr "Up"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18143,7 +18266,7 @@ msgid "Upper level maps"
 msgstr "상위레벨 맵"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "가동 시간"
@@ -18192,37 +18315,37 @@ msgstr "액션에서 사용"
 msgid "User"
 msgstr "유저"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "유저 \"%1$s\"에 유저 그룹을 설정해주세요."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "유저 \"%1$s\"는 대시보드 \"%2$s\"의 소유자입니다."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "유저 \"%1$s\"는 맵 \"%2$s\"의 소유자입니다."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "유저 \"%1$s\"는 \"%2$s\" 액션 내에서 이용되고 있습니다."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18239,13 +18362,13 @@ msgstr "사용자를 추가하였습니다"
 msgid "User agent string"
 msgstr "유저 에이전트 문자열"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "사용자는 비활성의 그룹이나 GUI액세스가 비활성인 그룹에 자기자신을 추가할 수 없습니다."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18269,32 +18392,32 @@ msgstr[0] "사용자를 삭제하였습니다"
 msgid "User group"
 msgstr "유저 그룹"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "유저 그룹 \"%1$s\"은 이미 존재합니다."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "유저 그룹 \"%1$s\"는 \"%2$s\"액션 내에서 사용되고 있습니다."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "유저 그룹 \"%1$s\"는 데이터베이스 정지 메시지의 설정에 이용되고 있습니다."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "유저 그룹 \"%1$s\"는 스크립트\"%2$s\"에 이용되고 있습니다."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18323,7 +18446,7 @@ msgstr[0] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 유저 그룹은 사용할 수 없습니다."
@@ -18331,14 +18454,14 @@ msgstr "ID \"%1$s\"의 유저 그룹은 사용할 수 없습니다."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "유저 그룹"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "자신의 사용자는 삭제할 수 없습니다."
 
@@ -18386,7 +18509,7 @@ msgstr[0] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18420,7 +18543,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "맵 \"%2$s\"의 유저로 공유하기 위해서는 파라미터 :%1$s 가 필요합니다."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18440,12 +18563,12 @@ msgstr "사용자를 갱신하였습니다"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 유저는 사용할 수 없습니다."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18490,7 +18613,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18757,23 +18880,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18980,8 +19103,8 @@ msgstr "세로 위치"
 msgid "Vietnamese (vi_VN)"
 msgstr "베트남어 (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19008,7 +19131,12 @@ msgstr "표시명"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "호스트명을 설정하지 않은 경우 표시명은 필수항목입니다."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19025,11 +19153,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "경고"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "요소를 보존가능한 최대치에 도달하였습니다."
 
@@ -19045,7 +19173,7 @@ msgstr "요소를 보존가능한 최대치에 도달하였습니다."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "웹"
 
@@ -19112,7 +19240,7 @@ msgstr ""
 msgid "Wed"
 msgstr "수"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "수"
 
@@ -19123,6 +19251,10 @@ msgstr "수"
 msgid "Weekly"
 msgstr "주간"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "환영합니다"
@@ -19140,7 +19272,7 @@ msgstr "연락 허용 시간대"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19353,8 +19485,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19396,19 +19528,19 @@ msgstr "연간"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19476,19 +19608,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "조작 가능한 권한이 없습니다."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "사용자를 작성하는 권한이 없습니다."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "이 페이지를 표시하는 권한이 없습니다."
@@ -19609,7 +19737,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "boolean을 지정해주세요"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19728,7 +19856,6 @@ msgstr "에이전트"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20024,9 +20151,9 @@ msgstr "변경할 수 없습니다"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20106,7 +20233,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "모순된 아이템의 의존관계는 허가되지 않습니다."
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20154,7 +20281,7 @@ msgstr "count() - 기간 T로 수집된 값 V(오퍼레이터 O를 만족하는)
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20353,13 +20480,13 @@ msgstr "글로벌 데이터의 보존기간 설정"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20407,7 +20534,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "서브 그룹을 포함"
 
@@ -20633,12 +20760,12 @@ msgstr "low-level 디스커버리 룰"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20742,8 +20869,8 @@ msgstr "min() - 기간T 안의 최소치"
 msgid "minimum length is %1$s characters"
 msgstr "%1$s 문자 이상 입력해주세요"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20838,7 +20965,7 @@ msgstr ""
 msgid "name"
 msgstr "이름"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "신규"
 
@@ -20905,7 +21032,7 @@ msgstr "now() - Epoch를 기준으로 한 경과 시간 (초단위)"
 msgid "number"
 msgstr "수치"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "of"
@@ -20973,7 +21100,7 @@ msgstr "출력"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21100,7 +21227,7 @@ msgstr "선택"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "짧은 설명"
 
@@ -21185,7 +21312,7 @@ msgstr "sum() - 기간 T안의 합계치"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "지정된 자격 정보는 유니크 값이 아닙니다."
 
@@ -21195,8 +21322,8 @@ msgstr "지정된 자격 정보는 유니크 값이 아닙니다."
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21277,7 +21404,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "타임시프트"
 
@@ -21340,7 +21467,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "검색 문자열을 입력"
 
@@ -21367,7 +21494,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21461,7 +21588,7 @@ msgstr "지원되지 않는 버전의 번호입니다."
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21481,7 +21608,7 @@ msgstr "지원되지 않는 버전의 번호입니다."
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "값"
 
@@ -21628,7 +21755,7 @@ msgstr "디스커버리 규칙의 타입이 잘못되었습니다"
 msgid "wrong item type"
 msgstr "아이템의 타입이 잘못되었습니다"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/lt/LC_MESSAGES/frontend.po b/ui/locale/lt/LC_MESSAGES/frontend.po
index dd657b4c550..cdf21b6316b 100644
--- a/ui/locale/lt/LC_MESSAGES/frontend.po
+++ b/ui/locale/lt/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-10-10 08:29+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -94,7 +94,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -186,7 +186,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -202,7 +202,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -235,10 +235,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -246,7 +246,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -267,13 +267,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -324,7 +324,7 @@ msgstr "(nerastas įgaliotasis serveris)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 arba 1"
 
@@ -392,7 +392,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "AND"
 
@@ -409,7 +409,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -477,26 +477,26 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Prieiga uždrausta!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
@@ -504,14 +504,14 @@ msgstr ""
 # There is no acronym for this word in LT language we're writing all word "Pripažinimas"
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Pripažinimas"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Pripažinimas"
 
@@ -519,7 +519,7 @@ msgstr "Pripažinimas"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Pripažintas"
@@ -548,20 +548,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -668,7 +670,7 @@ msgstr "Veiksmas atnaujintas"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -677,7 +679,7 @@ msgstr "Veiksmas atnaujintas"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Veiksmai"
@@ -736,8 +738,8 @@ msgstr "Aktyvus iki"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -748,7 +750,6 @@ msgstr "Aktyvus iki"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -756,11 +757,13 @@ msgstr "Aktyvus iki"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -772,15 +775,17 @@ msgstr "Aktyvus iki"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -847,7 +852,7 @@ msgstr "Aktyvus iki"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Pridėti"
 
@@ -855,19 +860,19 @@ msgstr "Pridėti"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -884,7 +889,7 @@ msgstr "Pridėti mazgą"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -901,7 +906,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -909,7 +918,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -943,7 +952,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -952,12 +961,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Adminas"
@@ -967,6 +984,10 @@ msgstr "Adminas"
 msgid "Administration"
 msgstr "Administravimas"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Sudėtingesnė žymė"
@@ -1053,7 +1074,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Visi"
 
@@ -1062,8 +1083,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1071,7 +1092,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Visos nuorodos turi turėti apibrėžtą \"Pavadinimą\" ir \"URL\""
 
@@ -1105,7 +1126,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1118,7 +1139,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Leidžiami mazgai"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1136,7 +1157,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1177,12 +1198,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1202,15 +1223,15 @@ msgstr "Programos klaida."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Taikyti"
 
@@ -1228,7 +1249,7 @@ msgstr "Kreipiantis"
 msgid "Apr"
 msgstr "Bal"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Balandis"
 
@@ -1256,6 +1277,10 @@ msgstr "Srities tipas"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Kaip gryną tekstą"
@@ -1304,8 +1329,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1383,7 +1408,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Rugpj"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Rugpjūtis"
 
@@ -1413,7 +1438,7 @@ msgstr "Autentifikacija"
 msgid "Authentication algorithm"
 msgstr "Autentifikacijos algoritmas"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1462,7 +1487,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Automatinis prisijungimas"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1472,7 +1497,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1657,11 +1682,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Apačia"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1742,7 +1767,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Apskaičiuotas"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1762,8 +1787,8 @@ msgstr "Atgalinis skambutis"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1780,8 +1805,8 @@ msgstr "Atgalinis skambutis"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -1811,7 +1836,7 @@ msgstr "Negalima pridėti veiksmo"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1822,7 +1847,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Negalima pridėti priklausomybės iš mazgo į šabloną."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1942,7 +1967,7 @@ msgid "Cannot add user"
 msgstr "Negalima pridėti vartotojo"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1950,11 +1975,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2038,7 +2063,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
@@ -2094,7 +2119,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
@@ -2546,7 +2571,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2718,7 +2743,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2780,7 +2805,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2839,7 +2864,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3267,6 +3297,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3408,7 +3439,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3450,11 +3481,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3484,7 +3515,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr ""
 
@@ -3495,8 +3526,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr ""
 
@@ -3526,8 +3557,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3544,7 +3575,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3612,6 +3643,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr ""
 
@@ -3666,7 +3698,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr ""
 
@@ -3929,7 +3961,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3966,8 +3998,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4028,8 +4060,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr ""
 
@@ -4162,11 +4194,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4283,7 +4315,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4299,7 +4331,7 @@ msgstr ""
 msgid "Create script"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4307,7 +4339,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr ""
 
@@ -4528,7 +4560,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4558,7 +4590,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4728,7 +4760,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr ""
 
@@ -4742,7 +4774,7 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr ""
 
@@ -4751,13 +4783,17 @@ msgstr ""
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr ""
 
@@ -4827,8 +4863,8 @@ msgid "Delayed by"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4842,7 +4878,7 @@ msgstr ""
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4874,8 +4910,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr ""
 
@@ -4904,7 +4940,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4948,7 +4984,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5004,7 +5040,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5105,11 +5141,11 @@ msgstr ""
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5125,7 +5161,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5176,7 +5212,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5190,7 +5226,7 @@ msgstr ""
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5198,7 +5234,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr ""
 
@@ -5206,7 +5242,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5234,7 +5270,7 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5398,7 +5434,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5411,14 +5447,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5501,7 +5537,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5513,7 +5549,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5615,7 +5651,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5626,7 +5662,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5666,7 +5702,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5684,10 +5720,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr ""
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5702,7 +5734,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5758,7 +5790,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5767,7 +5799,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr ""
@@ -5843,7 +5875,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5865,7 +5897,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5873,13 +5905,14 @@ msgstr ""
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5891,8 +5924,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr ""
 
@@ -5908,11 +5941,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr ""
 
@@ -6187,7 +6220,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6209,12 +6242,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6273,7 +6306,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6297,7 +6330,7 @@ msgstr ""
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6336,7 +6369,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr ""
 
@@ -6366,7 +6399,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6401,7 +6434,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr ""
 
@@ -6412,7 +6445,7 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr ""
 
@@ -6458,7 +6491,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6474,8 +6507,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6542,7 +6575,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6596,7 +6629,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6620,7 +6653,7 @@ msgid "Failed"
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6629,24 +6662,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6654,7 +6687,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6678,7 +6711,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr ""
 
@@ -6824,8 +6857,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6903,6 +6936,10 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6968,14 +7005,14 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr ""
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6993,7 +7030,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7075,7 +7112,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -7093,7 +7130,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr ""
 
@@ -7142,7 +7179,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7304,7 +7341,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr ""
 
@@ -7505,11 +7542,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7554,14 +7591,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr ""
 
@@ -7625,7 +7662,7 @@ msgstr ""
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7633,8 +7670,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7646,7 +7682,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7729,7 +7765,7 @@ msgstr[2] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7737,7 +7773,7 @@ msgstr[2] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr ""
@@ -7768,7 +7804,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7785,7 +7821,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7824,7 +7860,7 @@ msgstr ""
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7973,7 +8009,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8205,14 +8241,68 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8221,12 +8311,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr ""
 
@@ -8356,7 +8450,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8369,11 +8463,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8399,7 +8493,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr ""
 
@@ -8417,6 +8511,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8807,7 +8906,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr ""
 
@@ -8864,7 +8963,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8895,7 +8994,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -9035,10 +9134,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9345,9 +9444,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9419,6 +9518,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9430,12 +9533,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9508,7 +9611,7 @@ msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9616,7 +9719,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9664,7 +9767,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9767,8 +9870,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9972,7 +10075,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr ""
 
@@ -10166,7 +10269,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10327,7 +10430,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr ""
 
@@ -10349,7 +10452,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr ""
 
@@ -10357,7 +10460,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr ""
 
@@ -10391,7 +10494,7 @@ msgstr ""
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr ""
 
@@ -10461,7 +10564,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10546,11 +10649,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr ""
 
@@ -10588,7 +10691,7 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr ""
 
@@ -10601,11 +10704,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10716,7 +10819,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10794,12 +10897,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10927,7 +11030,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11087,7 +11190,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11116,7 +11219,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -11155,7 +11258,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11181,7 +11284,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11217,7 +11320,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr ""
 
@@ -11244,7 +11347,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11315,9 +11418,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11331,12 +11434,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr ""
 
@@ -11346,8 +11449,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11411,7 +11514,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11484,8 +11587,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11503,7 +11606,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11531,6 +11634,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11546,11 +11654,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11701,7 +11804,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr ""
 
@@ -11741,11 +11844,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11761,6 +11864,14 @@ msgstr ""
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr ""
@@ -11770,11 +11881,11 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr ""
 
@@ -11782,6 +11893,18 @@ msgstr ""
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr ""
@@ -11876,25 +11999,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12037,6 +12161,10 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12048,7 +12176,7 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr ""
 
@@ -12072,7 +12200,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12089,7 +12217,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12107,20 +12235,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12253,7 +12381,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12315,7 +12443,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12355,7 +12483,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12368,8 +12496,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12381,7 +12509,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12389,11 +12516,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12511,19 +12639,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12532,15 +12660,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12567,7 +12695,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12583,7 +12711,7 @@ msgstr ""
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12630,7 +12758,7 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12662,15 +12790,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12702,8 +12830,8 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
 
@@ -12733,7 +12861,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr ""
 
@@ -12896,12 +13024,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr ""
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12916,18 +13044,17 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr ""
@@ -12954,7 +13081,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr ""
 
@@ -12982,13 +13109,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr ""
 
@@ -13000,7 +13127,7 @@ msgstr ""
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr ""
@@ -13019,7 +13146,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr ""
 
@@ -13027,7 +13154,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr ""
 
@@ -13044,7 +13171,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
@@ -13056,26 +13183,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13117,11 +13232,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13154,7 +13269,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13179,7 +13294,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13204,27 +13319,27 @@ msgstr ""
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13249,7 +13364,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13266,8 +13381,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13314,9 +13429,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr ""
 
@@ -13568,7 +13683,7 @@ msgstr ""
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr ""
@@ -13615,7 +13730,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13638,13 +13753,15 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13675,9 +13792,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13766,15 +13881,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13848,19 +13967,20 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13882,12 +14002,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr ""
 
@@ -13917,7 +14037,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr ""
 
@@ -14046,7 +14166,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14104,7 +14224,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14124,12 +14244,12 @@ msgid "Privilege level"
 msgstr ""
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14159,7 +14279,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14177,7 +14297,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -14190,8 +14310,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14204,14 +14324,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr ""
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr ""
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14228,7 +14340,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14262,12 +14374,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14289,7 +14401,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14353,7 +14465,7 @@ msgstr ""
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14447,8 +14559,8 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14456,8 +14568,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14510,7 +14622,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14518,7 +14630,7 @@ msgstr ""
 msgid "Recovery"
 msgstr ""
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14553,7 +14665,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14615,7 +14727,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14647,6 +14759,7 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14656,7 +14769,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14664,13 +14777,13 @@ msgstr ""
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14680,8 +14793,8 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14758,8 +14871,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr ""
 
@@ -14799,7 +14912,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14828,7 +14941,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14836,7 +14949,7 @@ msgstr ""
 msgid "Replace"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14943,7 +15056,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
@@ -14977,7 +15090,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr ""
 
@@ -15175,8 +15288,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15234,12 +15347,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15250,10 +15363,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr ""
 
@@ -15466,7 +15577,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr ""
 
@@ -15643,7 +15754,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr ""
 
@@ -15713,8 +15824,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15722,7 +15833,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr ""
 
@@ -15758,19 +15869,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15795,7 +15906,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15828,7 +15939,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr ""
 
@@ -15860,34 +15971,29 @@ msgid "Server time"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15895,7 +16001,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15924,7 +16030,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15940,11 +16046,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -15953,7 +16059,7 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr ""
 
@@ -15962,16 +16068,16 @@ msgstr ""
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15983,9 +16089,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -16009,10 +16115,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16053,7 +16167,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16099,7 +16213,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16190,7 +16304,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16241,7 +16355,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr ""
 
@@ -16350,7 +16464,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16396,7 +16510,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16470,7 +16584,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16518,12 +16632,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16534,17 +16650,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16568,12 +16691,9 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr ""
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
@@ -16605,6 +16725,10 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16636,8 +16760,8 @@ msgstr ""
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr ""
 
@@ -16649,7 +16773,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16681,7 +16805,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16714,7 +16838,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16730,7 +16854,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16743,7 +16867,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr ""
 
@@ -16835,12 +16959,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16876,8 +17000,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16917,14 +17041,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16932,10 +17055,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17099,7 +17222,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17386,12 +17509,12 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr ""
 
@@ -17401,13 +17524,13 @@ msgstr ""
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17488,7 +17611,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17610,13 +17733,13 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr ""
 
@@ -17635,7 +17758,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17722,7 +17845,7 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17790,15 +17913,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17850,7 +17973,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr ""
 
@@ -17863,7 +17986,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17878,15 +18001,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17953,7 +18077,7 @@ msgid "UNKNOWN"
 msgstr ""
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17963,7 +18087,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr ""
 
@@ -18009,7 +18133,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr ""
 
@@ -18057,7 +18181,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18104,7 +18228,8 @@ msgstr ""
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18123,7 +18248,8 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18134,9 +18260,9 @@ msgstr ""
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18155,12 +18281,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -18207,7 +18333,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18289,27 +18415,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18378,7 +18505,7 @@ msgid "Upper level maps"
 msgstr ""
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr ""
@@ -18427,37 +18554,37 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18474,13 +18601,13 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18506,32 +18633,32 @@ msgstr[2] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18564,7 +18691,7 @@ msgstr[2] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18572,14 +18699,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18629,7 +18756,7 @@ msgstr[2] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18663,7 +18790,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18685,12 +18812,12 @@ msgstr ""
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18735,7 +18862,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19002,23 +19129,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19225,8 +19352,8 @@ msgstr ""
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19253,7 +19380,12 @@ msgstr ""
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19270,11 +19402,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19290,7 +19422,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr ""
 
@@ -19361,7 +19493,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr ""
 
@@ -19372,6 +19504,10 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19389,7 +19525,7 @@ msgstr ""
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19602,8 +19738,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19645,19 +19781,19 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19725,19 +19861,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr ""
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19858,7 +19990,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19977,7 +20109,6 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20273,9 +20404,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20355,7 +20486,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20402,7 +20533,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20601,13 +20732,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20655,7 +20786,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20881,12 +21012,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20990,8 +21121,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -21086,7 +21217,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21153,7 +21284,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr ""
@@ -21221,7 +21352,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21348,7 +21479,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr ""
 
@@ -21433,7 +21564,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21443,8 +21574,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21525,7 +21656,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21588,7 +21719,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21615,7 +21746,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21709,7 +21840,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21729,7 +21860,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr ""
 
@@ -21876,7 +22007,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/lv/LC_MESSAGES/frontend.po b/ui/locale/lv/LC_MESSAGES/frontend.po
index 5795ea3d6c9..29df368fdef 100644
--- a/ui/locale/lv/LC_MESSAGES/frontend.po
+++ b/ui/locale/lv/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+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"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d diena"
 msgstr[1] "%1$d dienas"
 msgstr[2] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -236,10 +236,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -325,7 +325,7 @@ msgstr "(bez starpniekservera)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 vai 1"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "UN"
 
@@ -410,7 +410,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -478,40 +478,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Piekļuve liegta!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Apst"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Apstiprinājums"
 
@@ -519,7 +519,7 @@ msgstr "Apstiprinājums"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Apstiprināts"
@@ -548,20 +548,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -668,7 +670,7 @@ msgstr "Darbība atjaunota"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -677,7 +679,7 @@ msgstr "Darbība atjaunota"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Darbības"
@@ -736,8 +738,8 @@ msgstr "Aktīvs līdz"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -748,7 +750,6 @@ msgstr "Aktīvs līdz"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -756,11 +757,13 @@ msgstr "Aktīvs līdz"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -772,15 +775,17 @@ msgstr "Aktīvs līdz"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -847,7 +852,7 @@ msgstr "Aktīvs līdz"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Pievienot"
 
@@ -855,19 +860,19 @@ msgstr "Pievienot"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -884,7 +889,7 @@ msgstr "Pievienot mezglu"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -901,7 +906,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -909,7 +918,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -945,7 +954,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -954,12 +963,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Administrators"
@@ -969,6 +986,10 @@ msgstr "Administrators"
 msgid "Administration"
 msgstr "Administrācija"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr ""
@@ -1055,7 +1076,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Viss"
 
@@ -1064,8 +1085,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1073,7 +1094,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1107,7 +1128,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1120,7 +1141,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Atļautie resursdatori"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1138,7 +1159,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1179,12 +1200,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1204,15 +1225,15 @@ msgstr "Aplikācijas kļūda."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Pielietot"
 
@@ -1230,7 +1251,7 @@ msgstr ""
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Aprīlis"
 
@@ -1258,6 +1279,10 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr ""
@@ -1306,8 +1331,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1385,7 +1410,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Augusts"
 
@@ -1415,7 +1440,7 @@ msgstr "Autentifikācija"
 msgid "Authentication algorithm"
 msgstr "Autentifikācijas algoritms"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1464,7 +1489,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Automātiska pieteikšanās"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1474,7 +1499,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1659,11 +1684,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Apakša"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1744,7 +1769,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Izskaitļots"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1764,8 +1789,8 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1782,8 +1807,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Atcelt"
 
@@ -1813,7 +1838,7 @@ msgstr ""
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1824,7 +1849,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
@@ -1944,7 +1969,7 @@ msgid "Cannot add user"
 msgstr "Lietotāju nav iespējams pievienot"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1952,11 +1977,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2040,7 +2065,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
@@ -2096,7 +2121,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
@@ -2550,7 +2575,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2722,7 +2747,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2784,7 +2809,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2843,7 +2868,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3271,6 +3301,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3412,7 +3443,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3454,11 +3485,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3488,7 +3519,7 @@ msgstr "Pulkstenis"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Klonēt"
 
@@ -3499,8 +3530,8 @@ msgstr "Klonēt"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Aizvērt"
 
@@ -3530,8 +3561,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3548,7 +3579,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3616,6 +3647,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Nosacījums"
 
@@ -3670,7 +3702,7 @@ msgstr "Nosacījumi"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Konfigurācija"
 
@@ -3933,7 +3965,7 @@ msgstr "Kontaktinformācija"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3970,8 +4002,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4032,8 +4064,8 @@ msgstr "Koordinātes"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Kopēt"
 
@@ -4166,11 +4198,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4287,7 +4319,7 @@ msgstr "Izveidot karti"
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4303,7 +4335,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Izveidot skriptu"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4311,7 +4343,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Izveidot veidni"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Izveidot trigeri"
 
@@ -4532,7 +4564,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4562,7 +4594,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4732,7 +4764,7 @@ msgstr "Nedēļas diena"
 msgid "Days"
 msgstr "Dienas"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Atkļūdošana"
 
@@ -4746,7 +4778,7 @@ msgstr "Atkļūdošanas režīms"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Decembris"
 
@@ -4755,13 +4787,17 @@ msgstr "Decembris"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Noklusētais"
 
@@ -4831,8 +4867,8 @@ msgid "Delayed by"
 msgstr "Aizkave pēc"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4846,7 +4882,7 @@ msgstr "Aizkave pēc"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4878,8 +4914,8 @@ msgstr "Aizkave pēc"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Dzēst"
 
@@ -4908,7 +4944,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4952,7 +4988,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5008,7 +5044,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Vai dzēst iezīmētos elementus?"
 
@@ -5109,11 +5145,11 @@ msgstr "Vai dzēst iezīmētos skriptus?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5129,7 +5165,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Izdzēst atlasīto lietotāju?"
 
@@ -5180,7 +5216,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Atdalītājs"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5194,7 +5230,7 @@ msgstr ""
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5202,7 +5238,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr ""
 
@@ -5210,7 +5246,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5238,7 +5274,7 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5402,7 +5438,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5415,14 +5451,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5505,7 +5541,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5517,7 +5553,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5619,7 +5655,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5630,7 +5666,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5670,7 +5706,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5688,10 +5724,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr ""
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5706,7 +5738,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5762,7 +5794,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5771,7 +5803,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Dīkstāve"
@@ -5847,7 +5879,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5869,7 +5901,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5877,13 +5909,14 @@ msgstr ""
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5895,8 +5928,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Rediģēt"
 
@@ -5912,11 +5945,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Labot trigeri"
 
@@ -6191,7 +6224,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6213,12 +6246,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6277,7 +6310,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6301,7 +6334,7 @@ msgstr "Kļūda"
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6341,7 +6374,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Notikuma detaļas"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr ""
 
@@ -6371,7 +6404,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6406,7 +6439,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Neiekļaut"
 
@@ -6417,7 +6450,7 @@ msgstr "Neiekļaut"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Izpildīt"
 
@@ -6463,7 +6496,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Palaist skriptu"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Izpildes apstiprināšana"
 
@@ -6479,8 +6512,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6547,7 +6580,7 @@ msgstr "Eksportēt uz CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6601,7 +6634,7 @@ msgstr "Izteiksmes"
 msgid "External check"
 msgstr "Ārēja pārbaude"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "P"
@@ -6625,7 +6658,7 @@ msgid "Failed"
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6634,24 +6667,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6659,7 +6692,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6683,7 +6716,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Februāris"
 
@@ -6829,8 +6862,8 @@ msgstr "Aizpildīts reģions"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6908,6 +6941,10 @@ msgstr ""
 msgid "Fixed"
 msgstr "Fiksēts"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6973,14 +7010,14 @@ msgstr "Franču (fr_FR)"
 msgid "Fri"
 msgstr "Pie"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Piektdiena"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6998,7 +7035,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Saskarnes piekļuve"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7080,7 +7117,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -7098,7 +7135,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Aiziet uz"
 
@@ -7147,7 +7184,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7309,7 +7346,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafiki"
 
@@ -7511,11 +7548,11 @@ msgstr "Palīdzība"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Slēpts"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7560,14 +7597,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Vēsture"
 
@@ -7631,7 +7668,7 @@ msgstr ""
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7639,8 +7676,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7652,7 +7688,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7736,7 +7772,7 @@ msgstr[2] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7744,7 +7780,7 @@ msgstr[2] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Iekārtas grupa"
@@ -7775,7 +7811,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7792,7 +7828,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7831,7 +7867,7 @@ msgstr "Iekārtas interfeiss"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7980,7 +8016,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8212,14 +8248,68 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8228,12 +8318,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Attēls"
 
@@ -8363,7 +8457,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8376,11 +8470,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8406,7 +8500,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Iekļaut"
 
@@ -8424,6 +8518,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8814,7 +8913,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Tiek izmantota nepareiza funkcija"
 
@@ -8871,7 +8970,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8902,7 +9001,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -9042,10 +9141,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9352,9 +9451,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9426,6 +9525,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonēziešu (id_ID)"
@@ -9437,12 +9540,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9515,7 +9618,7 @@ msgid "Insert"
 msgstr "Ievietot"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9623,7 +9726,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9671,7 +9774,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9774,8 +9877,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9979,7 +10082,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Uzskaite"
 
@@ -10173,7 +10276,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10334,7 +10437,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Janvāris"
 
@@ -10356,7 +10459,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jūl"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Jūlijs"
 
@@ -10364,7 +10467,7 @@ msgstr "Jūlijs"
 msgid "Jun"
 msgstr "Jūn"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Jūnijs"
 
@@ -10398,7 +10501,7 @@ msgstr "Atslēga"
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Atslēgas vārds"
 
@@ -10468,7 +10571,7 @@ msgstr "Iezīmes izvietojums"
 msgid "Language"
 msgstr "Valoda"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10553,11 +10656,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Pēdējā pārbaude"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr ""
 
@@ -10595,7 +10698,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Pēdējā vērtība"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr ""
 
@@ -10608,11 +10711,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Jaunākā informācija"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10723,7 +10826,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10801,12 +10904,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10934,7 +11037,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "P"
@@ -11094,7 +11197,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11123,7 +11226,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Karte"
 
@@ -11162,7 +11265,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11188,7 +11291,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11224,7 +11327,7 @@ msgstr "Kartes"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Marts"
 
@@ -11251,7 +11354,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11322,9 +11425,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11338,12 +11441,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mai"
 
@@ -11353,8 +11456,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11418,7 +11521,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11491,8 +11594,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11510,7 +11613,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Ziņojumi"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11538,6 +11641,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11553,11 +11661,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11708,7 +11811,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Pir"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Pirmdiena"
 
@@ -11748,11 +11851,11 @@ msgstr "Mēnesis"
 msgid "Monthly"
 msgstr "Mēnesī"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11768,6 +11871,14 @@ msgstr "Vairāk nekā 10 minūtes"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11777,11 +11888,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Klusums"
 
@@ -11789,6 +11900,18 @@ msgstr "Klusums"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11883,25 +12006,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12044,6 +12168,10 @@ msgstr ""
 msgid "Never"
 msgstr "Nekad"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12055,7 +12183,7 @@ msgstr "Izveidot jaunu nosacījumu"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Jauns elements"
 
@@ -12079,7 +12207,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12096,7 +12224,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12114,20 +12242,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12260,7 +12388,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12322,7 +12450,7 @@ msgstr "Nav attēla"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12362,7 +12490,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12375,8 +12503,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12388,7 +12516,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12396,11 +12523,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12518,19 +12646,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12539,15 +12667,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12574,7 +12702,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12590,7 +12718,7 @@ msgstr ""
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12637,7 +12765,7 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12669,15 +12797,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12709,8 +12837,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Netiek atbalstīts"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Piezīme"
 
@@ -12740,7 +12868,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Novembris"
 
@@ -12903,12 +13031,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numurs (peldošais)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12923,18 +13051,17 @@ msgstr ""
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12961,7 +13088,7 @@ msgstr "OOB maršrutētājs"
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "VAI"
 
@@ -12989,13 +13116,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Oktobris"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr ""
 
@@ -13007,7 +13134,7 @@ msgstr ""
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Apstiprināt"
@@ -13026,7 +13153,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr ""
 
@@ -13034,7 +13161,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Vienreiz"
 
@@ -13051,7 +13178,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
@@ -13063,26 +13190,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13124,11 +13239,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13161,7 +13276,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13186,7 +13301,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13211,27 +13326,27 @@ msgstr "Operācija"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operators"
 
@@ -13256,7 +13371,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13273,8 +13388,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13321,9 +13436,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr ""
 
@@ -13575,7 +13690,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLĒMA"
@@ -13622,7 +13737,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13645,13 +13760,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametrs"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13682,9 +13799,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13773,15 +13888,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13855,19 +13974,20 @@ msgid "Periods"
 msgstr "Periodi"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Pieejas tiesības"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13889,12 +14009,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Atskaņot"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Atskaņot skaņu"
 
@@ -13924,7 +14044,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr ""
 
@@ -14053,7 +14173,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14111,7 +14231,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14131,12 +14251,12 @@ msgid "Privilege level"
 msgstr "Privilēģiju līmenis"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14166,7 +14286,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14184,7 +14304,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -14197,8 +14317,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14211,14 +14331,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr ""
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr ""
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14235,7 +14347,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problēmas"
 
@@ -14269,12 +14381,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14296,7 +14408,7 @@ msgstr "Starpniekserveri"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14360,7 +14472,7 @@ msgstr "Starpniekservera vārds"
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14454,8 +14566,8 @@ msgstr "Lasīšana"
 msgid "Read only"
 msgstr "Tikai lasīšana"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14463,8 +14575,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14517,7 +14629,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14525,7 +14637,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Atjaunošana"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14560,7 +14672,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14622,7 +14734,7 @@ msgstr "Regulārās izteiksmes"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14654,6 +14766,7 @@ msgstr "Attālināta komanda"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14663,7 +14776,7 @@ msgstr "Attālināta komanda"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14671,13 +14784,13 @@ msgstr "Attālināta komanda"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14687,8 +14800,8 @@ msgstr "Attālināta komanda"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14765,8 +14878,8 @@ msgstr "Attālināta komanda"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Dzēst"
 
@@ -14806,7 +14919,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14835,7 +14948,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14843,7 +14956,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Aizstāt"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14950,7 +15063,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Atiestatīt"
@@ -14984,7 +15097,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Atrisināts"
 
@@ -15182,8 +15295,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15241,12 +15354,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Krievu (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15257,10 +15370,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr ""
 
@@ -15473,7 +15584,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sestdiena"
 
@@ -15650,7 +15761,7 @@ msgstr "Skripts modificēts"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Skripts"
 
@@ -15720,8 +15831,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15729,7 +15840,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Atlasīt"
 
@@ -15765,19 +15876,19 @@ msgstr "Atlasītie elementi"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15802,7 +15913,7 @@ msgstr "Sūtīt tikai"
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15835,7 +15946,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Septembris"
 
@@ -15867,34 +15978,29 @@ msgid "Server time"
 msgstr "Servera laiks"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Serviss"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15902,7 +16008,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15931,7 +16037,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15947,11 +16053,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Servisa tips"
 
@@ -15960,7 +16066,7 @@ msgstr "Servisa tips"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr ""
 
@@ -15969,16 +16075,16 @@ msgstr ""
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Servisi"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15990,9 +16096,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -16016,10 +16122,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16060,7 +16174,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16106,7 +16220,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16197,7 +16311,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16248,7 +16362,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Parādīt darba laiku"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Parādīts"
 
@@ -16357,7 +16471,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr "Slovāku (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16403,7 +16517,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16477,7 +16591,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16525,12 +16639,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16541,17 +16657,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16575,12 +16698,9 @@ msgstr ""
 msgid "Status"
 msgstr "Stāvoklis"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr ""
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
@@ -16612,6 +16732,10 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16643,8 +16767,8 @@ msgstr ""
 msgid "Steps"
 msgstr "Soļi"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Apturēt"
 
@@ -16656,7 +16780,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16688,7 +16812,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16721,7 +16845,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16737,7 +16861,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16750,7 +16874,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Saule"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Svētdiena"
 
@@ -16842,12 +16966,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "C"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "O"
@@ -16883,8 +17007,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16924,14 +17048,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16939,10 +17062,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17106,7 +17229,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17393,12 +17516,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Cet"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Līdz"
 
@@ -17408,13 +17531,13 @@ msgstr "Līdz"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17495,7 +17618,7 @@ msgstr ""
 msgid "To"
 msgstr "Līdz"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17617,13 +17740,13 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigeris"
 
@@ -17642,7 +17765,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17729,7 +17852,7 @@ msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17797,15 +17920,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17857,7 +17980,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Otr"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Otrdiena"
 
@@ -17870,7 +17993,7 @@ msgstr "Turku (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17885,15 +18008,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17960,7 +18084,7 @@ msgid "UNKNOWN"
 msgstr "NEZINĀMS"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17970,7 +18094,7 @@ msgstr "NEZINĀMS"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "Saite"
 
@@ -18016,7 +18140,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr ""
 
@@ -18064,7 +18188,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18111,7 +18235,8 @@ msgstr "Vai atbloķēt iezīmētos lietotājus?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18130,7 +18255,8 @@ msgstr "Vienības"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18141,9 +18267,9 @@ msgstr "Vienības"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Nav zināms"
@@ -18162,12 +18288,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -18214,7 +18340,7 @@ msgstr "Atvienot no šablona"
 msgid "Unlink from templates"
 msgstr "Atvienot no šabloniem"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18296,27 +18422,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18385,7 +18512,7 @@ msgid "Upper level maps"
 msgstr ""
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Darbspējas laiks"
@@ -18434,37 +18561,37 @@ msgstr ""
 msgid "User"
 msgstr "Lietotājs"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18481,13 +18608,13 @@ msgstr "Lietotājs pievienots"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18513,32 +18640,32 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Lietotāju grupa"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18571,7 +18698,7 @@ msgstr[2] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18579,14 +18706,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Lietotāju grupas"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Lietotājam nav atļauts dzēst sevi."
 
@@ -18636,7 +18763,7 @@ msgstr[2] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18670,7 +18797,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18692,12 +18819,12 @@ msgstr "Lietotāja dati atjaunoti"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18742,7 +18869,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19009,23 +19136,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19232,8 +19359,8 @@ msgstr "Vertikāls novietojums"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19260,7 +19387,12 @@ msgstr ""
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "T"
@@ -19277,11 +19409,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19297,7 +19429,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Tīmeklis"
 
@@ -19368,7 +19500,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Tre"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Trešdiena"
 
@@ -19379,6 +19511,10 @@ msgstr "Trešdiena"
 msgid "Weekly"
 msgstr "Nedēļas"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19396,7 +19532,7 @@ msgstr "Kad aktīvs"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19609,8 +19745,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19652,19 +19788,19 @@ msgstr "Ik gadu"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19732,19 +19868,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Jums nav tiesības veidot jaunus lietotājus."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19865,7 +19997,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19984,7 +20116,6 @@ msgstr "aģents"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20280,9 +20411,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20362,7 +20493,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20409,7 +20540,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20608,13 +20739,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "s"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "ss"
 
@@ -20662,7 +20793,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20888,12 +21019,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20997,8 +21128,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -21093,7 +21224,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "jauns"
 
@@ -21160,7 +21291,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "no"
@@ -21228,7 +21359,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21355,7 +21486,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "īss apraksts"
 
@@ -21440,7 +21571,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21450,8 +21581,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21532,7 +21663,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21595,7 +21726,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "ieraksti ko meklēt"
 
@@ -21622,7 +21753,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21716,7 +21847,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21736,7 +21867,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "vērtība"
 
@@ -21883,7 +22014,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "g"
diff --git a/ui/locale/nb/LC_MESSAGES/frontend.po b/ui/locale/nb/LC_MESSAGES/frontend.po
index 0df56bc9f25..205537f3790 100644
--- a/ui/locale/nb/LC_MESSAGES/frontend.po
+++ b/ui/locale/nb/LC_MESSAGES/frontend.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-03-19 18:13+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -98,7 +98,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dag"
 msgstr[1] "%1$d dager"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -183,7 +183,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -197,7 +197,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -227,17 +227,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s forsøk gjenstår"
 msgstr[1] "%1$s forsøk gjenstår"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s sekund"
 msgstr[1] "%1$s sekunder"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -257,13 +257,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -312,7 +312,7 @@ msgstr "(ingen proxy)"
 msgid "0 - use default port"
 msgstr "0 - bruk standard port"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 eller 1"
 
@@ -380,7 +380,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "AND"
 
@@ -397,7 +397,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -462,40 +462,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Tilgang nektet"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Tilgang nektet!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Ack"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Bekrefte"
 
@@ -503,7 +503,7 @@ msgstr "Bekrefte"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bekreftet"
@@ -532,20 +532,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -650,7 +652,7 @@ msgstr "Handling oppdatert"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -659,7 +661,7 @@ msgstr "Handling oppdatert"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Handlinger"
@@ -718,8 +720,8 @@ msgstr "Aktiv til"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -730,7 +732,6 @@ msgstr "Aktiv til"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -738,11 +739,13 @@ msgstr "Aktiv til"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -754,15 +757,17 @@ msgstr "Aktiv til"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -829,7 +834,7 @@ msgstr "Aktiv til"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Legg til"
 
@@ -837,19 +842,19 @@ msgstr "Legg til"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Legg til ny widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Legg til barnelement"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -866,7 +871,7 @@ msgstr "Legg til vert"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Legg til flere kart"
 
@@ -883,7 +888,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -891,7 +900,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -925,7 +934,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Legg til widget"
 
@@ -934,12 +943,20 @@ msgstr "Legg til widget"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -949,6 +966,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrasjon"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Avanserte merkelapper"
@@ -1035,7 +1056,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Alle"
 
@@ -1044,8 +1065,8 @@ msgid "All dashboards"
 msgstr "Alle dashboard"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Alle grupper"
 
@@ -1053,7 +1074,7 @@ msgstr "Alle grupper"
 msgid "All hosts"
 msgstr "Alle verter"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Alle koblinger skal ha \"Name\" og \"URL\" angitt"
 
@@ -1087,7 +1108,7 @@ msgstr "Alle maler"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1100,7 +1121,7 @@ msgstr "Tillat manuell lukking"
 msgid "Allowed hosts"
 msgstr "Tillatte verter"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1118,7 +1139,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1159,12 +1180,12 @@ msgstr "Og/Eller"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1184,15 +1205,15 @@ msgstr "Programfeil."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Bruk"
 
@@ -1210,7 +1231,7 @@ msgstr "nærmer"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "April"
 
@@ -1238,6 +1259,10 @@ msgstr "Arealtype"
 msgid "Arithmetic"
 msgstr "Aritmetikk"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Som ren tekst"
@@ -1286,8 +1311,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1365,7 +1390,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "August"
 
@@ -1395,7 +1420,7 @@ msgstr "Autentisering"
 msgid "Authentication algorithm"
 msgstr "Autentiseringsalgoritme"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1444,7 +1469,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Automatisk innlogging"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Auto-innlogging og automatisk utlogging kan ikke aktiveres sammen."
 
@@ -1454,7 +1479,7 @@ msgstr "Auto-avlogging"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1639,11 +1664,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Bunn"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Ta med deg fremover"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Ta med til fronten"
 
@@ -1724,7 +1749,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Kalkulert"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1744,8 +1769,8 @@ msgstr "Ring tilbake"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1762,8 +1787,8 @@ msgstr "Ring tilbake"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1793,7 +1818,7 @@ msgstr "Kan ikke legge til handling"
 msgid "Cannot add correlation"
 msgstr "Kan ikke legge til korrelasjon"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1804,7 +1829,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Kan ikke legge til avhengighet fra en vert til en mal."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Kan ikke legge til avhengighet fra utløseren \"%1$s:%2$s\" til ikke eksisterende utløser \"%3$s:%4$s\"."
@@ -1923,7 +1948,7 @@ msgid "Cannot add user"
 msgstr "Kan ikke legge til bruker"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1931,11 +1956,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Kan ikke legge til webscenario"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2016,7 +2041,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "Kan ikke kopiere utløser"
 msgstr[1] "Kan ikke kopiere utløsere"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Kan ikke kopiere utløseren \"%1$s:%2$s\", fordi den har flere verter i uttrykket."
@@ -2071,7 +2096,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Kan ikke slette Zabbix intern bruker \"%1$s\", prøv å deaktivere brukeren."
@@ -2488,7 +2513,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Kan ikke utvide makroer."
 
@@ -2658,7 +2683,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2720,7 +2745,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Kan ikke lese svaret, sjekk forbindelsen med Zabbix-serveren \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Kan ikke gi nytt navn til gjestebruker."
 
@@ -2779,7 +2804,12 @@ msgstr "Kan ikke angi lagerfelt for funksjonshemmede inventar."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3201,6 +3231,7 @@ msgid "Change per second"
 msgstr "Endring per sekund"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3342,7 +3373,7 @@ msgstr "Kontrollerer ytelsen til UDP-tjenesten. Returnerer 0 - tjenesten er nede
 msgid "Checks should be unique."
 msgstr "Sjekker skal være unike."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3384,11 +3415,11 @@ msgstr "Ryd historie og trender"
 msgid "Clear when unlinking"
 msgstr "Fjern når du kobler fra"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3418,7 +3449,7 @@ msgstr "Klokke"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Klon"
 
@@ -3429,8 +3460,8 @@ msgstr "Klon"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Lukk"
 
@@ -3460,8 +3491,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Kollaps"
 
@@ -3478,7 +3509,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3546,6 +3577,7 @@ msgstr "Samtidige økter"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Tilstand"
 
@@ -3600,7 +3632,7 @@ msgstr "Tilstander"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
@@ -3863,7 +3895,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3900,8 +3932,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3962,8 +3994,8 @@ msgstr "Koordinater"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Kopier"
 
@@ -4094,11 +4126,11 @@ msgstr "Lag korrelasjon"
 msgid "Create dashboard"
 msgstr "Opprett dashbord"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Opprett avhengig element"
 
@@ -4215,7 +4247,7 @@ msgstr "Opprett kart"
 msgid "Create media type"
 msgstr "Opprett medietype"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Lag ny"
 
@@ -4231,7 +4263,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Lag skript"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4239,7 +4271,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Opprett mal"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Lag utløseren"
 
@@ -4459,7 +4491,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Dashboard egenskaper"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Dashboard deling"
 
@@ -4489,7 +4521,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "oversikter"
 
@@ -4659,7 +4691,7 @@ msgstr "Ukedag"
 msgid "Days"
 msgstr "Dager"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debug"
 
@@ -4673,7 +4705,7 @@ msgstr "Debug modus"
 msgid "Dec"
 msgstr "Des"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Desember"
 
@@ -4682,13 +4714,17 @@ msgstr "Desember"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Forvalg"
 
@@ -4758,8 +4794,8 @@ msgid "Delayed by"
 msgstr "Forsinket av"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4773,7 +4809,7 @@ msgstr "Forsinket av"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4805,8 +4841,8 @@ msgstr "Forsinket av"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Slett"
 
@@ -4835,7 +4871,7 @@ msgstr "Slett nåværende handling?"
 msgid "Delete current correlation?"
 msgstr "Slett nåværende korrelasjon?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Slett dashbord?"
 
@@ -4879,7 +4915,7 @@ msgstr "Slett element prototype?"
 msgid "Delete item?"
 msgstr "Slett element?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Slett koblinger mellom utvalgte elementer?"
 
@@ -4935,7 +4971,7 @@ msgstr "Slett valgte dashboards?"
 msgid "Delete selected discovery rules?"
 msgstr "Slett valgte registreringsregler?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Slett valgte elementer?"
 
@@ -5036,11 +5072,11 @@ msgstr "Slett utvalgte skript?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Slett valgte former?"
 
@@ -5056,7 +5092,7 @@ msgstr "Slett valgte utløserprototyper?"
 msgid "Delete selected triggers?"
 msgstr "Slett valgte utløsere?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Slett valgt bruker?"
 
@@ -5107,7 +5143,7 @@ msgstr "Slettet: Mal \"%1$s\"."
 msgid "Delimiter"
 msgstr "delimiter"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5121,7 +5157,7 @@ msgstr "Benekte"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5129,7 +5165,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "avhengig"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Avhengig"
 
@@ -5137,7 +5173,7 @@ msgstr "Avhengig"
 msgid "Dependent item"
 msgstr "Avhengige gjenstand"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5165,7 +5201,7 @@ msgstr "Distribusjonsstatus"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5329,7 +5365,7 @@ msgstr "Deaktiver valgte webscenarier?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5342,14 +5378,14 @@ msgstr "Deaktiver valgte webscenarier?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5432,7 +5468,7 @@ msgid "Discovery by proxy"
 msgstr "Oppdagelse ved fullmakt"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Discovery sjekk"
 
@@ -5444,7 +5480,7 @@ msgstr "Discovery sjekker"
 msgid "Discovery list"
 msgstr "Oppdagelsesliste"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Discovery-objekt"
 
@@ -5544,7 +5580,7 @@ msgstr "Oppdagelsesregel oppdatert"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5555,7 +5591,7 @@ msgstr "Discovery regler"
 msgid "Discovery rules deleted"
 msgstr "Discovery regler slettet"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Discovery status"
@@ -5595,7 +5631,7 @@ msgstr "Vis stablet graf"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Viser %1$s av %2$s funnet"
@@ -5613,10 +5649,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Ikke beregne"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5631,7 +5663,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Ønsker du å erstatte det betingede uttrykket?"
 
@@ -5687,7 +5719,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Ned"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5696,7 +5728,7 @@ msgid "Download the configuration file"
 msgstr "Last ned konfigurasjonsfilen"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "nedetid"
@@ -5772,7 +5804,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Dupliser userid \"%1$s\" i brukere for kart \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5794,7 +5826,7 @@ msgstr "Dynamisk element"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Hver nettadresse skal ha et unikt navn. Vennligst kontroller at det bare er en nettadresse som heter"
 
@@ -5802,13 +5834,14 @@ msgstr "Hver nettadresse skal ha et unikt navn. Vennligst kontroller at det bare
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5820,8 +5853,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Redigerer"
 
@@ -5837,11 +5870,11 @@ msgstr "Rediger kart"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Rediger treelement"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Rediger utløseren"
 
@@ -6116,7 +6149,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6138,12 +6171,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6202,7 +6235,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6226,7 +6259,7 @@ msgstr "Feil"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Feil i søkeforespørsel for tabell \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6266,7 +6299,7 @@ msgstr "Hendelse korrelasjonsregler"
 msgid "Event details"
 msgstr "Event detaljer"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Eventgenerering"
 
@@ -6296,7 +6329,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Event tag par"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Hendelses type"
 
@@ -6330,7 +6363,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Eksluder"
 
@@ -6341,7 +6374,7 @@ msgstr "Eksluder"
 msgid "Exclude host groups"
 msgstr "Ekskluder vertsgrupper"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Kj"
 
@@ -6387,7 +6420,7 @@ msgstr "utført"
 msgid "Executed script"
 msgstr "Utført script"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Utførelsesbekreftelse"
 
@@ -6403,8 +6436,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Utvide"
 
@@ -6471,7 +6504,7 @@ msgstr "Eksporter til CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6525,7 +6558,7 @@ msgstr "Uttrykkene"
 msgid "External check"
 msgstr "Ekstern sjekk"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6549,7 +6582,7 @@ msgid "Failed"
 msgstr "mislyktes"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Kunne ikke opprette dashbordet"
 
@@ -6558,24 +6591,24 @@ msgstr "Kunne ikke opprette dashbordet"
 msgid "Failed to parse URL."
 msgstr "Kunne ikke analysere nettadressen."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Kunne ikke oppdatere oversikten"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6583,7 +6616,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Kunne ikke oppdatere mal."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6607,7 +6640,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Februar"
 
@@ -6753,8 +6786,8 @@ msgstr "Fylt område"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6832,6 +6865,10 @@ msgstr "Tilpass til kart"
 msgid "Fixed"
 msgstr "Fikset"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6897,14 +6934,14 @@ msgstr "Fransk (fr_FR)"
 msgid "Fri"
 msgstr "Fre"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Fredag"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6922,7 +6959,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Frontend tilgang"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Frontend-meldinger"
 
@@ -7004,7 +7041,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Gitt uttrykk er ikke en makro"
 
@@ -7022,7 +7059,7 @@ msgstr "Global verdi"
 msgid "Go back to %1$s"
 msgstr "Gå tilbake til %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Gå til"
 
@@ -7071,7 +7108,7 @@ msgstr "Gradient linje"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7232,7 +7269,7 @@ msgstr "Graf med navn \"%1$s\" finnes allerede i diagrammer eller grafprototyper
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafer"
 
@@ -7432,11 +7469,11 @@ msgstr "Hjelp"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadecimal til desimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Skjult"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Skjul feilsøking"
 
@@ -7481,14 +7518,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Historikk"
 
@@ -7552,7 +7589,7 @@ msgstr "Horisontal justering"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7560,8 +7597,7 @@ msgstr "Horisontal justering"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7573,7 +7609,7 @@ msgstr "Horisontal justering"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7653,7 +7689,7 @@ msgstr[1] "Verter aktivert"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7661,7 +7697,7 @@ msgstr[1] "Verter aktivert"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Vertsgruppe"
@@ -7692,7 +7728,7 @@ msgstr "Vertsgruppe etikett type"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Vertsgruppe med ID \"%1$s\" er ikke tilgjengelig."
@@ -7709,7 +7745,7 @@ msgstr "Vertsgruppe med ID \"%1$s\" er ikke tilgjengelig."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7748,7 +7784,7 @@ msgstr "Vertsgrensesnitt"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7896,7 +7932,7 @@ msgstr "Vert med samme synlige navn \"%1$s\" eksisterer allerede."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8128,14 +8164,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Identifikasjon av systemet. Returnerer streng"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Hvis du mener at denne meldingen er feil, vennligst kontakt administratorer om å få de nødvendige tillatelsene."
@@ -8144,12 +8232,16 @@ msgstr "Hvis du mener at denne meldingen er feil, vennligst kontakt administrato
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "bilde"
 
@@ -8279,7 +8371,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8292,11 +8384,11 @@ msgstr "Utilgjengelig kart"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8322,7 +8414,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Inkludere"
 
@@ -8340,6 +8432,11 @@ msgstr "Inkluder undergrupper"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Innkommende trafikkstatistikk på nettgrensesnitt. Returnerer heltall"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8730,7 +8827,7 @@ msgstr "Feil filtertilstandstype for handling \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Feil funksjon brukes"
 
@@ -8787,7 +8884,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Feil varenøkkel \"%1$s\" gitt for utløserkonsept på \"%2$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Feil element verdi type"
 
@@ -8818,7 +8915,7 @@ msgstr "Feil mediatype ID."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Feil metode \"%1$s.%2$s\"."
@@ -8958,10 +9055,10 @@ msgstr "Feil bruker-ID angitt for kart \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Feil brukergruppen ID spesifisert for kart \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9268,9 +9365,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9342,6 +9439,10 @@ msgstr "Feil verdi brukt til PSK-feltet. Den bør bestå av et jevnt antall heks
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Feil verdi brukt for proxy status \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonesisk (id_ID)"
@@ -9353,12 +9454,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9431,7 +9532,7 @@ msgid "Insert"
 msgstr "Sett inn"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Sett inn uttrykk"
 
@@ -9539,7 +9640,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9587,7 +9688,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9690,8 +9791,8 @@ msgstr "Ugyldige metodeparametere."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9895,7 +9996,7 @@ msgstr "Ugyldig tidsperiode."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -10085,7 +10186,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10246,7 +10347,7 @@ msgstr ""
 msgid "Jan"
 msgstr "jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "januar"
 
@@ -10268,7 +10369,7 @@ msgstr ""
 msgid "Jul"
 msgstr "juli"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "juli"
 
@@ -10276,7 +10377,7 @@ msgstr "juli"
 msgid "Jun"
 msgstr "juni"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "juni"
 
@@ -10310,7 +10411,7 @@ msgstr "Tast"
 msgid "Key passphrase"
 msgstr "Nøkkelpassord"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 #, fuzzy
 msgid "Keyword"
 msgstr "N"
@@ -10381,7 +10482,7 @@ msgstr "Etikettsted"
 msgid "Language"
 msgstr "Spr"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10460,11 +10561,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Siste sjekk"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Siste timepr"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Forrige måned graf"
 
@@ -10502,7 +10603,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Siste verdi"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Forrige uke graf"
 
@@ -10515,11 +10616,11 @@ msgstr "Forrige uke graf"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Siste data"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Siste verdier"
 
@@ -10630,7 +10731,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10708,12 +10809,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Liste over brukergruppe aksjer"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Liste over brukeraksjer"
@@ -10842,7 +10943,7 @@ msgstr "Lavnivåregistreringsregel i \"ikke støttet\" tilstand"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -11002,7 +11103,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11031,7 +11132,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Kart"
 
@@ -11070,7 +11171,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11096,7 +11197,7 @@ msgstr "Karteieren kan ikke være tom."
 msgid "Map shape"
 msgstr "Kartform"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Kartoppdatering mislyktes."
 
@@ -11132,7 +11233,7 @@ msgstr "Maps"
 msgid "Mar"
 msgstr "mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Mars"
 
@@ -11159,7 +11260,7 @@ msgstr "Maske"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11230,9 +11331,9 @@ msgstr "Maks antall åpne filer støttet av OS. Returnerer heltall"
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Maks antall prosesser som støttes av OS. Returnerer heltall"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11245,12 +11346,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "Maksimal tidsperiode å vise er %1$s dag."
 msgstr[1] "Maksimal tidsperiode å vise er %1$s dager."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Kan"
 
@@ -11260,8 +11361,8 @@ msgid "May"
 msgstr "Kan"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11322,7 +11423,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Medietype oppdatert"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Medietype med ID \"%1$s\" er ikke tilgjengelig."
@@ -11395,8 +11496,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Melding timeout"
 
@@ -11414,7 +11515,7 @@ msgstr ""
 msgid "Messages"
 msgstr "meldinger"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Meldinger"
 
@@ -11442,6 +11543,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11457,11 +11563,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11607,7 +11708,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Man"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Mandag"
 
@@ -11647,11 +11748,11 @@ msgstr "Måned"
 msgid "Monthly"
 msgstr "Månedlig"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Flere treff funnet ..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11667,6 +11768,14 @@ msgstr "Mer enn 10 minutter"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Mer enn en graf med navn \"%1$s\" i verten."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11676,11 +11785,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Flere"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Flere PROBLEM-hendelser"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Stum"
 
@@ -11688,6 +11797,18 @@ msgstr "Stum"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11782,25 +11903,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11943,6 +12065,10 @@ msgstr ""
 msgid "Never"
 msgstr "Aldri"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11954,7 +12080,7 @@ msgstr "Ny tilstand"
 msgid "New dashboard"
 msgstr "Nytt dashbord"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nytt element"
 
@@ -11978,7 +12104,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nytt regulært uttrykk"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11995,7 +12121,7 @@ msgid "New triggers"
 msgstr "Nye utløsere"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12013,20 +12139,20 @@ msgstr "Neste steg"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12159,7 +12285,7 @@ msgstr "Ingen detaljer"
 msgid "No discovery rule IDs given."
 msgstr "Ingen oppdagelsesregel-IDer er gitt."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12221,7 +12347,7 @@ msgstr "Ikke noe bilde"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Ingen grensesnitt funnet"
 
@@ -12261,7 +12387,7 @@ msgstr "Ingen makroer funnet."
 msgid "No maps added."
 msgstr "Ingen kart lagt til."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Ingen treff funnet"
 
@@ -12274,8 +12400,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Ingen operasjonstype gitt for korrelasjon \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Ingen tillatelser for systemtilgang."
 
@@ -12287,7 +12413,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12295,11 +12420,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12417,19 +12543,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12438,15 +12564,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12473,7 +12599,7 @@ msgstr "Ingen offentlig nøkkelfil spesifisert."
 msgid "No recipients for action operation message."
 msgstr "Ingen mottakere for meldingshandling."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Ingen oppdatering"
 
@@ -12489,7 +12615,7 @@ msgstr "Ingen mål valgt"
 msgid "No target selected."
 msgstr "Ingen mål valgt."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12536,7 +12662,7 @@ msgstr "Ingen"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12568,15 +12694,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Ikke lov til å angi passord for brukerens \"gjest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12608,8 +12734,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Ikke støttet"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Merk"
 
@@ -12639,7 +12765,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "November"
 
@@ -12802,12 +12928,12 @@ msgstr "Numerale systemer"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numerisk (flyt)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Numerisk (heltall)"
 
@@ -12822,18 +12948,17 @@ msgstr "Numerisk (usignert)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12860,7 +12985,7 @@ msgstr "OOB-ruteren"
 msgid "OOB subnet mask"
 msgstr "OOB subnettmaske"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "ELLER"
 
@@ -12888,13 +13013,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr "Oktal til desimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Oktober"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Av"
 
@@ -12906,7 +13031,7 @@ msgstr "Av"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12925,7 +13050,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "På"
 
@@ -12933,7 +13058,7 @@ msgstr "På"
 msgid "On status change triggers blink for"
 msgstr "På statusendring utløser blink for"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "En gang"
 
@@ -12950,7 +13075,7 @@ msgid "One time only"
 msgstr "Kun en gang"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Engangs nedetid"
 
@@ -12962,26 +13087,14 @@ msgstr "Bare superadministratorer kan opprette vertsgrupper."
 msgid "Only Super Admins can create media types."
 msgstr "Bare superadministratorer kan opprette medietyper."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Bare superadministratorer kan opprette brukergrupper."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Bare Super Admins kan slette medietyper."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Bare Super Admins kan slette brukergrupper."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Bare Super Admins kan redigere medietyper."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Bare Super Admins kan oppdatere brukergrupper."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Kun Zabbix-agent, SNMPv1, SNMPv2 og SNMPv3-kontroller kan gjøres unike."
@@ -13022,11 +13135,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Kun valgt problem"
 msgstr[1] "Kun valgte problemer"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13059,7 +13172,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Operativsysteminformasjon. Returnerer streng"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13084,7 +13197,7 @@ msgstr "Operasjonen har ingen gruppe å betjene."
 msgid "Operation has no template to operate."
 msgstr "Operasjonen har ingen mal å betjene."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13109,27 +13222,27 @@ msgstr "Operasjoner"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operatør"
 
@@ -13154,7 +13267,7 @@ msgstr "Alternativer"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13171,8 +13284,8 @@ msgstr "Eller"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13219,9 +13332,9 @@ msgstr "Eller"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Opprinnelig"
 
@@ -13473,7 +13586,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEM"
@@ -13520,7 +13633,7 @@ msgstr "PSK-identitet"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK er for kort. Minimum er %1$s hex-siffer."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13543,13 +13656,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13580,9 +13695,7 @@ msgstr "Foreldreelementer"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13671,15 +13784,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Lim inn"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Lim inn uten eksterne lenker"
 
@@ -13753,19 +13870,20 @@ msgid "Periods"
 msgstr "perioder"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "tillatelser"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Tillatelser kan bare tilordnes for brukergrupper."
 
@@ -13787,12 +13905,12 @@ msgstr "Plassering av algoritme"
 msgid "Plain text"
 msgstr "Vanlig tekst"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Spill"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Spill lyd"
 
@@ -13822,7 +13940,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Vennligst skriv inn vertsnavnet eller verts IP-adressen og portnummeret til Zabbix-serveren, samt navnet på installasjonen (valgfritt)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Vennligst velg to elementer"
 
@@ -13951,7 +14069,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14009,7 +14127,7 @@ msgstr "Personvern passordfrase"
 msgid "Privacy protocol"
 msgstr "Personvern protokoll"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privat"
@@ -14029,12 +14147,12 @@ msgid "Privilege level"
 msgstr "Privilege nivå"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14064,7 +14182,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Problemvisning"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Problemuttrykk"
@@ -14082,7 +14200,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problem på"
 
@@ -14095,8 +14213,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14109,14 +14227,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problem, hvis alle barn har problemer"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problem, hvis minst ett barn har et problem"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14133,7 +14243,7 @@ msgstr "Problem, hvis minst ett barn har et problem"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "problemer"
 
@@ -14167,12 +14277,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14194,7 +14304,7 @@ msgstr "fullmakter"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14257,7 +14367,7 @@ msgstr "Proxy-navn"
 msgid "Proxy updated"
 msgstr "Proxy oppdatert"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Offentlig"
@@ -14351,8 +14461,8 @@ msgstr "Lese"
 msgid "Read only"
 msgstr "Les bare"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14360,8 +14470,8 @@ msgstr "Skrivebeskyttet"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14414,7 +14524,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14422,7 +14532,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Gjenoppretting"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14457,7 +14567,7 @@ msgstr "Rektangel"
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14518,7 +14628,7 @@ msgstr "Vanlig uttrykk"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14550,6 +14660,7 @@ msgstr "Fjernkommando"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14559,7 +14670,7 @@ msgstr "Fjernkommando"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14567,13 +14678,13 @@ msgstr "Fjernkommando"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14583,8 +14694,8 @@ msgstr "Fjernkommando"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14661,8 +14772,8 @@ msgstr "Fjernkommando"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Fjern"
 
@@ -14702,7 +14813,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14731,7 +14842,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14739,7 +14850,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Erstatt"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Erstatt avhengigheter"
 
@@ -14846,7 +14957,7 @@ msgstr "Nødvendige statuskoder"
 msgid "Required string"
 msgstr "Nødvendig streng"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Nullstill"
@@ -14880,7 +14991,7 @@ msgstr "Tilbakestill bekreftelse"
 msgid "Reset defaults"
 msgstr "Tilbakestill standardinnstillinger"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Løst"
 
@@ -15078,8 +15189,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Høyre trim"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15137,12 +15248,12 @@ msgstr "Kjør angitt kommando på verten. Returnerer tekstresultatet av kommando
 msgid "Russian (ru_RU)"
 msgstr "Russisk (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15153,10 +15264,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15369,7 +15478,7 @@ msgstr "Sans serif"
 msgid "Sat"
 msgstr "Lør"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -15542,7 +15651,7 @@ msgstr "Skript oppdatert"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Skript"
 
@@ -15612,8 +15721,8 @@ msgid "Security name"
 msgstr "Sikkerhetsnavn"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15621,7 +15730,7 @@ msgstr "Sikkerhetsnavn"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Valgt"
 
@@ -15657,19 +15766,19 @@ msgstr "Valgte elementer"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Send bakover"
 
@@ -15694,7 +15803,7 @@ msgstr "Send bare til"
 msgid "Send to"
 msgstr "Send til"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Plasser i bakgrunnen"
 
@@ -15727,7 +15836,7 @@ msgstr "Separert"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "September"
 
@@ -15759,34 +15868,29 @@ msgid "Server time"
 msgstr "Server tid"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Tjeneste"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15794,7 +15898,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Service opprettet"
 
@@ -15823,7 +15927,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Startstart for service må være mindre enn sluttid."
 
@@ -15839,11 +15943,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Tjenestetider"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tjeneste type"
 
@@ -15852,7 +15956,7 @@ msgstr "Tjeneste type"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Tjeneste oppdatert"
 
@@ -15861,16 +15965,16 @@ msgstr "Tjeneste oppdatert"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Tjenester"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Tjenester danner en sirkulær avhengighet."
 
@@ -15882,9 +15986,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sesjonen avsluttet, logg på igjen, vær så snill."
 
@@ -15908,10 +16012,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Angi vert inventar modus"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15952,7 +16064,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15998,7 +16110,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Deling"
 
@@ -16089,7 +16201,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16140,7 +16252,7 @@ msgstr "Vis advarsel hvis Zabbix-serveren er nede"
 msgid "Show working time"
 msgstr "Vis arbeidstid"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Vist"
 
@@ -16249,7 +16361,7 @@ msgstr "Hoppet over kopiering av grafen \"%1$s\" for å være vert for \"%2$s\".
 msgid "Slovak (sk_SK)"
 msgstr "Slovakisk (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -16295,7 +16407,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Sorter oppføringer etter"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sorteringsrekkefølge (0-> 999)"
 
@@ -16369,7 +16481,7 @@ msgstr "Start i"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16417,12 +16529,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16433,17 +16547,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16467,13 +16588,10 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Statusberegning"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Statusberegningsalgoritme"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16504,6 +16622,10 @@ msgstr "Kun status"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16535,8 +16657,8 @@ msgstr "Trinn med navn \"%1$s\" eksisterer allerede."
 msgid "Steps"
 msgstr "Steg"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Stopp"
 
@@ -16548,7 +16670,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16580,7 +16702,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16613,7 +16735,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Emne"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Submap"
 
@@ -16629,7 +16751,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Suksess revisjon"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16642,7 +16764,7 @@ msgstr "Summen av innkommende og utgående trafikkstatistikk på nettverksgrense
 msgid "Sun"
 msgstr "Søn"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -16734,12 +16856,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "System oppetid på sekunder. Returnerer heltall"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16775,8 +16897,8 @@ msgstr "Tabellen \"%1$s\" har ikke et felt som heter \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tagg"
@@ -16816,14 +16938,13 @@ msgstr "Merkverdien"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16831,10 +16952,10 @@ msgstr "Merkverdien"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16998,7 +17119,7 @@ msgstr "Mal med det samme synlige navnet \"%1$s\" eksisterer allerede."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17283,12 +17404,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Tor"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Inntil"
 
@@ -17298,13 +17419,13 @@ msgstr "Inntil"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17385,7 +17506,7 @@ msgstr "Tidsstempel"
 msgid "To"
 msgstr "Til"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "For å angi et vertsgrensesnitt, velg en enkelt gjenstandstype for alle elementer"
 
@@ -17507,13 +17628,13 @@ msgstr "Trender"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Utløser"
 
@@ -17532,7 +17653,7 @@ msgstr "Trigger \"%1$s\" tilhører maler med forskjellige koblinger."
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Trigger \"%1$s\" avhenger av utløseren \"%2$s\", som ikke eksisterer."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17616,7 +17737,7 @@ msgstr "Utløser oversikt"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17683,15 +17804,15 @@ msgstr "Trigger prototyper slettet"
 msgid "Trigger prototypes updated"
 msgstr "Trigger prototyper oppdatert"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger alvorlighet"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Trigger status \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Trigger status \"Problem\""
 
@@ -17743,7 +17864,7 @@ msgstr "Trim"
 msgid "Tue"
 msgstr "Tir"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -17756,7 +17877,7 @@ msgstr "Tyrkisk (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "To elementer (\"%1$s\" og \"%2$s\") kan ikke fylle ut et vertsinventarfelt \"%3$s\", dette vil føre til konflikt."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17771,15 +17892,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17846,7 +17968,7 @@ msgid "UNKNOWN"
 msgstr "UKJENT"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17856,7 +17978,7 @@ msgstr "UKJENT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17902,7 +18024,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "Nettadressen skal ha både \"navn\" og \"url\" -felt for kart \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "webadresser"
 
@@ -17950,7 +18072,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Kan ikke overskrive den eksisterende konfigurasjonsfilen."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17997,7 +18119,8 @@ msgstr "Fjern blokkering av valgte brukere?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18016,7 +18139,8 @@ msgstr "Enheter"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18027,9 +18151,9 @@ msgstr "Enheter"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Ukjent"
@@ -18048,12 +18172,12 @@ msgstr "Ukjent feil"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Ukjent vertsobjekt, ikke noe element i valgt vert"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Ukjent vert, ingen slik vert i systemet"
 
@@ -18100,7 +18224,7 @@ msgstr "Fjern koblingen fra mal"
 msgid "Unlink from templates"
 msgstr "Fjern kobling fra maler"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Mikrofon"
 
@@ -18181,27 +18305,28 @@ msgstr "Opp"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18270,7 +18395,7 @@ msgid "Upper level maps"
 msgstr "Øvre nivå kart"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Oppetid"
@@ -18319,37 +18444,37 @@ msgstr "Brukes i handlinger"
 msgid "User"
 msgstr "Bruker"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Bruker \"%1$s\" kan ikke være uten brukergruppe."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "Bruker \"%1$s\" er dashbordet \"%2$s\" eier."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Bruker \"%1$s\" er eier av kart \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "Bruker \"%1$s\" brukes i \"%2$s\" handling."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18366,13 +18491,13 @@ msgstr "Bruker lagt til"
 msgid "User agent string"
 msgstr "Brukeragent streng"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Brukeren kan ikke legge seg til en deaktivert gruppe eller en gruppe med deaktivert GUI-tilgang."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18397,32 +18522,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Brukergruppe"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Brukergruppe \"%1$s\" eksisterer allerede."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Brukergruppe \"%1$s\" brukes i \"%2$s\" handling."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Brukergruppe \"%1$s\" brukes i konfigurasjon for nedlastingsmeldinger."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Brukergruppe \"%1$s\" brukes i skriptet \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18453,7 +18578,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Brukergruppe med ID \"%1$s\" er ikke tilgjengelig."
@@ -18461,14 +18586,14 @@ msgstr "Brukergruppe med ID \"%1$s\" er ikke tilgjengelig."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Brukergrupper"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Brukeren har ikke lov til å slette seg selv."
 
@@ -18517,7 +18642,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18551,7 +18676,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Brukerdeling mangler parametere: %1$s for kart \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18572,12 +18697,12 @@ msgstr "Bruker oppdatert"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Bruker med ID \"%1$s\" er ikke tilgjengelig."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18622,7 +18747,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18889,23 +19014,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19112,8 +19237,8 @@ msgstr "Vertikaljustering"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamesisk (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19140,7 +19265,12 @@ msgstr "Synlig navn"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Synlig navn kan ikke være tomt hvis vertsnavnet mangler."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "O"
@@ -19157,11 +19287,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Vi beklager, det maksimalt antall elementer som skal huskes, er nådd."
 
@@ -19177,7 +19307,7 @@ msgstr "Vi beklager, det maksimalt antall elementer som skal huskes, er nådd."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19246,7 +19376,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Ons"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -19257,6 +19387,10 @@ msgstr "Onsdag"
 msgid "Weekly"
 msgstr "Ukentlig"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Velkommen"
@@ -19274,7 +19408,7 @@ msgstr "Når aktiv"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19487,8 +19621,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19530,19 +19664,19 @@ msgstr "Årlig"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19610,19 +19744,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Du har ikke tillatelse til å utføre denne operasjonen."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Du har ikke tilgang til å opprette brukere."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Du har ikke tilgang til denne siden."
@@ -19743,7 +19873,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "en boolean verdi forventes"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19862,7 +19992,6 @@ msgstr "agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20158,9 +20287,9 @@ msgstr "kan ikke endres"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20240,7 +20369,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "Sirkulær elementavhengighet er ikke tillatt"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20287,7 +20416,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20486,13 +20615,13 @@ msgstr "globale housekeeping innstillinger"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20541,7 +20670,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "inkludert undergrupper"
 
@@ -20767,12 +20896,12 @@ msgstr "lavnivå oppdagelsesregel"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20876,8 +21005,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr "Minste lengde er %1$s tegn"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20972,7 +21101,7 @@ msgstr ""
 msgid "name"
 msgstr "navn"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "ny"
 
@@ -21039,7 +21168,7 @@ msgstr ""
 msgid "number"
 msgstr "nummer"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "av"
@@ -21107,7 +21236,7 @@ msgstr "produksjon"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21234,7 +21363,7 @@ msgstr "valgt"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "Kort beskrivelse"
 
@@ -21319,7 +21448,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21329,8 +21458,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21411,7 +21540,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21474,7 +21603,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "skriv her for å søke"
 
@@ -21501,7 +21630,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21595,7 +21724,7 @@ msgstr "ikke-støttet versjonsnummer"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21615,7 +21744,7 @@ msgstr "ikke-støttet versjonsnummer"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "verdi"
 
@@ -21762,7 +21891,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "å"
diff --git a/ui/locale/nl/LC_MESSAGES/frontend.po b/ui/locale/nl/LC_MESSAGES/frontend.po
index 6a11d336b8e..23c887929f1 100644
--- a/ui/locale/nl/LC_MESSAGES/frontend.po
+++ b/ui/locale/nl/LC_MESSAGES/frontend.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-08-07 16:41+0300\n"
 "Last-Translator: open-future <patrik@open-future.be>\n"
 "Language-Team: NL\n"
@@ -96,7 +96,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dag"
 msgstr[1] "%1$d dagen"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -181,7 +181,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -195,7 +195,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -225,17 +225,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s poging resterend"
 msgstr[1] "%1$s pogingen resterend"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s seconde"
 msgstr[1] "%1$s seconden"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -255,13 +255,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -310,7 +310,7 @@ msgstr "(geen proxy)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 of 1"
 
@@ -378,7 +378,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "EN"
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -460,40 +460,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Toegang geweigerd!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Bvst"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Bevestigen"
 
@@ -501,7 +501,7 @@ msgstr "Bevestigen"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bevestigd"
@@ -530,20 +530,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -648,7 +650,7 @@ msgstr "Actie bijgewerkt"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -657,7 +659,7 @@ msgstr "Actie bijgewerkt"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acties"
@@ -716,8 +718,8 @@ msgstr "Actief tot"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -728,7 +730,6 @@ msgstr "Actief tot"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -736,11 +737,13 @@ msgstr "Actief tot"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -752,15 +755,17 @@ msgstr "Actief tot"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -827,7 +832,7 @@ msgstr "Actief tot"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -835,19 +840,19 @@ msgstr "Toevoegen"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -864,7 +869,7 @@ msgstr "Host toevoegen"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -881,7 +886,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -889,7 +898,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -923,7 +932,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -932,12 +941,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Beheerder"
@@ -947,6 +964,10 @@ msgstr "Beheerder"
 msgid "Administration"
 msgstr "Beheer"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Geavanceerde labels"
@@ -1033,7 +1054,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Alle"
 
@@ -1042,8 +1063,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1051,7 +1072,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Bij alle koppelingen moeten \"Naam\" en \"URL\" gespecificeerd zijn."
 
@@ -1085,7 +1106,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1098,7 +1119,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Toegestane hosts"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1116,7 +1137,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1157,12 +1178,12 @@ msgstr "En/Of"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1182,15 +1203,15 @@ msgstr "Applicatie fout."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -1208,7 +1229,7 @@ msgstr "Naderen"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "April"
 
@@ -1236,6 +1257,10 @@ msgstr "Type van het gebied"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Als platte tekst"
@@ -1284,8 +1309,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1363,7 +1388,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Augustus"
 
@@ -1393,7 +1418,7 @@ msgstr "Authenticatie"
 msgid "Authentication algorithm"
 msgstr "Authenticatie algoritme"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1442,7 +1467,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Auto-login"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1452,7 +1477,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1637,11 +1662,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Onderzijde"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1722,7 +1747,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Berekend"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1742,8 +1767,8 @@ msgstr "Terugbellen"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1760,8 +1785,8 @@ msgstr "Terugbellen"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -1791,7 +1816,7 @@ msgstr "kan actie niet toevoegen"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1802,7 +1827,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Kan geen host afhankelijkheid toevoegen aan een template."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Kan afhankelijkheid van trigger \"%1$s:%2$s\" niet toevoegen aan bestaande trigger \"%3$s:%4$s\"."
@@ -1921,7 +1946,7 @@ msgid "Cannot add user"
 msgstr "Kan gebruiker niet toevoegen"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1929,11 +1954,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Kan web scenario niet toevoegen."
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2014,7 +2039,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2069,7 +2094,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2485,7 +2510,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2655,7 +2680,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2717,7 +2742,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Kan het antwoord niet lezen. Controleer de verbinding met Zabbix server \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Kan de gastgebruiker niet hernoemen."
 
@@ -2776,7 +2801,12 @@ msgstr "Inventory velden kunnen niet ingesteld worden voor uitgeschakelde invent
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3201,6 +3231,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3342,7 +3373,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Controles moeten uniek zijn."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3384,11 +3415,11 @@ msgstr "Wis geschiedenis en trends"
 msgid "Clear when unlinking"
 msgstr "Wis bij ontkoppelen"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3418,7 +3449,7 @@ msgstr "Klok"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Kloon"
 
@@ -3429,8 +3460,8 @@ msgstr "Kloon"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Sluiten"
 
@@ -3460,8 +3491,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3478,7 +3509,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3546,6 +3577,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Condities"
 
@@ -3600,7 +3632,7 @@ msgstr "Condities"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Configuratie"
 
@@ -3863,7 +3895,7 @@ msgstr "Contact"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3900,8 +3932,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3962,8 +3994,8 @@ msgstr "Coordinaten"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Kopie"
 
@@ -4093,11 +4125,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4214,7 +4246,7 @@ msgstr "Maak kaart"
 msgid "Create media type"
 msgstr "Maak media type aan"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Nieuwe aanmaken"
 
@@ -4230,7 +4262,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Maak script aan"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4238,7 +4270,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Maak sjabloon aan"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Maak trigger aan"
 
@@ -4458,7 +4490,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4488,7 +4520,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4658,7 +4690,7 @@ msgstr "Dag van de week"
 msgid "Days"
 msgstr "Dagen"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debug"
 
@@ -4672,7 +4704,7 @@ msgstr "Debug mode"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "December"
 
@@ -4681,13 +4713,17 @@ msgstr "December"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Standaard"
 
@@ -4757,8 +4793,8 @@ msgid "Delayed by"
 msgstr "Vertraagd door"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4772,7 +4808,7 @@ msgstr "Vertraagd door"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4804,8 +4840,8 @@ msgstr "Vertraagd door"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -4834,7 +4870,7 @@ msgstr "Huidige actie verwijderen?"
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4878,7 +4914,7 @@ msgstr "Item-prototype verwijderen?"
 msgid "Delete item?"
 msgstr "Item verwijderen?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Koppeling tussen geselecteerd elementen verwijderen?"
 
@@ -4934,7 +4970,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Geselecteerde discovery regels verwijderen?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Geselecteerde elementen verwijderen?"
 
@@ -5035,11 +5071,11 @@ msgstr "Geselecteerde scripts verwijderen?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5055,7 +5091,7 @@ msgstr "Geselecteerde trigger-prototypen verwijderen?"
 msgid "Delete selected triggers?"
 msgstr "Geselecteerde trigger verwijderen?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Geselecteerde gebruiker verwijderen?"
 
@@ -5106,7 +5142,7 @@ msgstr "Verwijderd: Sjabloon \"%1$s\"."
 msgid "Delimiter"
 msgstr "Onderscheidingsteken"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5120,7 +5156,7 @@ msgstr "Weiger"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5128,7 +5164,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Afhankelijkheden"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Afhankelijk"
 
@@ -5136,7 +5172,7 @@ msgstr "Afhankelijk"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5164,7 +5200,7 @@ msgstr "Uitrol status"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5328,7 +5364,7 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5341,14 +5377,14 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5431,7 +5467,7 @@ msgid "Discovery by proxy"
 msgstr "Ontdekt door proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Ontdekking controle"
 
@@ -5443,7 +5479,7 @@ msgstr "Ontdekking controles"
 msgid "Discovery list"
 msgstr "Ontdekking lijst"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Ontdekking object"
 
@@ -5543,7 +5579,7 @@ msgstr "Ontdekkingsregel aangepast"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5554,7 +5590,7 @@ msgstr "Ontdekkingsregels"
 msgid "Discovery rules deleted"
 msgstr "Ontdekkingsregels verwijderd"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Ontdekking status"
@@ -5594,7 +5630,7 @@ msgstr "Toon gestapelde grafiek"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Weergave %1$s van %2$s gevonden"
@@ -5612,10 +5648,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Bereken niet"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5630,7 +5662,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Wens je de voorwaardelijke expressie te vervangen?"
 
@@ -5686,7 +5718,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Uit"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5695,7 +5727,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Uitvaltijd"
@@ -5771,7 +5803,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5793,7 +5825,7 @@ msgstr "Dynamisch item"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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"
 
@@ -5801,13 +5833,14 @@ msgstr "Elke URL moet een unieke naam hebben, Aub wees zeker dat er maar een URL
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5819,8 +5852,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Bijwerken"
 
@@ -5836,11 +5869,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Trigger bijwerken"
 
@@ -6115,7 +6148,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6137,12 +6170,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6201,7 +6234,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6225,7 +6258,7 @@ msgstr "Fout"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Fout in opzoek verzoek voor tabel \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6264,7 +6297,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Details evenement"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Gebeurteniscreatie"
 
@@ -6294,7 +6327,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Soort evenement"
 
@@ -6328,7 +6361,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Uitsluiten"
 
@@ -6339,7 +6372,7 @@ msgstr "Uitsluiten"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Uitvoeren"
 
@@ -6385,7 +6418,7 @@ msgstr "Uitgevoerd"
 msgid "Executed script"
 msgstr "Uitgevoerd script"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Uitvoer bevestiging"
 
@@ -6401,8 +6434,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6469,7 +6502,7 @@ msgstr "Exporteren naar CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6523,7 +6556,7 @@ msgstr "Expressies"
 msgid "External check"
 msgstr "Externe controle"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6547,7 +6580,7 @@ msgid "Failed"
 msgstr "Mislukt"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6556,24 +6589,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6581,7 +6614,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Bijwerken van sjabloon mislukt."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6605,7 +6638,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Februarie"
 
@@ -6751,8 +6784,8 @@ msgstr "Ingevulde regio"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6830,6 +6863,10 @@ msgstr "Passend in kaart"
 msgid "Fixed"
 msgstr "Statisch"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6895,14 +6932,14 @@ msgstr "French (fr_FR)"
 msgid "Fri"
 msgstr "Vrij"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Vrijdag"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6920,7 +6957,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Voorkant toegang"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Voorkant Berichten"
 
@@ -7002,7 +7039,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Gegeven uitdrukking is geen macro"
 
@@ -7020,7 +7057,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Ga naar"
 
@@ -7069,7 +7106,7 @@ msgstr "Verlooplijn"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7230,7 +7267,7 @@ msgstr "Grafiek met de naam \"%1$s\" bestaat al in grafieken of grafiek prototyp
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafieken"
 
@@ -7430,11 +7467,11 @@ msgstr "Help"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7479,14 +7516,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Geschiedenis"
 
@@ -7550,7 +7587,7 @@ msgstr "Horizontale uitlijning"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7558,8 +7595,7 @@ msgstr "Horizontale uitlijning"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7571,7 +7607,7 @@ msgstr "Horizontale uitlijning"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7651,7 +7687,7 @@ msgstr[1] "Hosts ingeschakeld"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7659,7 +7695,7 @@ msgstr[1] "Hosts ingeschakeld"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Hostgroep"
@@ -7690,7 +7726,7 @@ msgstr "Hostgroep typeplaatje"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7707,7 +7743,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7746,7 +7782,7 @@ msgstr "Host interface"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7895,7 +7931,7 @@ msgstr "Host met de weergavenaam \"%1$s\" bestaat al."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8127,14 +8163,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8143,12 +8231,16 @@ msgstr "Als u denkt dat dit bericht foutis, neem dan contact op met uw beheerder
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Afbeelding"
 
@@ -8278,7 +8370,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8291,11 +8383,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8321,7 +8413,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "bevat"
 
@@ -8339,6 +8431,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8729,7 +8826,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Verkeerde functie wordt gebruikt"
 
@@ -8786,7 +8883,7 @@ 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\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8817,7 +8914,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8957,10 +9054,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9267,9 +9364,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9341,6 +9438,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Onjuiste waarde gebruikt voor proxy-status \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonesisch (id_ID)"
@@ -9352,12 +9453,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9430,7 +9531,7 @@ msgid "Insert"
 msgstr "Invoegen"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Voeg expressie in"
 
@@ -9538,7 +9639,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9586,7 +9687,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9689,8 +9790,8 @@ msgstr "Ongeldige werkwijze parameters."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9894,7 +9995,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -10085,7 +10186,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10246,7 +10347,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Januari"
 
@@ -10268,7 +10369,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Juli"
 
@@ -10276,7 +10377,7 @@ msgstr "Juli"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Juni"
 
@@ -10310,7 +10411,7 @@ msgstr "Key"
 msgid "Key passphrase"
 msgstr "Key wachtzin"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "sleutelwoord"
 
@@ -10380,7 +10481,7 @@ msgstr "Label locatie"
 msgid "Language"
 msgstr "Taal"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10459,11 +10560,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Laatste controle"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Grafiek voor het laatste uur"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Grafiek voor de laatste maand"
 
@@ -10501,7 +10602,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Laatste waarde"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Grafiek van de laatste week"
 
@@ -10514,11 +10615,11 @@ msgstr "Grafiek van de laatste week"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Laatste data"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Laatste waarden"
 
@@ -10629,7 +10730,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10707,12 +10808,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10840,7 +10941,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -11000,7 +11101,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11029,7 +11130,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Kaart"
 
@@ -11068,7 +11169,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11094,7 +11195,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Bijwerken van kaart is mislukt."
 
@@ -11130,7 +11231,7 @@ msgstr "Kaarten"
 msgid "Mar"
 msgstr "Mrt"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Maart"
 
@@ -11157,7 +11258,7 @@ msgstr "Masker"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11228,9 +11329,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11243,12 +11344,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mei"
 
@@ -11258,8 +11359,8 @@ msgid "May"
 msgstr "Mei"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11320,7 +11421,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Media type bijgewerkt"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11393,8 +11494,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Bericht timeout"
 
@@ -11412,7 +11513,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Berichten"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11440,6 +11541,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11455,11 +11561,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11605,7 +11706,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Maa"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Maandag"
 
@@ -11645,11 +11746,11 @@ msgstr "Maand"
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Meer overeenkomsten gevonden..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11665,6 +11766,14 @@ msgstr "Meer dan 10 minuten"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Meer dan één grafiek met naam \"%1$s\" binnen deze host."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11674,11 +11783,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Meerdere PROBLEEM events"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Dempen"
 
@@ -11686,6 +11795,18 @@ msgstr "Dempen"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11780,25 +11901,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11941,6 +12063,10 @@ msgstr ""
 msgid "Never"
 msgstr "Nooit"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11952,7 +12078,7 @@ msgstr "Nieuwe voorwaarde"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nieuw element"
 
@@ -11976,7 +12102,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nieuwe reguliere expressie"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11993,7 +12119,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12011,20 +12137,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12157,7 +12283,7 @@ msgstr "Geen details"
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12219,7 +12345,7 @@ msgstr "Geen afbeelding"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Geen interface gevonden"
 
@@ -12259,7 +12385,7 @@ msgstr "Geen macro's gevonden."
 msgid "No maps added."
 msgstr "Geen kaarten toegevoegd."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Geen overeenkomsten gevonden."
 
@@ -12272,8 +12398,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12285,7 +12411,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12293,11 +12418,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12415,19 +12541,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12436,15 +12562,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12471,7 +12597,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr "Geen ontvangers voor bericht van actiehandeling."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12487,7 +12613,7 @@ msgstr "Geen doel geselecteerd"
 msgid "No target selected."
 msgstr "Geen doel geselecteerd."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12534,7 +12660,7 @@ msgstr "Geen"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12566,15 +12692,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Niet toegestaan om het wachtwoord van user \"guest\" in te stellen."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12606,8 +12732,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Niet ondersteund"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Opmerking"
 
@@ -12637,7 +12763,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "November"
 
@@ -12800,12 +12926,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numeriek (zwevend)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12820,18 +12946,17 @@ msgstr "Numeriek (integer 64bit)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12858,7 +12983,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr ""
 
@@ -12886,13 +13011,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "UIT"
 
@@ -12904,7 +13029,7 @@ msgstr "UIT"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12923,7 +13048,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "AAN"
 
@@ -12931,7 +13056,7 @@ msgstr "AAN"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr ""
 
@@ -12948,7 +13073,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Eenmalige onderbreking"
 
@@ -12960,26 +13085,14 @@ msgstr "Alleen hoofdbeheerders kunnen hostgroepen aanmaken."
 msgid "Only Super Admins can create media types."
 msgstr "Alleen hoofdbeheerders kunnen mediatypen aanmaken."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Alleen hoofdbeheerders kunnen mediatypen verwijderen."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Alleen hoofdbeheerders kunnen gebruikersgroepen verwijderen."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Alleen hoofdgebruikers kunnen mediatypen wijzigen."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13020,11 +13133,11 @@ msgid_plural "Only selected problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13057,7 +13170,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13082,7 +13195,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13107,27 +13220,27 @@ msgstr ""
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13152,7 +13265,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13169,8 +13282,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13217,9 +13330,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr ""
 
@@ -13471,7 +13584,7 @@ msgstr ""
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr ""
@@ -13518,7 +13631,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13541,13 +13654,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13578,9 +13693,7 @@ msgstr "Bovenliggende items"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13669,15 +13782,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13751,19 +13868,20 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13785,12 +13903,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Afspelen"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Geluid afspelen"
 
@@ -13820,7 +13938,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Selecteer twee elementen"
 
@@ -13949,7 +14067,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14007,7 +14125,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14027,12 +14145,12 @@ msgid "Privilege level"
 msgstr ""
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14062,7 +14180,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14080,7 +14198,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -14093,8 +14211,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14107,14 +14225,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr ""
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr ""
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14131,7 +14241,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problemen"
 
@@ -14165,12 +14275,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14192,7 +14302,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14255,7 +14365,7 @@ msgstr ""
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14349,8 +14459,8 @@ msgstr ""
 msgid "Read only"
 msgstr "Alleen lezen"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14358,8 +14468,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14412,7 +14522,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14420,7 +14530,7 @@ msgstr ""
 msgid "Recovery"
 msgstr ""
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14455,7 +14565,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14516,7 +14626,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14548,6 +14658,7 @@ msgstr "Remote commando"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14557,7 +14668,7 @@ msgstr "Remote commando"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14565,13 +14676,13 @@ msgstr "Remote commando"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14581,8 +14692,8 @@ msgstr "Remote commando"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14659,8 +14770,8 @@ msgstr "Remote commando"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr ""
 
@@ -14700,7 +14811,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14729,7 +14840,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14737,7 +14848,7 @@ msgstr ""
 msgid "Replace"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14844,7 +14955,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
@@ -14878,7 +14989,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr ""
 
@@ -15076,8 +15187,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15135,12 +15246,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15151,10 +15262,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15367,7 +15476,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr ""
 
@@ -15540,7 +15649,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr ""
 
@@ -15610,8 +15719,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15619,7 +15728,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Selecteer"
 
@@ -15655,19 +15764,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15692,7 +15801,7 @@ msgstr ""
 msgid "Send to"
 msgstr "Verzend aan"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15725,7 +15834,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr ""
 
@@ -15757,34 +15866,29 @@ msgid "Server time"
 msgstr "Server time"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15792,7 +15896,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15821,7 +15925,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15837,11 +15941,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -15850,7 +15954,7 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Service bijgewerkt"
 
@@ -15859,16 +15963,16 @@ msgstr "Service bijgewerkt"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15880,9 +15984,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -15906,10 +16010,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15950,7 +16062,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15996,7 +16108,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16087,7 +16199,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16138,7 +16250,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Toon werktijd"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr ""
 
@@ -16247,7 +16359,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16293,7 +16405,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sorteer orde (0->999)"
 
@@ -16367,7 +16479,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16415,12 +16527,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16431,17 +16545,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16465,13 +16586,10 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Status calculatie"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Status calculatie algoritme"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16502,6 +16620,10 @@ msgstr "Status alleen"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16533,8 +16655,8 @@ msgstr ""
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr ""
 
@@ -16546,7 +16668,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16578,7 +16700,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16611,7 +16733,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16627,7 +16749,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16640,7 +16762,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr ""
 
@@ -16732,12 +16854,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16773,8 +16895,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiket"
@@ -16814,14 +16936,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16829,10 +16950,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16996,7 +17117,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17281,12 +17402,12 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Tot"
 
@@ -17296,13 +17417,13 @@ msgstr "Tot"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17383,7 +17504,7 @@ msgstr "Tijdsstempel"
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17505,13 +17626,13 @@ msgstr "Trends"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17530,7 +17651,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17614,7 +17735,7 @@ msgstr "Triggers overzicht"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17681,15 +17802,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger severity"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17741,7 +17862,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Di"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -17754,7 +17875,7 @@ msgstr ""
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17769,15 +17890,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17844,7 +17966,7 @@ msgid "UNKNOWN"
 msgstr "ONBEKEND"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17854,7 +17976,7 @@ msgstr "ONBEKEND"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17900,7 +18022,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17948,7 +18070,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17995,7 +18117,8 @@ msgstr "Deblokeer de geselecteerde gebruikers?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18014,7 +18137,8 @@ msgstr "Eenheden"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18025,9 +18149,9 @@ msgstr "Eenheden"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Onbekend"
@@ -18046,12 +18170,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Onbekend host item, het item bestaat niet voor de geselecteerde host"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Onbekende host, de host bestaat niet in het systeem"
 
@@ -18098,7 +18222,7 @@ msgstr "Ontkoppel van template"
 msgid "Unlink from templates"
 msgstr "Ontkoppel van templates"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Geluid aan"
 
@@ -18179,27 +18303,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18268,7 +18393,7 @@ msgid "Upper level maps"
 msgstr "Kaarten op hoger liggend niveau"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Uptime"
@@ -18317,37 +18442,37 @@ msgstr "Gebruikt in acties"
 msgid "User"
 msgstr "Gebruiker"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18364,13 +18489,13 @@ msgstr "Gebruikers toegevoegd"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18395,32 +18520,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Gebruikers groep"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Gebruikers groep \"%1$s\" wordt gebruikt in script \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18451,7 +18576,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18459,14 +18584,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Gebruikers groepen"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Gebruiker mag zichzelf niet verwijderen"
 
@@ -18515,7 +18640,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18549,7 +18674,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18570,12 +18695,12 @@ msgstr "Gebruiker bijgewerkt"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18620,7 +18745,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18887,23 +19012,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19110,8 +19235,8 @@ msgstr "Verticale uitlijning"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19138,7 +19263,12 @@ msgstr "Zichbare naam"
 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:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19155,11 +19285,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19175,7 +19305,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr ""
 
@@ -19244,7 +19374,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr ""
 
@@ -19255,6 +19385,10 @@ msgstr ""
 msgid "Weekly"
 msgstr "Wekelijks"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19272,7 +19406,7 @@ msgstr "Wanneer actief"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19485,8 +19619,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19528,19 +19662,19 @@ msgstr "Jaarlijks"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19608,19 +19742,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Je hebt onvoldoende rechten om gebruikers aan te maken."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19741,7 +19871,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19860,7 +19990,6 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20156,9 +20285,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20238,7 +20367,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20285,7 +20414,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20484,13 +20613,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20538,7 +20667,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20764,12 +20893,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20873,8 +21002,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -20969,7 +21098,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21036,7 +21165,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "of"
@@ -21104,7 +21233,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21231,7 +21360,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "korte beschrijving"
 
@@ -21316,7 +21445,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21326,8 +21455,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21408,7 +21537,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21471,7 +21600,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21498,7 +21627,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21592,7 +21721,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21612,7 +21741,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "waarde"
 
@@ -21759,7 +21888,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/pl/LC_MESSAGES/frontend.po b/ui/locale/pl/LC_MESSAGES/frontend.po
index a282d365d4d..eba846acfe4 100644
--- a/ui/locale/pl/LC_MESSAGES/frontend.po
+++ b/ui/locale/pl/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2014-06-04 11:22+0300\n"
 "Last-Translator: Paweł <pawel.seledec@zetosoftware.pl>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d dzień"
 msgstr[1] "%1$d dni"
 msgstr[2] "%1$d dni"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -236,10 +236,10 @@ msgstr[0] "została %1$s próba"
 msgstr[1] "zostały %1$s próby"
 msgstr[2] "zostało %1$s prób"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s sekunda"
 msgstr[1] "%1$s sekundy"
 msgstr[2] "%1$s sekund"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s pozostałych symboli"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Poziom, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, tylko do odczytu"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -325,7 +325,7 @@ msgstr "(brak proxy)"
 msgid "0 - use default port"
 msgstr "0 - użyj port domyślny"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 lub 1"
 
@@ -394,7 +394,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "DODAJ I NADPISZ"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "I"
 
@@ -411,7 +411,7 @@ msgstr "Metody API"
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -479,40 +479,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Dostęp zabroniony"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Dostęp zabroniony!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr "Dostęp do API"
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "Dostęp do elementów UI"
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr "Dostęp do akcji"
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr "Dostęp do modułów"
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Potwierdzone"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Potwierdzenie"
 
@@ -520,7 +520,7 @@ msgstr "Potwierdzenie"
 msgid "Acknowledge problems"
 msgstr "Potwierdź problemy"
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Potwierdzone"
@@ -549,20 +549,22 @@ msgstr "Oznacz zdarzenia ROZWIĄZANE"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -669,7 +671,7 @@ msgstr "Zaktualizowano akcję"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -678,7 +680,7 @@ msgstr "Zaktualizowano akcję"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Akcje"
@@ -737,8 +739,8 @@ msgstr "Aktywne do"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -749,7 +751,6 @@ msgstr "Aktywne do"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -757,11 +758,13 @@ msgstr "Aktywne do"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -773,15 +776,17 @@ msgstr "Aktywne do"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -848,7 +853,7 @@ msgstr "Aktywne do"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Dodaj"
 
@@ -856,19 +861,19 @@ msgstr "Dodaj"
 msgid "Add (message type limit reached)"
 msgstr "Dodaj (typ wiadomości osiągnął limit)"
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Dodaj nowy widżet"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Dodaj element potomny"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -885,7 +890,7 @@ msgstr "Dodaj host"
 msgid "Add missing"
 msgstr "Dodaj brakujący"
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Dodaj wiele map"
 
@@ -902,7 +907,11 @@ msgstr "Dodaj nowy interfejs"
 msgid "Add new override"
 msgstr "Dodaj nowe sterowanie"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -910,7 +919,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr "Dodaj komentarz do problemu"
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -944,7 +953,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Dodaj widżet"
 
@@ -953,12 +962,20 @@ msgstr "Dodaj widżet"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Dodaj %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -968,6 +985,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administracja"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Zaawansowane etykiety"
@@ -1054,7 +1075,7 @@ msgstr "Dopasuj elementy map"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Wszystkie"
 
@@ -1063,8 +1084,8 @@ msgid "All dashboards"
 msgstr "Wszystkie widoki"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Wszystkie grupy"
 
@@ -1072,7 +1093,7 @@ msgstr "Wszystkie grupy"
 msgid "All hosts"
 msgstr "Wszystkie hosty"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Wszystkie połączenia powinny mieć określone pola \"Name\" i \"URL\""
 
@@ -1106,7 +1127,7 @@ msgstr "Wszystkie szablony"
 msgid "Allow list"
 msgstr "Zezwól na listę"
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1119,7 +1140,7 @@ msgstr "Zezwól na manualne zamknięcie"
 msgid "Allowed hosts"
 msgstr "Dopuszczalne hosty"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr "Dopuszczalne metody"
 
@@ -1137,7 +1158,7 @@ msgstr "Ilość fizycznej pamięci zyżytej na kopie stron fizycznej pamięci, <
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1178,12 +1199,12 @@ msgstr "I/Lub"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1203,15 +1224,15 @@ msgstr "Błąd aplikacji."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -1229,7 +1250,7 @@ msgstr "Nadchodzące"
 msgid "Apr"
 msgstr "Kwi"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Kwiecień"
 
@@ -1257,6 +1278,10 @@ msgstr "Typ obszaru"
 msgid "Arithmetic"
 msgstr "Arytmetyka"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Jako zwykły tekst"
@@ -1305,8 +1330,8 @@ msgstr "Przynajmniej jeden element UI musi być sprawdzony."
 msgid "At least one action is mandatory."
 msgstr "Przynajmniej jedna akcja jest wymagana."
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr "Przynajmniej jeden aktywny użytkownik musi posiadać role \"%1$s\"."
@@ -1384,7 +1409,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Sie"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Sierpień"
 
@@ -1414,7 +1439,7 @@ msgstr "Uwierzytelnianie"
 msgid "Authentication algorithm"
 msgstr "Algorytm uwierzytelniania"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "Uwierzytelnienie nieudane: %1$s."
@@ -1463,7 +1488,7 @@ msgstr "Auto"
 msgid "Auto-login"
 msgstr "Automatyczne logowanie"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Opcje automatycznego logowania i wylogowania nie mogą być razem włączone."
 
@@ -1473,7 +1498,7 @@ msgstr "Automatyczne wylogowanie"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1658,11 +1683,11 @@ msgstr "Podane hasła muszą być takie same."
 msgid "Bottom"
 msgstr "Na dole"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Przenieś na przód"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Przenieś na zewnątrz"
 
@@ -1743,7 +1768,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Obliczone"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Kalendarz"
 
@@ -1763,8 +1788,8 @@ msgstr "Oddzwanianie"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1781,8 +1806,8 @@ msgstr "Oddzwanianie"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1812,7 +1837,7 @@ msgstr "Nie można dodać akcji"
 msgid "Cannot add correlation"
 msgstr "Nie można dodać współzależności"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1823,7 +1848,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Nie można utworzyć zależności szablonu od hosta."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1943,7 +1968,7 @@ msgid "Cannot add user"
 msgstr "Nie można dodać użytkownika"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr "Nie można dodać użytkownika grupy"
 
@@ -1951,11 +1976,11 @@ msgstr "Nie można dodać użytkownika grupy"
 msgid "Cannot add web scenario"
 msgstr "Nie można dodać scenariusza sieci www"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "Nie można dodać widżetu: za mało miejsca na panelu."
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2039,7 +2064,7 @@ msgstr[0] "Nie można skopiować wyzwalacza"
 msgstr[1] "Nie można skopiować wyzwalaczów"
 msgstr[2] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2095,7 +2120,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2548,7 +2573,7 @@ msgstr "Nie można ocenić wyrażenia"
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Nie można rozwinąć makra."
 
@@ -2720,7 +2745,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2782,7 +2807,7 @@ msgstr "Nie można odczytać YAML: %1$s."
 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Nie można zmienić nazwy użytkownikowi - gościowi."
 
@@ -2841,7 +2866,12 @@ msgstr "Nie można ustawić pól inwentarza dla wyłączonego inwentarza."
 msgid "Cannot set session cookie."
 msgstr "Nie można skonfigurować pliku cookie sesji"
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr "Urządzenie nie wspiera komunikatu głosowego"
 
@@ -3269,6 +3299,7 @@ msgid "Change per second"
 msgstr "Zmień na sekundy"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Stopień zmian"
 
@@ -3410,7 +3441,7 @@ msgstr "Sprawdza wydajność usługi UDP. Zwraca 0 - usługa nie działa; liczba
 msgid "Checks should be unique."
 msgstr "Testy powinny być unikalne."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3452,11 +3483,11 @@ msgstr "Wyczyść historię i trendy"
 msgid "Clear when unlinking"
 msgstr "Wyczyść podczas odłączania"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "Kliknij i przeciągnij do pożądanego rozmiaru."
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "Kliknij i przeciągnij do pożądanego rozmiaru"
 
@@ -3486,7 +3517,7 @@ msgstr "Zegar"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Powiel"
 
@@ -3497,8 +3528,8 @@ msgstr "Powiel"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Zamknij"
 
@@ -3528,8 +3559,8 @@ msgid "Close problems"
 msgstr "Zakończ problemy"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Zwiń"
 
@@ -3546,7 +3577,7 @@ msgstr "Zwiń pasek boczny"
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3614,6 +3645,7 @@ msgstr "Sesje bieżące"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Warunek"
 
@@ -3668,7 +3700,7 @@ msgstr "Warunki"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -3942,7 +3974,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3979,8 +4011,8 @@ msgstr "Zawiera"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4041,8 +4073,8 @@ msgstr "Współrzędne"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Skopiuj"
 
@@ -4175,11 +4207,11 @@ msgstr "Utwórz współzależność"
 msgid "Create dashboard"
 msgstr "Tworzenie pulpitu operatora"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "Tworzenie niezależnej reguły wykrywania"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Utwórz regułę wyszukiwania zależnego"
 
@@ -4296,7 +4328,7 @@ msgstr "Utwórz mapę"
 msgid "Create media type"
 msgstr "Utwórz typ mediów"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Utwórz nowy"
 
@@ -4312,7 +4344,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Utwórz skrypt"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4320,7 +4352,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Utwórz szablon"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Utwórz wyzwalacz"
 
@@ -4541,7 +4573,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Właściwości pulpitu"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Udostępnianie pulpitu"
 
@@ -4571,7 +4603,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Pulpity"
 
@@ -4741,7 +4773,7 @@ msgstr "Dzień tygodnia"
 msgid "Days"
 msgstr "Dni"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debugowanie"
 
@@ -4755,7 +4787,7 @@ msgstr "Tryb debugowania"
 msgid "Dec"
 msgstr "Gru"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Grudzień"
 
@@ -4764,13 +4796,17 @@ msgstr "Grudzień"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Domyślnie"
 
@@ -4840,8 +4876,8 @@ msgid "Delayed by"
 msgstr "Opóźniony o"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4855,7 +4891,7 @@ msgstr "Opóźniony o"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4887,8 +4923,8 @@ msgstr "Opóźniony o"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Usuń"
 
@@ -4917,7 +4953,7 @@ msgstr "Usunąć aktualną akcję?"
 msgid "Delete current correlation?"
 msgstr "Usunąć bieżącą współzależność?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Usunąć pulpit?"
 
@@ -4961,7 +4997,7 @@ msgstr "Usunąć prototyp pozycji?"
 msgid "Delete item?"
 msgstr "Usunąć pozycję?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Usunąć powiązania między wybranymi elementami?"
 
@@ -5017,7 +5053,7 @@ msgstr "Usunąć wybrane pulpity?"
 msgid "Delete selected discovery rules?"
 msgstr "Usunąć wybrane reguły wykrywania?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Usunąć wybrane elementy?"
 
@@ -5118,11 +5154,11 @@ msgstr "Usunąć wybrane skrypty?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Usunąć zaznaczone kształty?"
 
@@ -5138,7 +5174,7 @@ msgstr "Usunąć wybrane prototypy wyzwalaczy?"
 msgid "Delete selected triggers?"
 msgstr "Usunąć wybrane wyzwalacze?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Usunąć wybranego użytkownika?"
 
@@ -5189,7 +5225,7 @@ msgstr "Usunięto: Szablon \"%1$s\"."
 msgid "Delimiter"
 msgstr "Ogranicznik"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr "Metody zabronione"
 
@@ -5203,7 +5239,7 @@ msgstr "Zabroń"
 msgid "Deny list"
 msgstr "Lista zabroniona"
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5211,7 +5247,7 @@ msgstr "Lista zabroniona"
 msgid "Dependencies"
 msgstr "Zależności"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Zależny"
 
@@ -5219,7 +5255,7 @@ msgstr "Zależny"
 msgid "Dependent item"
 msgstr "Element zależny"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5247,7 +5283,7 @@ msgstr "Stan instalacji"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5411,7 +5447,7 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5424,14 +5460,14 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5514,7 +5550,7 @@ msgid "Discovery by proxy"
 msgstr "Wykrywanie przez proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Test wykrywania"
 
@@ -5526,7 +5562,7 @@ msgstr "Testy wykrywania"
 msgid "Discovery list"
 msgstr "Lista reguł wykrywania"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Obiekt wykrywania"
 
@@ -5628,7 +5664,7 @@ msgstr "Zaktualizowano regułę wykrywania"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5639,7 +5675,7 @@ msgstr "Reguły wykrywania"
 msgid "Discovery rules deleted"
 msgstr "Usunięto reguły wykrywania"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stan wykrywania"
@@ -5679,7 +5715,7 @@ msgstr "Wyświetl wykres skumulowany"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Wyświetlanie %1$s z %2$s znalezionych"
@@ -5697,10 +5733,6 @@ msgstr "Wyświetlanie opcji"
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Nie wyliczaj"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5715,7 +5747,7 @@ msgstr "Nie przechowuj historii"
 msgid "Do not keep trends"
 msgstr "Nie przechowuj trendów"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Zastąpić wyrażenie warunkowe?"
 
@@ -5771,7 +5803,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nie działa"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr "Pobierz obraz"
 
@@ -5780,7 +5812,7 @@ msgid "Download the configuration file"
 msgstr "Pobranie pliku konfiguracyjnego"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Czas przerwy w pracy"
@@ -5856,7 +5888,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Powtórzone userid (id użytkownika) \"%1$s\" w użytkownikach dla mapy \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5878,7 +5910,7 @@ msgstr "Pozycja dynamiczna"
 msgid "Dynamic items"
 msgstr "Dynamiczne elementy"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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"
 
@@ -5886,13 +5918,14 @@ msgstr "Każdy adres URL powinien mieć unikalną nazwę. Należy się upewnić,
 msgid "Each item"
 msgstr "Każdy element"
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5904,8 +5937,8 @@ msgstr "Każdy element"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Edycja"
 
@@ -5921,11 +5954,11 @@ msgstr "Edycja mapy"
 msgid "Edit operation"
 msgstr "Edycja operacji"
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Edycja elementu drzewa"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Edycja wyzwalacza"
 
@@ -6200,7 +6233,7 @@ msgstr "Włącz wyłapywanie"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6222,12 +6255,12 @@ msgstr "Włącz wyłapywanie"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6286,7 +6319,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6310,7 +6343,7 @@ msgstr "Błąd"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Błąd w zapytaniu wyszukiwania dla tabeli \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Komunikat błędu"
 
@@ -6349,7 +6382,7 @@ msgstr "Zasady współzależności zdarzeń"
 msgid "Event details"
 msgstr "Szczegóły zdarzenia"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Generowanie zdarzeń"
 
@@ -6379,7 +6412,7 @@ msgstr "Nazwa zdarzenia"
 msgid "Event tag pair"
 msgstr "Para znaczników zdarzeń"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Typ zdarzenia"
 
@@ -6414,7 +6447,7 @@ msgstr "Wyklucz wybrane"
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Wykluczyć"
 
@@ -6425,7 +6458,7 @@ msgstr "Wykluczyć"
 msgid "Exclude host groups"
 msgstr "Wyklucz grupy hostów"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Wykonaj"
 
@@ -6471,7 +6504,7 @@ msgstr "Wykonano"
 msgid "Executed script"
 msgstr "Wykonywany skrypt"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Potwierdzenie wykonania"
 
@@ -6487,8 +6520,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Rozwiń"
 
@@ -6555,7 +6588,7 @@ msgstr "Eksportuj do pliku CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6609,7 +6642,7 @@ msgstr "Wyrażenia"
 msgid "External check"
 msgstr "Test zewnętrzny"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "P"
@@ -6633,7 +6666,7 @@ msgid "Failed"
 msgstr "Niepowodzenie"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Stworzenie widoku nieudane"
 
@@ -6642,24 +6675,24 @@ msgstr "Stworzenie widoku nieudane"
 msgid "Failed to parse URL."
 msgstr "Nie udało się przetworzyć URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Nie udało się zaktualizować widoku"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6667,7 +6700,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Nie udało się zaktualizować szablonu."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6691,7 +6724,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Lut"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Luty"
 
@@ -6837,8 +6870,8 @@ msgstr "Obszar wypełniony"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6916,6 +6949,10 @@ msgstr "Dopasuj do mapy"
 msgid "Fixed"
 msgstr "Stały"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6981,14 +7018,14 @@ msgstr "Francuski (fr_FR)"
 msgid "Fri"
 msgstr "Pt"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Piątek"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -7006,7 +7043,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Dostęp do interfejsu użytkownika"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Komunikaty interfejsu użytkownika"
 
@@ -7088,7 +7125,7 @@ msgid "Get value from host"
 msgstr "Pobiera wartość z hosta"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Podane wyrażenie nie jest makrem"
 
@@ -7106,7 +7143,7 @@ msgstr "Wartość globalna"
 msgid "Go back to %1$s"
 msgstr "Wróć do %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Przejdź do"
 
@@ -7155,7 +7192,7 @@ msgstr "Linia gradientu"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7317,7 +7354,7 @@ msgstr "Istnieje już wykres lub prototyp wykresu o nazwie \"%1$s\"."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Wykresy"
 
@@ -7518,11 +7555,11 @@ msgstr "Pomoc"
 msgid "Hexadecimal to decimal"
 msgstr "Liczba szesnastkowa do dziesiętnej"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Ukryj śledzenie"
 
@@ -7567,14 +7604,14 @@ msgstr "Podkreśl cały wiersz"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Historia"
 
@@ -7638,7 +7675,7 @@ msgstr "Ułożenie poziome"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7646,8 +7683,7 @@ msgstr "Ułożenie poziome"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7659,7 +7695,7 @@ msgstr "Ułożenie poziome"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7742,7 +7778,7 @@ msgstr[2] "Włączono hosty"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7750,7 +7786,7 @@ msgstr[2] "Włączono hosty"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupa hostów"
@@ -7781,7 +7817,7 @@ msgstr "Typ etykiety grupy hostów"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Grupa hosta o ID \"%1$s\" jest niedostępna."
@@ -7798,7 +7834,7 @@ msgstr "Grupa hosta o ID \"%1$s\" jest niedostępna."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7837,7 +7873,7 @@ msgstr "Interfejs hosta"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7986,7 +8022,7 @@ msgstr "Host o takiej samej widocznej nazwie \"%1$s\" już istnieje."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8218,14 +8254,68 @@ msgstr "Ta sama przestrzeń nazw (%1$s) jest używane przez moduły zlokalizowan
 msgid "Identification of the system. Returns string"
 msgstr "Identyfikacja systemu. Zwraca ciąg znaków"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr "Jeśli filtr pasuje"
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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ń."
@@ -8234,12 +8324,16 @@ msgstr "W przypadku, gdy ten komunikat jest błędny należy skontaktować się
 msgid "Iframe sandboxing exceptions"
 msgstr "Wyjątki piaskownicy iframe"
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Obraz"
 
@@ -8369,7 +8463,7 @@ msgstr "Nieosiągalny prototyp elementu"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8382,11 +8476,11 @@ msgstr "Nieosiągalna mapa"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "Nieosiągalny szablon"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "Nieosiągalny wyzwalacz"
 
@@ -8412,7 +8506,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Zawrzyj"
 
@@ -8430,6 +8524,11 @@ msgstr "Dołącz podgrupy"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statystyka ruchu przychodzącego interfejsu sieciowego. Zwraca liczbę całkowitą"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8820,7 +8919,7 @@ msgstr "Błędny typ warunku filtra dla akcji \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Wykorzystano błędną funkcję"
 
@@ -8877,7 +8976,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Błędny klucz pozycji \"%1$s\" udostępniony dla wyrażenia wyzwalacza w \"%2$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Błędny typ wartości składnika"
 
@@ -8908,7 +9007,7 @@ msgstr "Błędne ID typu mediów."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Błędna metoda \"%1$s.%2$s\"."
@@ -9048,10 +9147,10 @@ msgstr "Błędne ID użytkownika określone dla mapy \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Błędne ID grupy użytkowników określone dla mapy \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr "Błędna nazwa użytkownika lub hasło albo konto jest tymczasowo zablokowane."
@@ -9358,9 +9457,9 @@ msgstr "Błędna wartość dla pola \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9432,6 +9531,10 @@ msgstr "Użyto błędnej wartości w polu PSK. Powinna zawierać parzystą liczb
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Wykorzystano błędną wartość dla stanu proxy \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonezyjski (id_ID)"
@@ -9443,12 +9546,12 @@ msgstr "Nieskończoność"
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9521,7 +9624,7 @@ msgid "Insert"
 msgstr "Wprowadź"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Wprowadź wyrażenie"
 
@@ -9629,7 +9732,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9677,7 +9780,7 @@ msgstr "Nieprawidłowa data."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Nieprawidłowy adres email \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Nieprawidłowy adres email dla rodzaju medium o ID \"%1$s\"."
@@ -9780,8 +9883,8 @@ msgstr "Nieprawidłowe parametry metody."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9985,7 +10088,7 @@ msgstr "Nieprawidłowy okres czasu."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inwentarz"
 
@@ -10179,7 +10282,7 @@ msgstr "Prototypy pozycji zaktualizowane"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr "Typ pozycji nie używa interfejsów"
 
@@ -10340,7 +10443,7 @@ msgstr "Ścieżka JSON"
 msgid "Jan"
 msgstr "Sty"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Styczeń"
 
@@ -10362,7 +10465,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Lip"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Lipiec"
 
@@ -10370,7 +10473,7 @@ msgstr "Lipiec"
 msgid "Jun"
 msgstr "Cze"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Czerwiec"
 
@@ -10404,7 +10507,7 @@ msgstr "Klucz"
 msgid "Key passphrase"
 msgstr "Hasło klucza"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
@@ -10474,7 +10577,7 @@ msgstr "Położenie etykiety"
 msgid "Language"
 msgstr "Język"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr "Język \"%1$s\" nie jest wspierany."
@@ -10559,11 +10662,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Ostatnie sprawdzenie"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Wykres z ostatniej godziny"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Wykres z ostatniego miesiąca"
 
@@ -10601,7 +10704,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Ostatnia wartość"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Wykres z ostatniego tygodnia"
 
@@ -10614,11 +10717,11 @@ msgstr "Wykres z ostatniego tygodnia"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Ostatnie dane"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Ostatnie wartości"
 
@@ -10729,7 +10832,7 @@ msgid "Link new templates"
 msgstr "Połączenie do nowych szablonów"
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10807,12 +10910,12 @@ msgstr "Lista instacji objektów liczników wydajności Windows, wykryte objekty
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr "Lista instancji objektów liczników wydajności Windows. Zwraca JSON"
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Lista współdzielonych grup użytkowników"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Lista współdzielonych użytkowników"
@@ -10940,7 +11043,7 @@ msgstr "Niskopoziomowa reguła wykrywania w stanie \"niewspierany\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "P"
@@ -11100,7 +11203,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11129,7 +11232,7 @@ msgstr "Ręcznie zamknięte"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11168,7 +11271,7 @@ msgstr "Lokalizacja etykiety elementu mapy"
 msgid "Map element label type"
 msgstr "Typ elementu etykiety mapy"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr "Mapa zaktualizowana! Wrócić do listy map?"
 
@@ -11194,7 +11297,7 @@ msgstr "Właściciel mapy nie może być pusty."
 msgid "Map shape"
 msgstr "Kształt mapy"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Aktualizacja mapy nieudana."
 
@@ -11230,7 +11333,7 @@ msgstr "Mapy"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Marzec"
 
@@ -11257,7 +11360,7 @@ msgstr "Maska"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11328,9 +11431,9 @@ msgstr "Maksymalna liczba otwartych plików obsługiwana przez OS. Zwraca liczb�
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Maksymalna liczba procesów obsługiwana przez OS. Zwraca liczbę całkowitą"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11344,12 +11447,12 @@ msgstr[0] "Maksymalny okres do wyświetlenia to %1$s dzień."
 msgstr[1] "Maksymalny okres do wyświetlenia to %1$s dni."
 msgstr[2] "Maksymalny okres do wyświetlenia to %1$s dni."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Maksymalna całkowita długość adresu email osiągnięta dla typu mediów o ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Maj"
 
@@ -11359,8 +11462,8 @@ msgid "May"
 msgstr "Maj"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11424,7 +11527,7 @@ msgstr "Udany test typu mediów."
 msgid "Media type updated"
 msgstr "Zaktualizowano typ mediów"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Typ mediów o ID \"%1$s\" jest niedostępny."
@@ -11497,8 +11600,8 @@ msgstr "Szkic wiadomości"
 msgid "Message templates"
 msgstr "Szkice wiadomości"
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Czas wygaśnięcia komunikatu"
 
@@ -11516,7 +11619,7 @@ msgstr "Wiadomość/Polecenie"
 msgid "Messages"
 msgstr "Komunikaty"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Komunikaty"
 
@@ -11544,6 +11647,11 @@ msgstr "Minimalny"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11559,11 +11667,6 @@ msgstr "Wymagany minimalny rozmiar pliku do wgrania dla PHP jest %1$s (konfigura
 msgid "Minimum required PHP version is %1$s."
 msgstr "Wymagana minimalna wersja PHP to %1$s."
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11714,7 +11817,7 @@ msgstr "Zaktualizowane moduły"
 msgid "Mon"
 msgstr "Pn"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Poniedziałek"
 
@@ -11754,11 +11857,11 @@ msgstr "Miesiąc"
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Znaleziono więcej dopasowań..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11774,6 +11877,14 @@ msgstr "Ponad 10 minut"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Więcej niż jeden wykres o nazwie \"%1$s\" w hoście."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11783,11 +11894,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Wiele"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Wielokrotne zdarzenia typu PROBLEM"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Wycisz"
 
@@ -11795,6 +11906,18 @@ msgstr "Wycisz"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11889,25 +12012,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12050,6 +12174,10 @@ msgstr "Użycie sieci (łącznie dla wysyłania i odbierania) podczas odstępu,
 msgid "Never"
 msgstr "Nigdy"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12061,7 +12189,7 @@ msgstr "Nowy warunek"
 msgid "New dashboard"
 msgstr "Nowy panel"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nowy element"
 
@@ -12085,7 +12213,7 @@ msgstr "Nowa operacja"
 msgid "New regular expression"
 msgstr "Nowe wyrażenie regularne"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12102,7 +12230,7 @@ msgid "New triggers"
 msgstr "Nowe wyzwalacze"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr "Następna strona"
 
@@ -12120,20 +12248,20 @@ msgstr "Następny krok"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12266,7 +12394,7 @@ msgstr "Bez szczegółów"
 msgid "No discovery rule IDs given."
 msgstr "Nie podano żadnego identifykatora reguł wykrywania."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr "Nie znaleziono włączonych modułów."
@@ -12328,7 +12456,7 @@ msgstr "Brak obrazka"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Nie znaleziono interfejsu"
 
@@ -12368,7 +12496,7 @@ msgstr "Nie znaleziono makr."
 msgid "No maps added."
 msgstr "Nie dodano map."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Nie znaleziono"
 
@@ -12381,8 +12509,8 @@ msgstr "Brak wykrytych nowych modułów"
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Nie podano typu operacji dla współzależności \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Brak uprawnień dla dostępu do systemu."
 
@@ -12394,7 +12522,6 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12402,11 +12529,12 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12524,19 +12652,19 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12545,15 +12673,15 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12580,7 +12708,7 @@ msgstr "Nie określono pliku klucza publicznego."
 msgid "No recipients for action operation message."
 msgstr "Brak odbiorców dla komunikatu operacji akcji."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Nie odświeżono"
 
@@ -12596,7 +12724,7 @@ msgstr "Nie wybrano żadnego celu"
 msgid "No target selected."
 msgstr "Nie wybrano żadnego celu."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12643,7 +12771,7 @@ msgstr "Brak"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12675,15 +12803,15 @@ msgstr "Nie wszystkie wyniki są wyświetlanie. Proszę dostarczyć ściślej ok
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "Nie wszystkie szablony są podłączone\"%1$s\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "Nie zezwolono ustawienia języka dla użytkownika \"guest\"."
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nie można ustawić hasła dla użytkownika \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "Nie zezwolno ustawienia motywu dla użytkownika \"guest\"."
 
@@ -12715,8 +12843,8 @@ msgstr "Elementy niedziedziczone"
 msgid "Not supported"
 msgstr "Niewspierane"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Notatka"
 
@@ -12746,7 +12874,7 @@ msgstr "Powiadom wszystkich zaangażowanych"
 msgid "Nov"
 msgstr "Lis"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Listopad"
 
@@ -12909,12 +13037,12 @@ msgstr "Systemy liczbowe"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numerycznie (zmiennoprzecinkowo)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Numeryczny (liczba całkowita)"
 
@@ -12929,18 +13057,17 @@ msgstr "Numerycznie (liczba całkowita bez znaku)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12967,7 +13094,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Maska podsieci OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "LUB"
 
@@ -12995,13 +13122,13 @@ msgstr "Paź"
 msgid "Octal to decimal"
 msgstr "System ósekmowy do dziesiętnego"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Październik"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Wyłączone"
 
@@ -13013,7 +13140,7 @@ msgstr "Wyłączone"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -13032,7 +13159,7 @@ msgstr "Stary znacznik nazwy"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Włączone"
 
@@ -13040,7 +13167,7 @@ msgstr "Włączone"
 msgid "On status change triggers blink for"
 msgstr "Przy zmianie stanu wyzwalacze migają przez"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Raz"
 
@@ -13057,7 +13184,7 @@ msgid "One time only"
 msgstr "Jednorazowo"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Jednorazowa przerwa w pracy"
 
@@ -13069,26 +13196,14 @@ msgstr "Tylko Super Administratorzy mogą tworzyć grupy hostów."
 msgid "Only Super Admins can create media types."
 msgstr "Tylko Super Administratorzy mogą tworzyć typy mediów."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Tylko Super Administratorzy mogą usuwać typy mediów."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Tylko Super Administratorzy mogą usuwać grupy użytkowników."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Tylko Super Administratorzy mogą zmieniać typy mediów."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Tylko Super Administrator może aktualizować grupy użytkoniwków."
-
 #: include/classes/api/services/CDRule.php:488
 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."
@@ -13130,11 +13245,11 @@ msgstr[0] "Tylko wybrany problem"
 msgstr[1] "Tylko wybrane problemy"
 msgstr[2] "Tylko wybranych problemów"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13167,7 +13282,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informacje o systemie operacyjnym. Zwraca ciąg znaków"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13192,7 +13307,7 @@ msgstr "Operacja nie ma grupy, na której może działać."
 msgid "Operation has no template to operate."
 msgstr "Operacja nie ma szablonu, na którym może działać."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13217,27 +13332,27 @@ msgstr "Operacje"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
@@ -13262,7 +13377,7 @@ msgstr "Opcje"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13279,8 +13394,8 @@ msgstr "Lub"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13327,9 +13442,9 @@ msgstr "Lub"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Oryginał"
 
@@ -13581,7 +13696,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEM"
@@ -13628,7 +13743,7 @@ msgstr "Tożsamość PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK jest zbyt krótkie. Minimalnie to %1$s znaków heksadecymalnych."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13651,13 +13766,15 @@ msgstr "Pager"
 msgid "Parameter"
 msgstr "Parametr"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13688,9 +13805,7 @@ msgstr "Nadrzędne pozycje"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13779,15 +13894,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Wklej"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr "Wklej widżet"
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Wklej bez zewnętrznych łączy"
 
@@ -13861,19 +13980,20 @@ msgid "Periods"
 msgstr "Okresy"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Uprawnienia mogą być nadawane wyłącznie dla grup użytkowników."
 
@@ -13895,12 +14015,12 @@ msgstr "Algorytm rozmieszczania"
 msgid "Plain text"
 msgstr "Zwykły tekst"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Odtwórz"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Odtwórz dźwięk"
 
@@ -13930,7 +14050,7 @@ msgstr "Proszę włącznyć \"allow_url_fopen\" wytyczną."
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Proszę wprowadzić nazwę hosta lub adres IP hosta oraz numer portu serwera Zabbix, oraz (opcjonalnie) nazwę instalacji."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Proszę wybrać dwa elementy"
 
@@ -14059,7 +14179,7 @@ msgid "Previous month"
 msgstr "Poprzedni miesiąc"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr "Poprzednia strona"
 
@@ -14117,7 +14237,7 @@ msgstr "Hasło prywatności"
 msgid "Privacy protocol"
 msgstr "Protokół prywatności"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Prywatne"
@@ -14137,12 +14257,12 @@ msgid "Privilege level"
 msgstr "Poziom uprawnień"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14172,7 +14292,7 @@ msgstr "Stworzony problem"
 msgid "Problem display"
 msgstr "Wyświetlanie problemów"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Wyrażenie dla problemu"
@@ -14190,7 +14310,7 @@ msgstr "Problem nie jest wstrzymany"
 msgid "Problem is suppressed"
 msgstr "Prblem jest wstrzymany"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problem z"
 
@@ -14203,8 +14323,8 @@ msgstr "Naprawianie problemu"
 msgid "Problem resolved"
 msgstr "Problem rozwiązany"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14217,14 +14337,6 @@ msgstr ""
 msgid "Problem update"
 msgstr "Problem zaktualizowany"
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problem, jeśli wszyscy potomkowie mają problem"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problem, jeśli przynajmniej jeden potomek ma problem"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14241,7 +14353,7 @@ msgstr "Problem, jeśli przynajmniej jeden potomek ma problem"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problemy"
 
@@ -14275,12 +14387,12 @@ msgid "Prometheus to JSON"
 msgstr "Prometeusz do JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Właściwości"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14302,7 +14414,7 @@ msgstr "Serwery proxy"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14366,7 +14478,7 @@ msgstr "Nazwa proxy"
 msgid "Proxy updated"
 msgstr "Zaktualizowano proxy"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Publiczny"
@@ -14460,8 +14572,8 @@ msgstr "Odczyt"
 msgid "Read only"
 msgstr "Tylko do odczytu"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14469,8 +14581,8 @@ msgstr "Tylko do odczytu"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14523,7 +14635,7 @@ msgstr "Odbiorcy"
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14531,7 +14643,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Odzyskiwanie"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14566,7 +14678,7 @@ msgstr "Prostokąt"
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Przedział odświeżania"
 
@@ -14628,7 +14740,7 @@ msgstr "Wyrażenia regularne"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr "Wyzwól aby stworzyć widżet."
 
@@ -14660,6 +14772,7 @@ msgstr "Zdalne polecenie"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14669,7 +14782,7 @@ msgstr "Zdalne polecenie"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14677,13 +14790,13 @@ msgstr "Zdalne polecenie"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14693,8 +14806,8 @@ msgstr "Zdalne polecenie"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14771,8 +14884,8 @@ msgstr "Zdalne polecenie"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Usuń"
 
@@ -14812,7 +14925,7 @@ msgstr "Usuń, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14841,7 +14954,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14849,7 +14962,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Zastąp"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Zamień zależności"
 
@@ -14956,7 +15069,7 @@ msgstr "Wymagane kody stanu"
 msgid "Required string"
 msgstr "Wymagany ciąg znaków"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Przywróć"
@@ -14990,7 +15103,7 @@ msgstr "Potwierdzenie przywracania"
 msgid "Reset defaults"
 msgstr "Przywróć domyślne"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Rozwiązane"
 
@@ -15188,8 +15301,8 @@ msgstr "Prawy Y"
 msgid "Right trim"
 msgstr "Przytnij z prawej"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr "Rola"
 
@@ -15247,12 +15360,12 @@ msgstr "Uruchamia określone polecenie na hoście. Zwraca tekstowy rezultat pole
 msgid "Russian (ru_RU)"
 msgstr "Rosyjski (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "N"
@@ -15263,10 +15376,8 @@ msgstr "Ustawienia SAML"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15479,7 +15590,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sob"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -15656,7 +15767,7 @@ msgstr "Zaktualizowano skrypt"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Skrypty"
 
@@ -15726,8 +15837,8 @@ msgid "Security name"
 msgstr "Nazwa ochrony"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15735,7 +15846,7 @@ msgstr "Nazwa ochrony"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Wybierz"
 
@@ -15771,19 +15882,19 @@ msgstr "Wybrane elementy"
 msgid "Selected items only"
 msgstr "Tylko wybrane elementy"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Wybrane, %1$s w pozycji %2$d z %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Wybrane, %1$s, tylko do odczytu, w pozycji %2$d z %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Wyślij wstecz"
 
@@ -15808,7 +15919,7 @@ msgstr "Wyślij wyłącznie do"
 msgid "Send to"
 msgstr "Wyślij do"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Wyślij do tyłu"
 
@@ -15841,7 +15952,7 @@ msgstr "Rozdzielone"
 msgid "Separately"
 msgstr "Oddzielnie"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Wrzesień"
 
@@ -15873,34 +15984,29 @@ msgid "Server time"
 msgstr "Czas serwera"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Usługa"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15908,7 +16014,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Utworzono usługę"
 
@@ -15938,7 +16044,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Czas początkowy usługi musi być mniejszy od czasu końcowego."
 
@@ -15954,11 +16060,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Czasy usługi"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Typ usługi"
 
@@ -15967,7 +16073,7 @@ msgstr "Typ usługi"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Zaktualizowano usługę"
 
@@ -15976,16 +16082,16 @@ msgstr "Zaktualizowano usługę"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Usługi"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Usługi tworzą cykliczną zależność."
 
@@ -15997,9 +16103,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr "Błąd inicjalizacji sesji."
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sesja zakończona, proszę zalogować się ponownie."
 
@@ -16023,10 +16129,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Ustaw tryb inwentarza hosta"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr "Ustaw nową wartość"
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16067,7 +16181,7 @@ msgstr "Ustawienia"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16113,7 +16227,7 @@ msgstr "Udostępnij"
 msgid "Shared"
 msgstr "Udostępniony"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Współdzielenie"
 
@@ -16204,7 +16318,7 @@ msgstr "Pokaż panel boczny"
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16255,7 +16369,7 @@ msgstr "Pokaż ostrzeżenie jeżeli serwer Zabbixa nie działa"
 msgid "Show working time"
 msgstr "Wyświetl czas pracy"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Wyświetlane"
 
@@ -16364,7 +16478,7 @@ msgstr "Pominięto kopiowanie wykresu \"%1$s\" na hosta \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Słowacki (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Drzemka"
 
@@ -16410,7 +16524,7 @@ msgstr "Część historii tego elementu może być skompresowana, usunięcie jes
 msgid "Sort entries by"
 msgstr "Sortuj pozycje wg"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Porządek sortowania (0->999)"
 
@@ -16484,7 +16598,7 @@ msgstr "Uruchom w"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16532,12 +16646,14 @@ msgstr "Statystyki i dostępności zapisu pamięci Zabbix. Pamięć - jedna z wa
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16548,17 +16664,24 @@ msgstr "Statystyki i dostępności zapisu pamięci Zabbix. Pamięć - jedna z wa
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16582,13 +16705,10 @@ msgstr "Statystyki i dostępności zapisu pamięci Zabbix. Pamięć - jedna z wa
 msgid "Status"
 msgstr "Stan"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Wyliczenie stanu"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algorytm wyliczenia stanu"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16619,6 +16739,10 @@ msgstr "Tylko stan"
 msgid "Status problem"
 msgstr "Status problemu"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16650,8 +16774,8 @@ msgstr "Krok o nazwie \"%1$s\" już istnieje."
 msgid "Steps"
 msgstr "Kroki"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Stop"
 
@@ -16663,7 +16787,7 @@ msgstr "Zatrzymaj przetwarzanie"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16695,7 +16819,7 @@ msgid "Strict"
 msgstr "Ścisły"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr "Łańcuch znaków"
 
@@ -16728,7 +16852,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Temat"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Podrzędna mapa"
 
@@ -16744,7 +16868,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Audyt udany"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "Wiadomość z powodzeniem"
 
@@ -16757,7 +16881,7 @@ msgstr "Suma statystyk ruchu przychodzącego i wychodzącego interfejsu sieciowe
 msgid "Sun"
 msgstr "Nie"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Niedziela"
 
@@ -16849,12 +16973,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Czas działania systemu w sekundach. Zwraca liczbę całkowitą"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "C"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "W"
@@ -16890,8 +17014,8 @@ msgstr "Tabela \"%1$s\" nie posiada pola o nazwie \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etykieta"
@@ -16931,14 +17055,13 @@ msgstr "Wartość znacznika"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16946,10 +17069,10 @@ msgstr "Wartość znacznika"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17113,7 +17236,7 @@ msgstr "Szablon o takiej samej widocznej nazwie \"%s\" już istnieje."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17400,12 +17523,12 @@ msgstr "Sterowanie"
 msgid "Thu"
 msgstr "Cz"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Do"
 
@@ -17415,13 +17538,13 @@ msgstr "Do"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17502,7 +17625,7 @@ msgstr "Odcisk czasowy"
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Aby ustawić interfejs hosta wybierz odpowiedni typ pozycji dla każdej pozycji"
 
@@ -17624,13 +17747,13 @@ msgstr "Trendy"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Wyzwalacz"
 
@@ -17649,7 +17772,7 @@ msgstr "Wyzwalacz \"%1$s\" należy do szablonów z różnymi odsyłaczami."
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Wyzwalacz \"%1$s\" zależy od wyzwalacza \"%2$s\", którego nie ma."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr "Wyzwalacz URL"
 
@@ -17736,7 +17859,7 @@ msgstr "Przegląd wyzwalaczy"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17804,15 +17927,15 @@ msgstr "Usunięto prototypy wyzwalaczy"
 msgid "Trigger prototypes updated"
 msgstr "Zaktualizowano prototypy wyzwalaczy"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Poziom wyzwalacza"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Stan wyzwalacza \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Stan wyzwalacza \"Problem\""
 
@@ -17864,7 +17987,7 @@ msgstr "Przytnij"
 msgid "Tue"
 msgstr "Wt"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Wtorek"
 
@@ -17877,7 +18000,7 @@ msgstr "Turecki (tr_TR)"
 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ą dotyczyć jednego pola inwentarzowego \"%3$s\", ponieważ doprowadzi to do konfliktu."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "Dwa elementy mapy powinny być wybrane"
 
@@ -17892,15 +18015,16 @@ msgstr "Dwa elementy mapy powinny być wybrane"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17967,7 +18091,7 @@ msgid "UNKNOWN"
 msgstr "NIEZNANE"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17977,7 +18101,7 @@ msgstr "NIEZNANE"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -18023,7 +18147,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL powinien mieć oba pola \"name\" (nazwa) i \"url\" dla mapy \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "Adresy URL"
 
@@ -18071,7 +18195,7 @@ msgstr "Nie można załadować parametrów API do ustawień."
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Nie można nadpisać istniejącego pliku konfiguracji."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18118,7 +18242,8 @@ msgstr "Odblokować wybranych użytkowników?"
 msgid "Unexpected response for action %1$s."
 msgstr "Nieoczekiwana odpowiedź dla akcji %1$s."
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18137,7 +18262,8 @@ msgstr "Jednostki"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18148,9 +18274,9 @@ msgstr "Jednostki"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Nieznany"
@@ -18169,12 +18295,12 @@ msgstr "Nieznany błąd"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Nieznana pozycja hosta, taka pozycja nie istnieje na wybranym hoście"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Nieznany host, taki host nie istnieje w systemie"
 
@@ -18221,7 +18347,7 @@ msgstr "Odłącz od szablonu"
 msgid "Unlink from templates"
 msgstr "Odłącz od szablonów"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Włącz głos"
 
@@ -18303,27 +18429,28 @@ msgstr "Działa"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18392,7 +18519,7 @@ msgid "Upper level maps"
 msgstr "Mapy wyższego poziomu"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Czas pracy"
@@ -18441,37 +18568,37 @@ msgstr "Wykorzystywane w akcjach"
 msgid "User"
 msgstr "Użytkownik"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Użytkownik \"%1$s\" nie może istnieć bez grupy użytkowników."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "Użytkownik \"%1$s\" jest właścicielem panelu \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Użytkownik \"%1$s\" jest właścicielem mapy \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "Użytkownik \"%1$s\" używa akcji \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18488,13 +18615,13 @@ msgstr "Dodano użytkownika"
 msgid "User agent string"
 msgstr "Ciąg znaków agenta użytkownika"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr "Użytkownik nie może zmienić własnej roli."
 
@@ -18520,32 +18647,32 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Grupa użytkowników"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Grupa użytkowników \"%1$s\" już istnieje."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Grupa użytkownika \"%1$s\" używa w akcji \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Grupa użytkowników \"%1$s\" została użyta w konfiguracji dla komunikatów zatrzymania bazy danych."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, 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\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr "Dodano grupę użytkownika"
 
@@ -18578,7 +18705,7 @@ msgstr[2] "Zaktualizowanych grup użytkownika"
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Grupa użytkownika o ID \"%1$s\" jest niedostępna."
@@ -18586,14 +18713,14 @@ msgstr "Grupa użytkownika o ID \"%1$s\" jest niedostępna."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Grupy użytkowników"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Użytkownik nie może siebie usunąć."
 
@@ -18643,7 +18770,7 @@ msgstr[2] "Usuniętych rówl użtykownika"
 msgid "User role updated"
 msgstr "Zaktualizowana role użytkownika"
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr "Rola użytkownika o ID \"%1$s\" jest niedostępna."
@@ -18677,7 +18804,7 @@ msgstr "Ustawienia użytkownika"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Brak parametrów współdzielenia użytkownika: %1$s dla mapy \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18699,12 +18826,12 @@ msgstr "Zaktualizowano użytkownika"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Użytkownik o ID \"%1$s\" jest niedostępny."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18749,7 +18876,7 @@ msgstr "Atrybut użytkownika"
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19016,23 +19143,23 @@ msgstr "Sprawdzenie"
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19239,8 +19366,8 @@ msgstr "Ułożenie pionowe"
 msgid "Vietnamese (vi_VN)"
 msgstr "Wietnamski (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr "Podgląd"
@@ -19267,7 +19394,12 @@ msgstr "Widoczna nazwa"
 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:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ś"
@@ -19284,11 +19416,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr "Wiadomość ostrzegająca"
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Przepraszamy, maksymalna możliwa liczba elementów do zapamiętania została osiągnięta."
 
@@ -19304,7 +19436,7 @@ msgstr "Przepraszamy, maksymalna możliwa liczba elementów do zapamiętania zos
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "WWW"
 
@@ -19375,7 +19507,7 @@ msgstr "Wywołanie zwrotne HTTP nie ma parametrów"
 msgid "Wed"
 msgstr "Śr"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Środa"
 
@@ -19386,6 +19518,10 @@ msgstr "Środa"
 msgid "Weekly"
 msgstr "Tygodniowo"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Witamy"
@@ -19403,7 +19539,7 @@ msgstr "Kiedy włączone"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "Widżet jest za mały dla okreśłonej liczby kolumn i wierszy."
 
@@ -19616,8 +19752,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19659,19 +19795,19 @@ msgstr "Rocznie"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19739,19 +19875,15 @@ msgstr "Nie określiłeś celów dla operacji akcji globalnego skryptu \"%1$s\".
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nie masz uprawnień do wykonania tej operacji"
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Nie masz uprawnień do tworzenia użytkowników."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Nie masz uprawnień do dostępu do tej strony."
@@ -19872,7 +20004,7 @@ msgstr "oczekiwano nazwy DNS"
 msgid "a boolean is expected"
 msgstr "oczekiwana wartość boolowska"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19991,7 +20123,6 @@ msgstr "agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20287,9 +20418,9 @@ msgstr "nie może być zmieniony"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20369,7 +20500,7 @@ msgstr "okrągła zależność nie jest dozwolona"
 msgid "circular item dependency is not allowed"
 msgstr "okrągła zależność elementy nie jest dozwolona"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20416,7 +20547,7 @@ msgstr "count() - Liczba udanych pobrań wartości Y (które uzupełnia operator
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20615,13 +20746,13 @@ msgstr "globalne ustawienia porządkowania"
 msgid "graph pattern"
 msgstr "wzór wykresu"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20669,7 +20800,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "Dołączanie podgrup"
 
@@ -20895,12 +21026,12 @@ msgstr "niskopoziomowa reguła wykrywania"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21004,8 +21135,8 @@ msgstr "min() - Minimalna wartość dla okresu T"
 msgid "minimum length is %1$s characters"
 msgstr "minimalna ilość znaków: %1$s"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -21100,7 +21231,7 @@ msgstr ""
 msgid "name"
 msgstr "nazwa"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "nowy"
 
@@ -21167,7 +21298,7 @@ msgstr "now() - Liczba sekund od Epoki"
 msgid "number"
 msgstr "liczba"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "z"
@@ -21235,7 +21366,7 @@ msgstr "dane wyjściowe"
 msgid "path/to/secret"
 msgstr "ścieżka/do/tajny"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr "ścieżka/do/tajny:klucz"
 
@@ -21362,7 +21493,7 @@ msgstr "wybrane"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "krótki opis"
 
@@ -21447,7 +21578,7 @@ msgstr "sum() - Suma wartości okresu T"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "dostarczone dane logowania nie są unikalne"
 
@@ -21457,8 +21588,8 @@ msgstr "dostarczone dane logowania nie są unikalne"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21539,7 +21670,7 @@ msgstr "oczekiwano trzeciego parametru"
 msgid "time filter default period exceeds the max period"
 msgstr "czas domyślnego okresu filtra osiągnął maksymalny okres"
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "przesunięcie czasu"
 
@@ -21602,7 +21733,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "wpisz tekst do wyszukania"
 
@@ -21629,7 +21760,7 @@ msgstr "nieoczekiwana stała \"%1$s\""
 msgid "unexpected constant value \"%1$s\""
 msgstr "nieoczekiwana wartość stałej \"%1$s\""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21723,7 +21854,7 @@ msgstr "niewspierany numer wersji"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21743,7 +21874,7 @@ msgstr "niewspierany numer wersji"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "wartość"
 
@@ -21890,7 +22021,7 @@ msgstr "nieprawidłowy typ reguły wykrywania"
 msgid "wrong item type"
 msgstr "nieprawidłowy typ elementu"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/pt_BR/LC_MESSAGES/frontend.po b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
index 14683d76d61..4258c0ed913 100644
--- a/ui/locale/pt_BR/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-01-25 11:38+0300\n"
 "Last-Translator: Marlon <Marlon@outlook.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dia"
 msgstr[1] "%1$d dias"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] "%1$s mensagens"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s de %2$s elemento em estado de incidente"
 msgstr[1] "%1$s de %2$s elementos em estado de incidente"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s tentava faltando"
 msgstr[1] "%1$s tentavas faltando"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segundo"
 msgstr[1] "%1$s segundos"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s símbolos restantes"
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Severidade, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, apenas leitura"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr "(sem proxy)"
 msgid "0 - use default port"
 msgstr "0 - usar a porta padrão"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 ou 1"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "ADICIONAR SOBREPOSIÇÃO"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "E"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Acesso negado"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Acesso negado!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Reconhecido"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Reconhecer"
 
@@ -499,7 +499,7 @@ msgstr "Reconhecer"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Reconhecido"
@@ -528,20 +528,22 @@ msgstr "Eventos confirmados RESOLVIDOS"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -646,7 +648,7 @@ msgstr "Ação atualizada"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -655,7 +657,7 @@ msgstr "Ação atualizada"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Ações"
@@ -714,8 +716,8 @@ msgstr "Ativo até"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -726,7 +728,6 @@ msgstr "Ativo até"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -734,11 +735,13 @@ msgstr "Ativo até"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -750,15 +753,17 @@ msgstr "Ativo até"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -825,7 +830,7 @@ msgstr "Ativo até"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Adicionar"
 
@@ -833,19 +838,19 @@ msgstr "Adicionar"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Adicionar um novo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Adicionar elemento filho"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -862,7 +867,7 @@ msgstr "Adicionar host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Adicionar múltiplos mapas"
 
@@ -879,7 +884,11 @@ msgstr ""
 msgid "Add new override"
 msgstr "Adicionar nova sobreposição"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -887,7 +896,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -921,7 +930,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Adicionar widget"
 
@@ -930,12 +939,20 @@ msgstr "Adicionar widget"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Adicionado, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -945,6 +962,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administração"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 # segui demais "labels" que estão sendo tratados como "texto"
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
@@ -1032,7 +1053,7 @@ msgstr "Alinha elementos do mapa"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Todos"
 
@@ -1041,8 +1062,8 @@ msgid "All dashboards"
 msgstr "Todos os dashboards"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Todos os grupos"
 
@@ -1050,7 +1071,7 @@ msgstr "Todos os grupos"
 msgid "All hosts"
 msgstr "Todos os hosts"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 
@@ -1084,7 +1105,7 @@ msgstr "Todos os templates"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1097,7 +1118,7 @@ msgstr "Permitir fechamento manual"
 msgid "Allowed hosts"
 msgstr "Hosts permitidos"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1115,7 +1136,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1156,12 +1177,12 @@ msgstr "E/OU"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1181,15 +1202,15 @@ msgstr "Erro na aplicação."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1207,7 +1228,7 @@ msgstr "Aproximando"
 msgid "Apr"
 msgstr "Abr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Abril"
 
@@ -1235,6 +1256,10 @@ msgstr "Tipo de área"
 msgid "Arithmetic"
 msgstr "Aritimética"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Como texto puro"
@@ -1285,8 +1310,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1364,7 +1389,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Agosto"
 
@@ -1394,7 +1419,7 @@ msgstr "Autenticação"
 msgid "Authentication algorithm"
 msgstr "Algoritmo de autenticação"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "Falha de autenticação: %1$s."
@@ -1443,7 +1468,7 @@ msgstr "Auto"
 msgid "Auto-login"
 msgstr "Login automático"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Não é possível habilitar as opções de login automático e logout automático ao mesmo tempo."
 
@@ -1453,7 +1478,7 @@ msgstr "Logout automático"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1638,11 +1663,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Trazer para frente"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Levar para tráz"
 
@@ -1723,7 +1748,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculado"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Calendário"
 
@@ -1743,8 +1768,8 @@ msgstr "Retorno"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1761,8 +1786,8 @@ msgstr "Retorno"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1792,7 +1817,7 @@ msgstr "Ação não foi adicionada"
 msgid "Cannot add correlation"
 msgstr "Não foi possível adicionar o correlacionamento"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1803,7 +1828,7 @@ 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/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1922,7 +1947,7 @@ msgid "Cannot add user"
 msgstr "Usuário não foi incluído"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1930,11 +1955,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Não foi possível adicionar a apresentação de telas"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2015,7 +2040,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "Não foi possível copiar a trigger"
 msgstr[1] "Não foi possível copiar as triggers"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2070,7 +2095,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2487,7 +2512,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Não foi possível expandir as macros."
 
@@ -2657,7 +2682,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2719,7 +2744,7 @@ msgstr ""
 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Não é possível renomear o usuário convidado."
 
@@ -2778,7 +2803,12 @@ msgstr "Não é possível configurar campos do inventário com o inventário des
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3200,6 +3230,7 @@ msgid "Change per second"
 msgstr "Modificações por segundo"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Mudar severidade"
 
@@ -3341,7 +3372,7 @@ msgstr "Verifica a performance de um serviço UDP. Retornos possíveis: 0 - serv
 msgid "Checks should be unique."
 msgstr "As verificações devem ser unicas."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3383,11 +3414,11 @@ msgstr "Limpar histórico e estatísticas (médias)"
 msgid "Clear when unlinking"
 msgstr "Limpar ao desassociar"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3417,7 +3448,7 @@ msgstr "Relógio"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Clonar"
 
@@ -3428,8 +3459,8 @@ msgstr "Clonar"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Fechar"
 
@@ -3459,8 +3490,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Recolher"
 
@@ -3477,7 +3508,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3545,6 +3576,7 @@ msgstr "Sessões concorrentes"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Condição"
 
@@ -3599,7 +3631,7 @@ msgstr "Condições"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -3862,7 +3894,7 @@ msgstr "Contato"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3899,8 +3931,8 @@ msgstr "Contêm"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3961,8 +3993,8 @@ msgstr "Coordenadas"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Copiar"
 
@@ -4093,11 +4125,11 @@ msgstr "Criar correlacionamento"
 msgid "Create dashboard"
 msgstr "Criar dashboard"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Criar item dependente"
 
@@ -4214,7 +4246,7 @@ msgstr "Criar mapa"
 msgid "Create media type"
 msgstr "Criar tipo de mídia"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Criar novo"
 
@@ -4230,7 +4262,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Criar script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4238,7 +4270,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Criar template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Criar trigger"
 
@@ -4458,7 +4490,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Propriedades do dashboard"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Compartilhamento de dashboard"
 
@@ -4488,7 +4520,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Dashboards"
 
@@ -4658,7 +4690,7 @@ msgstr "Dia da semana"
 msgid "Days"
 msgstr "Dias"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Depuração"
 
@@ -4672,7 +4704,7 @@ msgstr "Modo de depuração"
 msgid "Dec"
 msgstr "Dez"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Dezembro"
 
@@ -4681,13 +4713,17 @@ msgstr "Dezembro"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Padrão"
 
@@ -4757,8 +4793,8 @@ msgid "Delayed by"
 msgstr "Atrasado por"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4772,7 +4808,7 @@ msgstr "Atrasado por"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4804,8 +4840,8 @@ msgstr "Atrasado por"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Excluir"
 
@@ -4834,7 +4870,7 @@ msgstr "Excluir a ação atual?"
 msgid "Delete current correlation?"
 msgstr "Excluir o correlacionamento atual?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Excluir o dashboard?"
 
@@ -4878,7 +4914,7 @@ msgstr "Excluir o protótipo de item?"
 msgid "Delete item?"
 msgstr "Excluir o item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Excluir vínculos entre os elementos selecionados?"
 
@@ -4934,7 +4970,7 @@ msgstr "Excluir os dashboards selecionados?"
 msgid "Delete selected discovery rules?"
 msgstr "Excluir regras de descoberta selecionadas?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Excluir elementos selecionados?"
 
@@ -5036,11 +5072,11 @@ msgstr "Excluir scripts selecionados?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Excluir as formas seleciondas?"
 
@@ -5056,7 +5092,7 @@ msgstr "Excluir o protótipos de trigger selecionados?"
 msgid "Delete selected triggers?"
 msgstr "Excluir triggers selecionadas?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Excluir usuários selecionados?"
 
@@ -5107,7 +5143,7 @@ msgstr "Excluído: Template \"%1$s\"."
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5121,7 +5157,7 @@ msgstr "Nega"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5129,7 +5165,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependências"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Dependente"
 
@@ -5137,7 +5173,7 @@ msgstr "Dependente"
 msgid "Dependent item"
 msgstr "Item dependente"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5165,7 +5201,7 @@ msgstr "Status de desenvolvimento"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5329,7 +5365,7 @@ msgstr "Desativar os cenários web selecionados?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5342,14 +5378,14 @@ msgstr "Desativar os cenários web selecionados?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5432,7 +5468,7 @@ msgid "Discovery by proxy"
 msgstr "Descoberta por proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Verificação de descoberta"
 
@@ -5444,7 +5480,7 @@ msgstr "Verificações de descoberta"
 msgid "Discovery list"
 msgstr "Lista de descoberta"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objeto de descoberta"
 
@@ -5544,7 +5580,7 @@ msgstr "Regra de autobusca atualizada"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5555,7 +5591,7 @@ msgstr "Regras de descoberta"
 msgid "Discovery rules deleted"
 msgstr "A regra de descoberta foi excluída"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Status da descoberta de rede"
@@ -5596,7 +5632,7 @@ msgstr "Exibir gráfico empilhado"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Exibindo %1$s de %2$s encontrados"
@@ -5614,10 +5650,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Não calcular"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5632,7 +5664,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "A expressão condicional foi substituída?"
 
@@ -5688,7 +5720,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Fora"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5697,7 +5729,7 @@ msgid "Download the configuration file"
 msgstr "Receber a configuração"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Downtime"
@@ -5774,7 +5806,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "O userid \"%1$s\" está duplicado nos usuários do mapa \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5796,7 +5828,7 @@ msgstr "Item dinâmico"
 msgid "Dynamic items"
 msgstr "Itens dinâmicos"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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"
 
@@ -5804,13 +5836,14 @@ msgstr "Cada URL deverá possuir um nome único. Certifique-se que existe um nom
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5822,8 +5855,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Editar"
 
@@ -5839,11 +5872,11 @@ msgstr "Editar mapa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Editar árvore de elementos"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Editar trigger"
 
@@ -6118,7 +6151,7 @@ msgstr "Ativar traps"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6140,12 +6173,12 @@ msgstr "Ativar traps"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6204,7 +6237,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6228,7 +6261,7 @@ msgstr "Erro"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erro na requisição de pesquisa pela tabela \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Mensagem de erro"
 
@@ -6267,7 +6300,7 @@ msgstr "Regras de correlacionamento de eventos"
 msgid "Event details"
 msgstr "Detalhes do evento"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Geração de evento"
 
@@ -6297,7 +6330,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Conjunto de etiqueta de evento"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo do evento"
 
@@ -6331,7 +6364,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Excluir"
 
@@ -6342,7 +6375,7 @@ msgstr "Excluir"
 msgid "Exclude host groups"
 msgstr "Excluir grupos de hosts"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Executar"
 
@@ -6388,7 +6421,7 @@ msgstr "Executado"
 msgid "Executed script"
 msgstr "Script executado"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Confirmação de execução"
 
@@ -6404,8 +6437,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Expandir"
 
@@ -6472,7 +6505,7 @@ msgstr "Exportar para CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6526,7 +6559,7 @@ msgstr "Expressões"
 msgid "External check"
 msgstr "Monitoramento externo"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "S"
@@ -6550,7 +6583,7 @@ msgid "Failed"
 msgstr "Falhou"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Falha ao criar o dashboard"
 
@@ -6559,24 +6592,24 @@ msgstr "Falha ao criar o dashboard"
 msgid "Failed to parse URL."
 msgstr "Falha ao processar a URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Falha ao atualizar o dashboard"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6584,7 +6617,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Falha ao atualizar o template."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6608,7 +6641,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Fev"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Fevereiro"
 
@@ -6754,8 +6787,8 @@ msgstr "Região preenchida"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6833,6 +6866,10 @@ msgstr "Ajustar ao mapa"
 msgid "Fixed"
 msgstr "Fixo"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6898,14 +6935,14 @@ msgstr "Francês (fr_FR)"
 msgid "Fri"
 msgstr "Sex"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Sexta-feira"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6923,7 +6960,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acesso à interface web"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Ativar mensagens globais"
 
@@ -7005,7 +7042,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Expressão informada não é uma macro"
 
@@ -7023,7 +7060,7 @@ msgstr "Valor global"
 msgid "Go back to %1$s"
 msgstr "Voltar para %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Ir para"
 
@@ -7072,7 +7109,7 @@ msgstr "Área gradiente"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7233,7 +7270,7 @@ msgstr "Gráfico com o nome \"%1$s\" já existe em gráficos ou protótipos de g
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Gráficos"
 
@@ -7433,11 +7470,11 @@ msgstr "Ajuda"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadecimal para decimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Escondido"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Ocultar depuração"
 
@@ -7482,14 +7519,14 @@ msgstr "Ressaltar linha inteira"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Histórico"
 
@@ -7553,7 +7590,7 @@ msgstr "Alinhamento horizontal"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7561,8 +7598,7 @@ msgstr "Alinhamento horizontal"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7574,7 +7610,7 @@ msgstr "Alinhamento horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7654,7 +7690,7 @@ msgstr[1] "Hosts ativados"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7662,7 +7698,7 @@ msgstr[1] "Hosts ativados"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupo de hosts"
@@ -7693,7 +7729,7 @@ msgstr "Tipo de rótulo do grupo de hosts"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
@@ -7710,7 +7746,7 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7749,7 +7785,7 @@ msgstr "Interface do host"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7897,7 +7933,7 @@ msgstr "Já existe um host com o nome visível \"%1$s\"."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8129,14 +8165,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Identificação do sistema. Retorna texto"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8145,12 +8233,16 @@ msgstr "Se você entende que esta mensagem está errada, por favor consulte os a
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Imagem"
 
@@ -8280,7 +8372,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8293,11 +8385,11 @@ msgstr "Mapa inacessível"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "Template inacessível"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "Trigger inacessível"
 
@@ -8323,7 +8415,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Incluir"
 
@@ -8341,6 +8433,11 @@ msgstr "Incluir subgrupos"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Retorna estatísticas de tráfego de uma interface. Retorna: número inteiro"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8731,7 +8828,7 @@ msgstr "O tipo da condição de filtro é inválido para a ação \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Usada função incorreta"
 
@@ -8788,7 +8885,7 @@ 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\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Tipo incorreto para o item"
 
@@ -8819,7 +8916,7 @@ msgstr "ID inválido para o tipo de mídia."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Método incorreto \"%1$s.%2$s\"."
@@ -8959,10 +9056,10 @@ msgstr "Foi informado um ID de usuário inválido para o mapa \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "O ID de grupo de usuários informado para o mapa \"%1$s\" é inválido."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9269,9 +9366,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9343,6 +9440,10 @@ msgstr "Valor inválido para o campo PSK. O valor deverá ser consistente com a
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Foi utilizado um valor inválido para o status do proxy \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonésio (id_ID)"
@@ -9354,12 +9455,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9432,7 +9533,7 @@ msgid "Insert"
 msgstr "Inserir"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Insira a expressão"
 
@@ -9541,7 +9642,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9589,7 +9690,7 @@ msgstr "Data inválida."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Endereço de e-mail inválido: \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Endereço de e-mail inválido para o tipo de mídia com o ID \"%1$s\"."
@@ -9692,8 +9793,8 @@ msgstr "Os parâmetros do método são inválidos."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9897,7 +9998,7 @@ msgstr "Período de tempo inválido."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -10089,7 +10190,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10250,7 +10351,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Janeiro"
 
@@ -10272,7 +10373,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Julho"
 
@@ -10280,7 +10381,7 @@ msgstr "Julho"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Junho"
 
@@ -10314,7 +10415,7 @@ msgstr "Chave"
 msgid "Key passphrase"
 msgstr "Chave de acesso"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Palavra-chave"
 
@@ -10384,7 +10485,7 @@ msgstr "Localização do texto"
 msgid "Language"
 msgstr "Idioma"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10463,11 +10564,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Última checagem"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Gráfico última hora"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Gráfico último mês"
 
@@ -10505,7 +10606,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Gráfico última semana"
 
@@ -10518,11 +10619,11 @@ msgstr "Gráfico última semana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Dados recentes"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Últimos valores"
 
@@ -10633,7 +10734,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10711,12 +10812,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Lista de compartilhamento com grupos de usuários"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Lista de compartilhamento com usuários"
@@ -10844,7 +10945,7 @@ msgstr "A regra de autobusca (LLD) está em estado \"não suportado\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "S"
@@ -11004,7 +11105,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11033,7 +11134,7 @@ msgstr "Fechado manualmente"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11072,7 +11173,7 @@ msgstr "Localização do rótulo do elemento no mapa"
 msgid "Map element label type"
 msgstr "Tipo de rótulo no elemento do mapa"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11098,7 +11199,7 @@ msgstr "O proprietário do mapa não pode estar vazio."
 msgid "Map shape"
 msgstr "Forma do mapa"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "A atualização do mapa falhou."
 
@@ -11134,7 +11235,7 @@ msgstr "Mapas"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Março"
 
@@ -11161,7 +11262,7 @@ msgstr "Máscara"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11232,9 +11333,9 @@ msgstr "Número máximo de arquivos abertos suportado pelo S.O. Retorna: inteiro
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Quantidade máxima de processos suportada pelo S.O. Retorna: número inteiro"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11247,12 +11348,12 @@ 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."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "O tamanho máximo do endereço de e-mail foi excedito para o tipo de mídia com o ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Maio"
 
@@ -11262,8 +11363,8 @@ msgid "May"
 msgstr "Maio"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Mídia"
 
@@ -11324,7 +11425,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Mídia atualizada"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível."
@@ -11397,8 +11498,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Enquanto a mensagem estiver visível"
 
@@ -11416,7 +11517,7 @@ msgstr "Mensagem/Comando"
 msgid "Messages"
 msgstr "Mensagens"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Mensagens"
 
@@ -11444,6 +11545,11 @@ msgstr "Min"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11459,11 +11565,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11609,7 +11710,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Seg"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -11649,11 +11750,11 @@ msgstr "Mês"
 msgid "Monthly"
 msgstr "Mensal"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Mais correspondentes encontrados..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11669,6 +11770,14 @@ msgstr "Mais de 10 minutos"
 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."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11678,11 +11787,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Múltiplo"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Multiplos eventos de INCIDENTE"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Sem som"
 
@@ -11690,6 +11799,18 @@ msgstr "Sem som"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11784,25 +11905,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11945,6 +12067,10 @@ msgstr ""
 msgid "Never"
 msgstr "Nunca"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11956,7 +12082,7 @@ msgstr "Nova condição"
 msgid "New dashboard"
 msgstr "Novo dashboard"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Novo elemento"
 
@@ -11980,7 +12106,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nova expressão regular"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11997,7 +12123,7 @@ msgid "New triggers"
 msgstr "Novas triggers"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12015,20 +12141,20 @@ msgstr "Próximo passo"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12161,7 +12287,7 @@ msgstr "Sem detalhes"
 msgid "No discovery rule IDs given."
 msgstr "Não foram informados os IDs de regra de descoberta."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12223,7 +12349,7 @@ msgstr "Sem imagem"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Nenhuma interface encontrada"
 
@@ -12265,7 +12391,7 @@ msgstr "Nenhuma macro encontrada."
 msgid "No maps added."
 msgstr "Nenhum mapa adicionado."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
@@ -12278,8 +12404,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Sem tipo de operação para o correlacionamento \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Sem permissão de acesso ao sistema."
 
@@ -12291,7 +12417,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12299,11 +12424,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12421,19 +12547,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12442,15 +12568,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12477,7 +12603,7 @@ msgstr "Não foi informado o arquivo de chave pública."
 msgid "No recipients for action operation message."
 msgstr "Sem destinatários para a operação de mensagem da ação."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Não atualizar"
 
@@ -12493,7 +12619,7 @@ msgstr "Nenhum alvo selecionado"
 msgid "No target selected."
 msgstr "Nenhum alvo selecionado."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12540,7 +12666,7 @@ msgstr "Nenhum"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12572,15 +12698,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Não autorizado para definir a senha do usuário \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12612,8 +12738,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
 
@@ -12643,7 +12769,7 @@ msgstr "Notificar todos os envolvidos"
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Novembro"
 
@@ -12806,12 +12932,12 @@ msgstr "Sistema numeral"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numérico (fracionário)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Numérico (inteiro)"
 
@@ -12826,18 +12952,17 @@ msgstr "Numérico (inteiro sem sinal)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12864,7 +12989,7 @@ msgstr "Roteador OOB"
 msgid "OOB subnet mask"
 msgstr "Máscara de subnet OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "OU"
 
@@ -12892,13 +13017,13 @@ msgstr "Out"
 msgid "Octal to decimal"
 msgstr "Octal para decimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Outubro"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Inativo"
 
@@ -12910,7 +13035,7 @@ msgstr "Inativo"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12929,7 +13054,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Ativo"
 
@@ -12937,7 +13062,7 @@ msgstr "Ativo"
 msgid "On status change triggers blink for"
 msgstr "Ao mudar o status da trigger piscar por"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Uma vez"
 
@@ -12954,7 +13079,7 @@ msgid "One time only"
 msgstr "Apenas uma vez"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Downtime único"
 
@@ -12966,26 +13091,14 @@ msgstr "Apenas os super administradores podem criar grupos de hosts."
 msgid "Only Super Admins can create media types."
 msgstr "Apenas os super administradores podem criar tipos de mídia."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Apenas super administradores podem criar grupos de usuários."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Apenas os super administradores podem apagar tipos de mídia."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Apenas os super administradores podem apagar grupos de usuários."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Apenas os super administradores podem editar tipos de mídia."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Apenas super administradores podem atualizar grupos de usuários."
-
 #: include/classes/api/services/CDRule.php:488
 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."
@@ -13026,11 +13139,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Apenas o incidente selecionado"
 msgstr[1] "Apenas os incidentes selecionados"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13063,7 +13176,7 @@ msgstr "Ópera"
 msgid "Operating system information. Returns string"
 msgstr "Informação sobre o sistema operacional. Retorna: texto"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13088,7 +13201,7 @@ msgstr "A operação não possui grupo para operar."
 msgid "Operation has no template to operate."
 msgstr "A operação não possui template para operar."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13113,27 +13226,27 @@ msgstr "Operações"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operador"
 
@@ -13158,7 +13271,7 @@ msgstr "Opções"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13175,8 +13288,8 @@ msgstr "Ou"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13223,9 +13336,9 @@ msgstr "Ou"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Original"
 
@@ -13477,7 +13590,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "INCIDENTE"
@@ -13524,7 +13637,7 @@ msgstr "Identidade PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "A chave PSK é muito pequena. O tamanho mínimo são %1$s dígitos hexadecimais."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13547,13 +13660,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parâmetro"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13584,9 +13699,7 @@ msgstr "Itens herdados"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13675,15 +13788,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Colar"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Colar sem os links externos"
 
@@ -13757,19 +13874,20 @@ msgid "Periods"
 msgstr "Períodos"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Permissões"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Permissões devem ser definidas para grupos de usuários apenas."
 
@@ -13791,12 +13909,12 @@ msgstr "Informar algorítimo"
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Executar"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Executar som"
 
@@ -13826,7 +13944,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Por favor informe o nome ou IP e a porta do servidor Zabbix, assim como um nome para esta instalação (opcional)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Favor selecionar dois elementos"
 
@@ -13955,7 +14073,7 @@ msgid "Previous month"
 msgstr "Mês anterior"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14013,7 +14131,7 @@ msgstr "Frase privada"
 msgid "Privacy protocol"
 msgstr "Protocolo de privacidade"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privado"
@@ -14033,12 +14151,12 @@ msgid "Privilege level"
 msgstr "Nível de acesso"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14068,7 +14186,7 @@ msgstr "Problema criado"
 msgid "Problem display"
 msgstr "Exibição de incidentes"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Expressão de incidente"
@@ -14086,7 +14204,7 @@ msgstr "Incidente não suprimido"
 msgid "Problem is suppressed"
 msgstr "Incidente suprimido"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Incidente em"
 
@@ -14099,8 +14217,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Problema resolvido"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14113,14 +14231,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Incidente, se todos os filhos tem incidentes"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Incidente, se pelo menos um filho tem incidente"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14137,7 +14247,7 @@ msgstr "Incidente, se pelo menos um filho tem incidente"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Incidentes"
 
@@ -14171,12 +14281,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Propriedades"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14198,7 +14308,7 @@ msgstr "Proxies"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14261,7 +14371,7 @@ msgstr "Nome do proxy"
 msgid "Proxy updated"
 msgstr "Proxy atualizado"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Público"
@@ -14355,8 +14465,8 @@ msgstr "Leitura"
 msgid "Read only"
 msgstr "Somente leitura"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14364,8 +14474,8 @@ msgstr "Leitura"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14418,7 +14528,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14426,7 +14536,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Recuperação"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14461,7 +14571,7 @@ msgstr "Retângulo"
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Intervalo de atualização"
 
@@ -14522,7 +14632,7 @@ msgstr "Expressões regulares"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14554,6 +14664,7 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14563,7 +14674,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14571,13 +14682,13 @@ msgstr "Comando remoto"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14587,8 +14698,8 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14665,8 +14776,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Remover"
 
@@ -14706,7 +14817,7 @@ msgstr "Remover, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14735,7 +14846,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14743,7 +14854,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Substituir"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Substituir dependências"
 
@@ -14850,7 +14961,7 @@ msgstr "Código de status requerido"
 msgid "Required string"
 msgstr "Texto requerido"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Limpar"
@@ -14884,7 +14995,7 @@ msgstr "Confirmação de restauração"
 msgid "Reset defaults"
 msgstr "Restaurar padrões"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Resolvido"
 
@@ -15082,8 +15193,8 @@ msgstr "Direita Y"
 msgid "Right trim"
 msgstr "Remover espaços à direita"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15141,12 +15252,12 @@ msgstr "Executa o comando em no host. Retorna o texto retornado pelo comando; 1
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15157,10 +15268,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15373,7 +15482,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sab"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -15546,7 +15655,7 @@ msgstr "Script atualizado"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -15616,8 +15725,8 @@ msgid "Security name"
 msgstr "Nome de segurança"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15625,7 +15734,7 @@ msgstr "Nome de segurança"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Selecionar"
 
@@ -15661,19 +15770,19 @@ msgstr "Elementos selecionados"
 msgid "Selected items only"
 msgstr "Itens selecionados somente"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Selecionado, %1$s na posição %2$d de %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Selecionado, %1$s, apenas leitura, na posição %2$d de %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Enviar para trás"
 
@@ -15698,7 +15807,7 @@ msgstr "Enviar apenas para"
 msgid "Send to"
 msgstr "Enviar para"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Enviar para trás"
 
@@ -15731,7 +15840,7 @@ msgstr "Separados"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Setembro"
 
@@ -15763,34 +15872,29 @@ msgid "Server time"
 msgstr "Hora do servidor"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Serviços"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15798,7 +15902,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Serviço criado"
 
@@ -15827,7 +15931,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 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."
 
@@ -15843,11 +15947,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Horário de serviço"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo de serviço"
 
@@ -15856,7 +15960,7 @@ msgstr "Tipo de serviço"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Serviços atualizados"
 
@@ -15865,16 +15969,16 @@ msgstr "Serviços atualizados"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Serviços"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Os serviços formam uma dependência circular."
 
@@ -15886,9 +15990,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sessão terminada, conecte-se novamente por favor."
 
@@ -15912,10 +16016,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Defina o modo de inventário de host"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15956,7 +16068,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16002,7 +16114,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Compartilhamento"
 
@@ -16093,7 +16205,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16144,7 +16256,7 @@ msgstr "Exibir um alerta se o servidor Zabbix estiver fora do ar"
 msgid "Show working time"
 msgstr "Mostrar horário comercial"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Mostrar"
 
@@ -16253,7 +16365,7 @@ msgstr "Foi ignorada a cópia do gráfico \"%1$s\" para o host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Eslovaco (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Soneca"
 
@@ -16299,7 +16411,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordenar entradas por"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Posicionar em (0->999)"
 
@@ -16373,7 +16485,7 @@ msgstr "Iniciar em"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16421,12 +16533,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16437,17 +16551,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16471,13 +16592,10 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Cálculo do status"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritmo de cálculo do status"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16508,6 +16626,10 @@ msgstr "Somente status"
 msgid "Status problem"
 msgstr "Status de incidente"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16539,8 +16661,8 @@ msgstr "Já existe um passo com o nome \"%1$s\"."
 msgid "Steps"
 msgstr "Passos"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Parar"
 
@@ -16552,7 +16674,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16584,7 +16706,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16617,7 +16739,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Segurado"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Submapa"
 
@@ -16633,7 +16755,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Sucesso na Auditoria"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "Mensagem de sucesso"
 
@@ -16646,7 +16768,7 @@ msgstr "Sumarização das estatísticas de entrada e saída da interface de rede
 msgid "Sun"
 msgstr "Dom"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -16738,12 +16860,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Tempo desde a carga do sistema. Retorna: número inteiro"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Q"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16779,8 +16901,8 @@ msgstr "A tabela \"%1$s\" não possui um campo chamado \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Plaqueta"
@@ -16820,14 +16942,13 @@ msgstr "Valor da etiqueta"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16835,10 +16956,10 @@ msgstr "Valor da etiqueta"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17002,7 +17123,7 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17287,12 +17408,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Qui"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Até"
 
@@ -17302,13 +17423,13 @@ msgstr "Até"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17389,7 +17510,7 @@ msgstr "Hora"
 msgid "To"
 msgstr "Para"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 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"
 
@@ -17511,13 +17632,13 @@ msgstr "Estatísticas"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17536,7 +17657,7 @@ msgstr "A trigger \"%1$s\" pertence a templates com associações distintas."
 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."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17620,7 +17741,7 @@ msgstr "Visão geral triggers"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17687,15 +17808,15 @@ msgstr "Protótipos de trigger excluídos"
 msgid "Trigger prototypes updated"
 msgstr "Protótipos de trigger atualizados"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severidade da trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Status da trigger \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Status da trigger \"Incidente\""
 
@@ -17747,7 +17868,7 @@ msgstr "Remover espaços"
 msgid "Tue"
 msgstr "Ter"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -17760,7 +17881,7 @@ msgstr "Turco (tr_TR)"
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "Dois elementos do mapa devem ser serlecionados"
 
@@ -17775,15 +17896,16 @@ msgstr "Dois elementos do mapa devem ser serlecionados"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17850,7 +17972,7 @@ msgid "UNKNOWN"
 msgstr "DESCONHECIDO"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17860,7 +17982,7 @@ msgstr "DESCONHECIDO"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17906,7 +18028,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "A URL deverá possuir os campos \"name\" e \"url\" no mapa \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17954,7 +18076,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Não foi possível sobrescrever o arquivo de configuração existente."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18001,7 +18123,8 @@ msgstr "Desbloquear usuários selecionados?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18020,7 +18143,8 @@ msgstr "Unidades"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18031,9 +18155,9 @@ msgstr "Unidades"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -18052,12 +18176,12 @@ msgstr "Erro desconhecido"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item de host desconhecido; não existe este item no host selecionado"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Host desconhecido; não existe este host no sistema"
 
@@ -18104,7 +18228,7 @@ msgstr "Desassociar da template"
 msgid "Unlink from templates"
 msgstr "Desvincular dos templates"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Som"
 
@@ -18185,27 +18309,28 @@ msgstr "Ligado"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18274,7 +18399,7 @@ msgid "Upper level maps"
 msgstr "Mapas de nível superior"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Uptime"
@@ -18323,37 +18448,37 @@ msgstr "Usado nas ações"
 msgid "User"
 msgstr "Usuário"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "O usuário \"%1$s\" não pode ficar sem grupo."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "O usuário \"%1$s\" é o proprietário do dashboad \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "O usuário \"%1$s\" é o proprietário do mapa \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "O usuário \"%1$s\" é utilizado na ação \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18370,13 +18495,13 @@ msgstr "Usuário incluído"
 msgid "User agent string"
 msgstr "Mensagem do agente de usuário"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18401,32 +18526,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Grupo de usuários"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "O grupo \"%1$s\" já existe."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "O grupo de usuários \"%1$s\" é utilizado na ação \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, 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."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, 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\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18457,7 +18582,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "O grupo de usuários com o ID \"%1$s\" não está disponível."
@@ -18465,14 +18590,14 @@ msgstr "O grupo de usuários com o ID \"%1$s\" não está disponível."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Grupos de usuários"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Um usuário não pode excluir a sí próprio."
 
@@ -18521,7 +18646,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18555,7 +18680,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Compartilhamento de usuário com parâmetro ausente: %1$s no mapa \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18576,12 +18701,12 @@ msgstr "Usuário atualizado"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "O usuário com o ID \"%1$s\" não está disponível."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18626,7 +18751,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18893,23 +19018,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19116,8 +19241,8 @@ msgstr "Alinhamento vertical"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamita (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19144,7 +19269,12 @@ msgstr "Nome visível"
 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:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Q"
@@ -19161,11 +19291,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Aviso"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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."
 
@@ -19181,7 +19311,7 @@ msgstr "Desculpe, mas o número máximo de elementos a recordar foi atingido."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19250,7 +19380,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Qua"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -19261,6 +19391,10 @@ msgstr "Quarta-feira"
 msgid "Weekly"
 msgstr "Semanal"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Bem vindo"
@@ -19278,7 +19412,7 @@ msgstr "Ativo quando"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19491,8 +19625,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19534,19 +19668,19 @@ msgstr "Anual"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19614,19 +19748,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Você não tem permissão para executar esta operação."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Você não tem permissão para criar usuários."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Você não possui permissão para acessar esta página."
@@ -19747,7 +19877,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "é aguardado um valor booleano"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19866,7 +19996,6 @@ msgstr "agente"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20162,9 +20291,9 @@ msgstr "não pode ser modificado"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20244,7 +20373,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "dependência circular entre itens não é permitida"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20291,7 +20420,7 @@ msgstr "count() - Quantidade de valores V recuperados com sucesso (que correspon
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20490,13 +20619,13 @@ msgstr "configurações globais de limpeza de dados"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20544,7 +20673,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "incluindo subgrupos"
 
@@ -20771,12 +20900,12 @@ msgstr "regra de autobusca (LLD)"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20880,8 +21009,8 @@ msgstr "min() - Valor mínimo em um período T"
 msgid "minimum length is %1$s characters"
 msgstr "o tamanho mínimo é %1$s caracteres"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20976,7 +21105,7 @@ msgstr ""
 msgid "name"
 msgstr "nome"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "novo"
 
@@ -21043,7 +21172,7 @@ msgstr "now() - Quantidade de segundos desde Epoch"
 msgid "number"
 msgstr "número"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "de"
@@ -21111,7 +21240,7 @@ msgstr "saída"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21238,7 +21367,7 @@ msgstr "selecionado"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "descrição curta"
 
@@ -21323,7 +21452,7 @@ msgstr "sum() - Total de valores em um período T"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "as credenciais informadas não são únicas"
 
@@ -21333,8 +21462,8 @@ msgstr "as credenciais informadas não são únicas"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21415,7 +21544,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "mudança de horário"
 
@@ -21478,7 +21607,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "informe aqui o argumento para pesquisa"
 
@@ -21505,7 +21634,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21599,7 +21728,7 @@ msgstr "número de versão não suportado"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21619,7 +21748,7 @@ msgstr "número de versão não suportado"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "valor"
 
@@ -21767,7 +21896,7 @@ msgstr "tipo errado de regra de descoberta"
 msgid "wrong item type"
 msgstr "tipo errado de item"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/pt_PT/LC_MESSAGES/frontend.po b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
index d58b1186219..fb68e6f8395 100644
--- a/ui/locale/pt_PT/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-10-10 08:35+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dia"
 msgstr[1] "%1$d dias"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -222,17 +222,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "resta %1$s tentativa"
 msgstr[1] "restam %1$s tentativas"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segundo"
 msgstr[1] "%1$s segundos"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -307,7 +307,7 @@ msgstr "(sem proxy)"
 msgid "0 - use default port"
 msgstr "0 - usar porta padrão"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 ou 1"
 
@@ -375,7 +375,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "E"
 
@@ -392,7 +392,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -457,40 +457,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Acesso negado"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Acesso negado!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Reconhecido"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Reconhecer"
 
@@ -498,7 +498,7 @@ msgstr "Reconhecer"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Reconhecido"
@@ -527,20 +527,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -645,7 +647,7 @@ msgstr "Acção actualizada"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -654,7 +656,7 @@ msgstr "Acção actualizada"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acções"
@@ -713,8 +715,8 @@ msgstr "Activo até"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -725,7 +727,6 @@ msgstr "Activo até"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -733,11 +734,13 @@ msgstr "Activo até"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -749,15 +752,17 @@ msgstr "Activo até"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -824,7 +829,7 @@ msgstr "Activo até"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Adicionar"
 
@@ -832,19 +837,19 @@ msgstr "Adicionar"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Adicionar novo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Adicionar elemento filho"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -861,7 +866,7 @@ msgstr "Adicionar host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Adicionar multiplos mapas"
 
@@ -878,7 +883,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -886,7 +895,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -920,7 +929,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Adicionar widget"
 
@@ -929,12 +938,20 @@ msgstr "Adicionar widget"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -944,6 +961,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administração"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Etiquetas avançadas"
@@ -1030,7 +1051,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Tudo"
 
@@ -1039,8 +1060,8 @@ msgid "All dashboards"
 msgstr "Todos os dashboards"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Todos os grupos"
 
@@ -1048,7 +1069,7 @@ msgstr "Todos os grupos"
 msgid "All hosts"
 msgstr "Todos os hosts"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 
@@ -1082,7 +1103,7 @@ msgstr "Todos os templates"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1095,7 +1116,7 @@ msgstr "Permitir encerramento manual"
 msgid "Allowed hosts"
 msgstr "Hosts permitidos"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1113,7 +1134,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1154,12 +1175,12 @@ msgstr "E/Ou"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1179,15 +1200,15 @@ msgstr "Erro na aplicação."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1205,7 +1226,7 @@ msgstr "Aproximando"
 msgid "Apr"
 msgstr "Abr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Abril"
 
@@ -1233,6 +1254,10 @@ msgstr "Tipo de área"
 msgid "Arithmetic"
 msgstr "Aritimética"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Como texto simples"
@@ -1281,8 +1306,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1360,7 +1385,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Agosto"
 
@@ -1390,7 +1415,7 @@ msgstr "Autenticação"
 msgid "Authentication algorithm"
 msgstr "Algoritmo de autenticação"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1439,7 +1464,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Login automático"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Não é possível activar as opções de login automático e logout automático ao mesmo tempo."
 
@@ -1449,7 +1474,7 @@ msgstr "Logout automático"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1634,11 +1659,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Trazer para frente"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Levar para tráz"
 
@@ -1719,7 +1744,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculado"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1739,8 +1764,8 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1757,8 +1782,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1788,7 +1813,7 @@ msgstr "Não foi possível adicionar acção"
 msgid "Cannot add correlation"
 msgstr "Não foi possível adicionar correlação"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1799,7 +1824,7 @@ 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/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1918,7 +1943,7 @@ msgid "Cannot add user"
 msgstr "Não foi possível adicionar utilizador"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1926,11 +1951,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Não foi possível adicionar a apresentação de ecrãs"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2011,7 +2036,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "Não foi possível copiar o trigger"
 msgstr[1] "Não foi possível copiar os triggers"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2066,7 +2091,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2483,7 +2508,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Não foi possível expandir as macros."
 
@@ -2653,7 +2678,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2715,7 +2740,7 @@ msgstr ""
 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Não é possível renomear o utilizador convidado."
 
@@ -2774,7 +2799,12 @@ msgstr "Não é possível configurar campos do inventário com o inventário des
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3196,6 +3226,7 @@ msgid "Change per second"
 msgstr "Modificações por segundo"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3337,7 +3368,7 @@ msgstr "Verifica a performance de um serviço UDP. Retornos possíveis: 0 - serv
 msgid "Checks should be unique."
 msgstr "As verificações devem ser únicas."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3379,11 +3410,11 @@ msgstr "Limpar histórico e tendências"
 msgid "Clear when unlinking"
 msgstr "Limpar ao desvincular"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3413,7 +3444,7 @@ msgstr "Relógio"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Clonar"
 
@@ -3424,8 +3455,8 @@ msgstr "Clonar"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Fechar"
 
@@ -3455,8 +3486,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Recolher"
 
@@ -3473,7 +3504,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3541,6 +3572,7 @@ msgstr "Sessões concorrentes"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Condição"
 
@@ -3595,7 +3627,7 @@ msgstr "Condições"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -3858,7 +3890,7 @@ msgstr "Contacto"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3895,8 +3927,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3957,8 +3989,8 @@ msgstr "Coordenadas"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Copiar"
 
@@ -4089,11 +4121,11 @@ msgstr "Criar correlacionamento"
 msgid "Create dashboard"
 msgstr "Criar dashboard"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Criar item dependente"
 
@@ -4210,7 +4242,7 @@ msgstr "Criar mapa"
 msgid "Create media type"
 msgstr "Criar tipo de média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Criar novo"
 
@@ -4226,7 +4258,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Criar script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4234,7 +4266,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Criar template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Criar trigger"
 
@@ -4454,7 +4486,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Propriedades do dashboard"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Partilha de dashboard"
 
@@ -4484,7 +4516,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Dashboards"
 
@@ -4654,7 +4686,7 @@ msgstr "Dia da semana"
 msgid "Days"
 msgstr "Dias"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Debug"
 
@@ -4668,7 +4700,7 @@ msgstr "Modo de debug"
 msgid "Dec"
 msgstr "Dez"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Dezembro"
 
@@ -4677,13 +4709,17 @@ msgstr "Dezembro"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Por omissão"
 
@@ -4753,8 +4789,8 @@ msgid "Delayed by"
 msgstr "Atrasado em"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4768,7 +4804,7 @@ msgstr "Atrasado em"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4800,8 +4836,8 @@ msgstr "Atrasado em"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -4830,7 +4866,7 @@ msgstr "Eliminar acção actual?"
 msgid "Delete current correlation?"
 msgstr "Eliminar o correlacionamento atual?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Eliminar o dashboard?"
 
@@ -4874,7 +4910,7 @@ msgstr "Eliminar o protótipo de item?"
 msgid "Delete item?"
 msgstr "Eliminar item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Eliminar associações entre os elementos seleccionados?"
 
@@ -4930,7 +4966,7 @@ msgstr "Eliminar os dashboards selecionados?"
 msgid "Delete selected discovery rules?"
 msgstr "Eliminar regras de descoberta seleccionadas?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Eliminar elementos seleccionados?"
 
@@ -5032,11 +5068,11 @@ msgstr "Eliminar scripts seleccionados?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Eliminar as formas seleciondas?"
 
@@ -5052,7 +5088,7 @@ msgstr "Eliminar o protótipos de trigger selecionados?"
 msgid "Delete selected triggers?"
 msgstr "Eliminar triggers seleccionados?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Eliminar utilizador seleccionado?"
 
@@ -5103,7 +5139,7 @@ msgstr "Eliminado: Template \"%1$s\"."
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5117,7 +5153,7 @@ msgstr "Negar"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5125,7 +5161,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependências"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Dependente"
 
@@ -5133,7 +5169,7 @@ msgstr "Dependente"
 msgid "Dependent item"
 msgstr "Item dependente"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5161,7 +5197,7 @@ msgstr "Estado de deployment"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5325,7 +5361,7 @@ msgstr "Desactivar os cenários web selecionados?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5338,14 +5374,14 @@ msgstr "Desactivar os cenários web selecionados?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5428,7 +5464,7 @@ msgid "Discovery by proxy"
 msgstr "Descoberta por proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Verificação de descoberta"
 
@@ -5440,7 +5476,7 @@ msgstr "Verificações de descoberta"
 msgid "Discovery list"
 msgstr "Lista de descobertas"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objecto de descoberta"
 
@@ -5540,7 +5576,7 @@ msgstr "Regra de descoberta actualizada"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5551,7 +5587,7 @@ msgstr "Regras de descoberta"
 msgid "Discovery rules deleted"
 msgstr "Regras de descoberta eliminadas"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Estado da descoberta"
@@ -5591,7 +5627,7 @@ msgstr "Mostrar gráfico empilhado"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "A mostrar %1$s de %2$s encontrados"
@@ -5609,10 +5645,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Não calcular"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5627,7 +5659,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Deseja substituir a expressão condicional?"
 
@@ -5683,7 +5715,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Descer"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5692,7 +5724,7 @@ msgid "Download the configuration file"
 msgstr "Transferir a configuração"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Downtime"
@@ -5768,7 +5800,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "O userid \"%1$s\" está duplicado nos utilizadores do mapa \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5790,7 +5822,7 @@ msgstr "Item dinâmico"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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 nome"
 
@@ -5798,13 +5830,14 @@ msgstr "Cada URL deve ter um nome único. Certifique-se que existe apenas um URL
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5816,8 +5849,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Editar"
 
@@ -5833,11 +5866,11 @@ msgstr "Editar mapa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Editar árvore de elementos"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Editar trigger"
 
@@ -6112,7 +6145,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6134,12 +6167,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6198,7 +6231,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6222,7 +6255,7 @@ msgstr "Erro"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erro no pedido de pesquisa para a tabela \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6262,7 +6295,7 @@ msgstr "Regras de correlacionamento de eventos"
 msgid "Event details"
 msgstr "Detalhes do evento"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Geração de eventos"
 
@@ -6292,7 +6325,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Conjunto de etiqueta de evento"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo do evento"
 
@@ -6326,7 +6359,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Eliminar"
 
@@ -6337,7 +6370,7 @@ msgstr "Eliminar"
 msgid "Exclude host groups"
 msgstr "Eliminar grupos de hosts"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Executar"
 
@@ -6383,7 +6416,7 @@ msgstr "Executado"
 msgid "Executed script"
 msgstr "Script executado"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Confirmação de execução"
 
@@ -6399,8 +6432,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Expandir"
 
@@ -6467,7 +6500,7 @@ msgstr "Exportar para CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6521,7 +6554,7 @@ msgstr "Expressões"
 msgid "External check"
 msgstr "Verificação externa"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "S"
@@ -6545,7 +6578,7 @@ msgid "Failed"
 msgstr "Falhou"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Falha ao criar o dashboard"
 
@@ -6554,24 +6587,24 @@ msgstr "Falha ao criar o dashboard"
 msgid "Failed to parse URL."
 msgstr "Falha ao processar a URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Falha ao atualizar o dashboard"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6579,7 +6612,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Falha ao atualizar o template."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6603,7 +6636,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Fev"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Fevereiro"
 
@@ -6749,8 +6782,8 @@ msgstr "Região preenchida"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6828,6 +6861,10 @@ msgstr "Ajustar ao mapa"
 msgid "Fixed"
 msgstr "Fixo"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6893,14 +6930,14 @@ msgstr "Francês (fr_FR)"
 msgid "Fri"
 msgstr "Sex"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Sexta-feira"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6918,7 +6955,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acesso ao frontend"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Mensagem do frontend"
 
@@ -7000,7 +7037,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "A expressão fornecida não é uma macro"
 
@@ -7018,7 +7055,7 @@ msgstr "Valor global"
 msgid "Go back to %1$s"
 msgstr "Voltar para %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Ir para"
 
@@ -7067,7 +7104,7 @@ msgstr "Linha de gradiente"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7228,7 +7265,7 @@ msgstr "Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos d
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Gráficos"
 
@@ -7428,11 +7465,11 @@ msgstr "Ajuda"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadecimal para decimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Oculto"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Ocultar depuração"
 
@@ -7477,14 +7514,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Histórico"
 
@@ -7548,7 +7585,7 @@ msgstr "Alinhamento horizontal"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7556,8 +7593,7 @@ msgstr "Alinhamento horizontal"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7569,7 +7605,7 @@ msgstr "Alinhamento horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7649,7 +7685,7 @@ msgstr[1] "Hosts activados"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7657,7 +7693,7 @@ msgstr[1] "Hosts activados"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupo de hosts"
@@ -7688,7 +7724,7 @@ msgstr "Tipo de etiqueta do grupo de hosts"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
@@ -7705,7 +7741,7 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7744,7 +7780,7 @@ msgstr "Interface do host"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7892,7 +7928,7 @@ msgstr "Já existe um host com o nome visível \"%1$s\"."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8124,14 +8160,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Identificação do sistema. Retorna texto"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8140,12 +8228,16 @@ msgstr "Se acha que esta mensagem está errada, por favor consulte os administra
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Imagem"
 
@@ -8275,7 +8367,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8288,11 +8380,11 @@ msgstr "Mapa inacessível"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8318,7 +8410,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Incluir"
 
@@ -8336,6 +8428,11 @@ msgstr "Incluir subgrupos"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Retorna estatísticas de tráfego de uma interface. Retorna: número inteiro"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8726,7 +8823,7 @@ msgstr "O tipo da condição de filtro é inválido para a acção \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Usada função incorrecta"
 
@@ -8783,7 +8880,7 @@ 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\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Tipo de valor incorrecto para o item"
 
@@ -8814,7 +8911,7 @@ msgstr "ID inválido para o tipo de mídia."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Método incorrecto \"%1$s.%2$s\"."
@@ -8954,10 +9051,10 @@ msgstr "Foi fornecido um ID de utilizador inválido para o mapa \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "O ID de grupo de utilizadores fornecido para o mapa \"%1$s\" é inválido."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9264,9 +9361,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9338,6 +9435,10 @@ msgstr "Valor inválido para o campo PSK. O valor deverá ser consistente com a
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Foi utilizado um valor inválido para o status do proxy \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonésio (id_ID)"
@@ -9349,12 +9450,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9427,7 +9528,7 @@ msgid "Insert"
 msgstr "Inserir"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Insira a expressão"
 
@@ -9536,7 +9637,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9584,7 +9685,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9687,8 +9788,8 @@ msgstr "Parâmetros inválidos para o método."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9892,7 +9993,7 @@ msgstr "Período de tempo inválido."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -10082,7 +10183,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10243,7 +10344,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Janeiro"
 
@@ -10265,7 +10366,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Julho"
 
@@ -10273,7 +10374,7 @@ msgstr "Julho"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Junho"
 
@@ -10307,7 +10408,7 @@ msgstr "Chave"
 msgid "Key passphrase"
 msgstr "Frase chave"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Palavra-chave"
 
@@ -10377,7 +10478,7 @@ msgstr "Localização da etiqueta"
 msgid "Language"
 msgstr "Língua"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10456,11 +10557,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Última verificação"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Gráfico da última hora"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Gráfico do último mês"
 
@@ -10498,7 +10599,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Gráfico da última semana"
 
@@ -10511,11 +10612,11 @@ msgstr "Gráfico da última semana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Dados recentes"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Últimos valores"
 
@@ -10626,7 +10727,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10704,12 +10805,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Lista de partilha com grupos de utilizadores"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Lista de partilha com utilizadores"
@@ -10837,7 +10938,7 @@ msgstr "A regra de autodescoberta (LLD) está em estado \"não suportado\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10997,7 +11098,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11026,7 +11127,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11065,7 +11166,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11091,7 +11192,7 @@ msgstr "O proprietário do mapa não pode estar vazio."
 msgid "Map shape"
 msgstr "Forma do mapa"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "A atualização do mapa falhou."
 
@@ -11127,7 +11228,7 @@ msgstr "Mapas"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Março"
 
@@ -11154,7 +11255,7 @@ msgstr "Máscara"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11225,9 +11326,9 @@ msgstr "Número máximo de arquivos abertos suportado pelo S.O. Retorna: inteiro
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Quantidade máxima de processos suportada pelo S.O. Retorna: número inteiro"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11240,12 +11341,12 @@ 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."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mai"
 
@@ -11255,8 +11356,8 @@ msgid "May"
 msgstr "Maio"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Média"
 
@@ -11317,7 +11418,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Tipo de média actualizado"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível."
@@ -11390,8 +11491,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Expiração da mensagem"
 
@@ -11409,7 +11510,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Mensagens"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Mensagens"
 
@@ -11437,6 +11538,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11452,11 +11558,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11602,7 +11703,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Seg"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -11642,11 +11743,11 @@ msgstr "Mês"
 msgid "Monthly"
 msgstr "Mensal"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Mais correspondentes encontrados..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11662,6 +11763,14 @@ msgstr "Mais de 10 minutos"
 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."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11671,11 +11780,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Múltiplo"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Múltiplos eventos de PROBLEMA"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -11683,6 +11792,18 @@ msgstr "Silenciar"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11777,25 +11898,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11938,6 +12060,10 @@ msgstr ""
 msgid "Never"
 msgstr "Nunca"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11949,7 +12075,7 @@ msgstr "Nova condição"
 msgid "New dashboard"
 msgstr "Novo dashboard"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Novo elemento"
 
@@ -11973,7 +12099,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nova expressão regular"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11990,7 +12116,7 @@ msgid "New triggers"
 msgstr "Novos triggers"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12008,20 +12134,20 @@ msgstr "Próximo passo"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12154,7 +12280,7 @@ msgstr "Sem detalhes"
 msgid "No discovery rule IDs given."
 msgstr "Não foram fornecidos IDs de regras de descoberta."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12216,7 +12342,7 @@ msgstr "Sem imagem"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Interface não encontrado"
 
@@ -12256,7 +12382,7 @@ msgstr "Nenhuma macro encontrada."
 msgid "No maps added."
 msgstr "Nenhum mapa adicionado."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
@@ -12269,8 +12395,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Sem tipo de operação para o correlacionamento \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Sem permissões para acesso ao sistema."
 
@@ -12282,7 +12408,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12290,11 +12415,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12412,19 +12538,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12433,15 +12559,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12468,7 +12594,7 @@ msgstr "Não foi especificado o ficheiro de chave pública."
 msgid "No recipients for action operation message."
 msgstr "Não existem destinos para a operação mensagem da acção."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Não atualizar"
 
@@ -12484,7 +12610,7 @@ msgstr "Não foi seleccionado nenhum destino"
 msgid "No target selected."
 msgstr "Não foi seleccionado nenhum destino."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12531,7 +12657,7 @@ msgstr "Nenhum"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12563,15 +12689,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Não é possível definir uma senha para o utilizador \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12603,8 +12729,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
 
@@ -12634,7 +12760,7 @@ msgstr "Notificar todos os envolvidos"
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Novembro"
 
@@ -12797,12 +12923,12 @@ msgstr "Sistema numeral"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Númerico (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Numérico (inteiro)"
 
@@ -12817,18 +12943,17 @@ msgstr "Numérico (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12855,7 +12980,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Máscara de rede OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "OU"
 
@@ -12883,13 +13008,13 @@ msgstr "Out"
 msgid "Octal to decimal"
 msgstr "Octal para decimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Outubro"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Inactivo"
 
@@ -12901,7 +13026,7 @@ msgstr "Inactivo"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12920,7 +13045,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Activo"
 
@@ -12928,7 +13053,7 @@ msgstr "Activo"
 msgid "On status change triggers blink for"
 msgstr "Em alterações de estado os triggers piscam para"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Uma vez"
 
@@ -12945,7 +13070,7 @@ msgid "One time only"
 msgstr "Apenas uma vez"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Downtime único"
 
@@ -12957,26 +13082,14 @@ msgstr "Apenas os Super Admins podem criar grupos de hosts."
 msgid "Only Super Admins can create media types."
 msgstr "Apenas os Super Admins podem criar tipos de média."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Apenas super administradores podem criar grupos de utilizadores."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Apenas os Super Admins podem eliminar tipos de média."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Apenas os Super Admins podem eliminar grupos de utilizadores."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Apenas os Super Admins podem editar tipos de média."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Apenas super administradores podem actualizar grupos de utilizadores."
-
 #: include/classes/api/services/CDRule.php:488
 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."
@@ -13017,11 +13130,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Apenas o incidente seleccionado"
 msgstr[1] "Apenas os incidentes selecionados"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13054,7 +13167,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informação sobre o sistema operativo. Retorna: texto"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13079,7 +13192,7 @@ msgstr "A operação não tem nenhum grupo para operar."
 msgid "Operation has no template to operate."
 msgstr "A operação não tem nenhum template para operar."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13104,27 +13217,27 @@ msgstr "Operações"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operador"
 
@@ -13149,7 +13262,7 @@ msgstr "Opções"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13166,8 +13279,8 @@ msgstr "Ou"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13214,9 +13327,9 @@ msgstr "Ou"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Original"
 
@@ -13468,7 +13581,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEMA"
@@ -13515,7 +13628,7 @@ msgstr "Identidade PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "A chave PSK é muito pequena. O tamanho mínimo são %1$s dígitos hexadecimais."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13538,13 +13651,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parâmetro"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13575,9 +13690,7 @@ msgstr "Itens pai"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13666,15 +13779,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Colar"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Colar sem os links externos"
 
@@ -13748,19 +13865,20 @@ msgid "Periods"
 msgstr "Períodos"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Permissões"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "As permissões apenas podem ser atribuídas a grupos de utilizadores."
 
@@ -13782,12 +13900,12 @@ msgstr "Algoritmo de colocação"
 msgid "Plain text"
 msgstr "Texto simples"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Tocar"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Tocar som"
 
@@ -13817,7 +13935,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Por favor informe o nome ou IP e a porta do servidor Zabbix, assim como um nome para esta instalação (opcional)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Por favor seleccione dois elementos"
 
@@ -13946,7 +14064,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14004,7 +14122,7 @@ msgstr "Frase privada"
 msgid "Privacy protocol"
 msgstr "Protocolo de privacidade"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privado"
@@ -14024,12 +14142,12 @@ msgid "Privilege level"
 msgstr "Nível de privilégios"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14059,7 +14177,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Vista de problemas"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Expressão do problema"
@@ -14077,7 +14195,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problema em"
 
@@ -14090,8 +14208,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14104,14 +14222,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problema, se todos os filhos tiverem problemas"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problema, se pelo menos um dos filhos tiver um problema"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14128,7 +14238,7 @@ msgstr "Problema, se pelo menos um dos filhos tiver um problema"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problemas"
 
@@ -14162,12 +14272,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Propriedades"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14189,7 +14299,7 @@ msgstr "Proxies"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14252,7 +14362,7 @@ msgstr "Nome do proxy"
 msgid "Proxy updated"
 msgstr "Proxy actualizado"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Público"
@@ -14346,8 +14456,8 @@ msgstr "Leitura"
 msgid "Read only"
 msgstr "Só leitura"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14355,8 +14465,8 @@ msgstr "Leitura"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14409,7 +14519,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14417,7 +14527,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Recuperação"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14452,7 +14562,7 @@ msgstr "Retângulo"
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Intervalo de atualização"
 
@@ -14513,7 +14623,7 @@ msgstr "Expressões regulares"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14545,6 +14655,7 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14554,7 +14665,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14562,13 +14673,13 @@ msgstr "Comando remoto"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14578,8 +14689,8 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14656,8 +14767,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -14697,7 +14808,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14726,7 +14837,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14734,7 +14845,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Substituir"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Substituir dependências"
 
@@ -14841,7 +14952,7 @@ msgstr "Códigos de estado necessários"
 msgid "Required string"
 msgstr "String obrigatória"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reinicializar"
@@ -14875,7 +14986,7 @@ msgstr "Confirmação de reinicialização"
 msgid "Reset defaults"
 msgstr "Reinicializar para valores por omissão"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Resolvido"
 
@@ -15073,8 +15184,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Remover espaços à direita"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15132,12 +15243,12 @@ msgstr "Executa o comando em no host. Retorna o texto retornado pelo comando; 1
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15148,10 +15259,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15364,7 +15473,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sáb"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -15537,7 +15646,7 @@ msgstr "Script actualizado"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -15607,8 +15716,8 @@ msgid "Security name"
 msgstr "Nome de segurança"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15616,7 +15725,7 @@ msgstr "Nome de segurança"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -15652,19 +15761,19 @@ msgstr "Elementos seleccionados"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Enviar para trás"
 
@@ -15689,7 +15798,7 @@ msgstr "Enviar apenas para"
 msgid "Send to"
 msgstr "Enviar para"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Enviar para trás"
 
@@ -15722,7 +15831,7 @@ msgstr "Separado"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Setembro"
 
@@ -15754,34 +15863,29 @@ msgid "Server time"
 msgstr "Hora do servidor"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Serviço"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15789,7 +15893,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Serviço criado"
 
@@ -15818,7 +15922,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 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."
 
@@ -15834,11 +15938,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Tempos do serviço"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo de serviço"
 
@@ -15847,7 +15951,7 @@ msgstr "Tipo de serviço"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Serviço actualizado"
 
@@ -15856,16 +15960,16 @@ msgstr "Serviço actualizado"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Serviços"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Os serviços formam uma dependência circular."
 
@@ -15877,9 +15981,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "A sessão foi terminada, por favor, inicie a sessão novamente."
 
@@ -15903,10 +16007,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Defina o modo de inventário de host"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15947,7 +16059,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15993,7 +16105,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Partilha"
 
@@ -16084,7 +16196,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16135,7 +16247,7 @@ msgstr "Mostrar aviso se o Zabbix Server estiver offline"
 msgid "Show working time"
 msgstr "Mostrar horário de trabalho"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Exibido"
 
@@ -16244,7 +16356,7 @@ msgstr "Ignorada a cópia do gráfico \"%1$s\" para o host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Eslovaco (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Adiar"
 
@@ -16290,7 +16402,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordenar entradas por"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sequência de ordenação (0->999)"
 
@@ -16364,7 +16476,7 @@ msgstr "Começar em"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16412,12 +16524,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16428,17 +16542,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16462,13 +16583,10 @@ msgstr ""
 msgid "Status"
 msgstr "Estado"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Cálculo do estado"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritmo de cálculo do estado"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16499,6 +16617,10 @@ msgstr "Apenas o estado"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16530,8 +16652,8 @@ msgstr "Já existe um passo com o nome \"%1$s\"."
 msgid "Steps"
 msgstr "Passos"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Parar"
 
@@ -16543,7 +16665,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16575,7 +16697,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16608,7 +16730,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Segurado"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Submapa"
 
@@ -16624,7 +16746,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Auditoria de sucesso"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16637,7 +16759,7 @@ msgstr "Sumarização das estatísticas de entrada e saída da interface de rede
 msgid "Sun"
 msgstr "Dom"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -16729,12 +16851,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Tempo desde a carga do sistema. Retorna: número inteiro"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Q"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16770,8 +16892,8 @@ msgstr "A tabela \"%1$s\" não tem nenhum campo com nome \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiqueta"
@@ -16811,14 +16933,13 @@ msgstr "Valor da etiqueta"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16826,10 +16947,10 @@ msgstr "Valor da etiqueta"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16993,7 +17114,7 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17278,12 +17399,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Qui"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Até"
 
@@ -17293,13 +17414,13 @@ msgstr "Até"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17380,7 +17501,7 @@ msgstr "Timestamp"
 msgid "To"
 msgstr "Para"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 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 itens"
 
@@ -17502,13 +17623,13 @@ msgstr "Tendências"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17527,7 +17648,7 @@ msgstr "A trigger \"%1$s\" pertence a templates com associações distintas."
 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."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17611,7 +17732,7 @@ msgstr "Vista geral de triggers"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17678,15 +17799,15 @@ msgstr "Protótipos de trigger eliminados"
 msgid "Trigger prototypes updated"
 msgstr "Protótipos de trigger actualizados"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severidade do trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Status do trigger \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Status do trigger \"Problema\""
 
@@ -17738,7 +17859,7 @@ msgstr "Remover espaços"
 msgid "Tue"
 msgstr "Ter"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -17751,7 +17872,7 @@ msgstr "Turco (tr_TR)"
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17766,15 +17887,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17841,7 +17963,7 @@ msgid "UNKNOWN"
 msgstr "DESCONHECIDO"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17851,7 +17973,7 @@ msgstr "DESCONHECIDO"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17897,7 +18019,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "A URL deverá possuir os campos \"name\" e \"url\" no mapa \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17945,7 +18067,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Não foi possível sobrescrever o arquivo de configuração existente."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17992,7 +18114,8 @@ msgstr "Desbloquear utilizadores seleccionados?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18011,7 +18134,8 @@ msgstr "Unidades"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18022,9 +18146,9 @@ msgstr "Unidades"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -18043,12 +18167,12 @@ msgstr "Erro desconhecido"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item do host desconhecido, não existe esse item no host seleccionado"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Host desconhecido, não existe esse host no sistema"
 
@@ -18095,7 +18219,7 @@ msgstr "Desassociar do template"
 msgid "Unlink from templates"
 msgstr "Desassociar dos templates"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Reactivar"
 
@@ -18176,27 +18300,28 @@ msgstr "Ligado"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18265,7 +18390,7 @@ msgid "Upper level maps"
 msgstr "Mapas de nível superior"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Uptime"
@@ -18314,37 +18439,37 @@ msgstr "Utilizado nas acções"
 msgid "User"
 msgstr "Utilizador"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "O utilizador \"%1$s\" não pode ficar sem grupo."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "O utilizador \"%1$s\" é o proprietário do dashboad \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "O utilizador \"%1$s\" é o proprietário do mapa \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "O utilizador \"%1$s\" é utilizado na acção \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18361,13 +18486,13 @@ msgstr "Utilizador adicionado"
 msgid "User agent string"
 msgstr "Mensagem do agente de utilizador"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18392,32 +18517,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Grupo de utilizadores"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "O grupo \"%1$s\" já existe."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "O grupo de utilizadores \"%1$s\" é utilizado na acção \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "O grupo de utilizadores \"%1$s\" está configurado para alerta de quedas de base de dados."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, 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\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18448,7 +18573,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "O grupo de utilizadores com o ID \"%1$s\" não está disponível."
@@ -18456,14 +18581,14 @@ msgstr "O grupo de utilizadores com o ID \"%1$s\" não está disponível."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Grupos de utilizadores"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Um utilizador não pode eliminar-se a si próprio."
 
@@ -18512,7 +18637,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18546,7 +18671,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Partilha de utilizador com parâmetro não encontrado: %1$s no mapa \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18567,12 +18692,12 @@ msgstr "Utilizador actualizado"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "O utilizador com o ID \"%1$s\" não está disponível."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18617,7 +18742,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18884,23 +19009,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19107,8 +19232,8 @@ msgstr "Alinhamento vertical"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamita (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19135,7 +19260,12 @@ msgstr "Nome visível"
 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."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Q"
@@ -19152,11 +19282,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Aviso"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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."
 
@@ -19172,7 +19302,7 @@ msgstr "Pedimos desculpa, foi atingido o número máximo possível de elementos.
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19241,7 +19371,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Qua"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -19252,6 +19382,10 @@ msgstr "Quarta-feira"
 msgid "Weekly"
 msgstr "Semanalmente"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Bem vindo"
@@ -19269,7 +19403,7 @@ msgstr "Quando activado"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19482,8 +19616,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19525,19 +19659,19 @@ msgstr "Anualmente"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19605,19 +19739,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "O utilizador actual não tem permissões para realizar esta operação."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "O utilizador actual não tem permissões para criar utilizadores."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Não possui permissão para aceder a esta página."
@@ -19738,7 +19868,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "é esperado um valor booleano"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19857,7 +19987,6 @@ msgstr "agente"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20153,9 +20282,9 @@ msgstr "não pode ser modificado"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20235,7 +20364,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "dependência circular entre itens não é permitida"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20282,7 +20411,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20481,13 +20610,13 @@ msgstr "configurações globais de limpeza de dados"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20535,7 +20664,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "incluindo subgrupos"
 
@@ -20762,12 +20891,12 @@ msgstr "regra de autodescoberta (LLD)"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20871,8 +21000,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr "o tamanho mínimo é %1$s caracteres"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20967,7 +21096,7 @@ msgstr ""
 msgid "name"
 msgstr "nome"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "novo"
 
@@ -21034,7 +21163,7 @@ msgstr ""
 msgid "number"
 msgstr "número"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "de"
@@ -21102,7 +21231,7 @@ msgstr "saída"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21229,7 +21358,7 @@ msgstr "seleccionado"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "descrição sumária"
 
@@ -21314,7 +21443,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21324,8 +21453,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21406,7 +21535,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21469,7 +21598,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "digite aqui para pesquisar"
 
@@ -21496,7 +21625,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21590,7 +21719,7 @@ msgstr "número de versão não suportado"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21610,7 +21739,7 @@ msgstr "número de versão não suportado"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "valor"
 
@@ -21757,7 +21886,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/ro/LC_MESSAGES/frontend.po b/ui/locale/ro/LC_MESSAGES/frontend.po
index 708c911a0f8..95fc2c3e674 100644
--- a/ui/locale/ro/LC_MESSAGES/frontend.po
+++ b/ui/locale/ro/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-09-08 17:57+0300\n"
 "Last-Translator: altmir <rmircea@birotec.ro>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d zi"
 msgstr[1] "%1$d zile"
 msgstr[2] "%1$d zile"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -236,10 +236,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -325,7 +325,7 @@ msgstr "(fără proxy)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 sau 1"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "ȘI"
 
@@ -410,7 +410,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -478,40 +478,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Acces refuzat!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Cnf"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Confirmare"
 
@@ -519,7 +519,7 @@ msgstr "Confirmare"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Confirmat"
@@ -548,20 +548,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -668,7 +670,7 @@ msgstr "Acțiune actualizată"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -677,7 +679,7 @@ msgstr "Acțiune actualizată"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acțiuni"
@@ -736,8 +738,8 @@ msgstr "Activ până la"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -748,7 +750,6 @@ msgstr "Activ până la"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -756,11 +757,13 @@ msgstr "Activ până la"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -772,15 +775,17 @@ msgstr "Activ până la"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -847,7 +852,7 @@ msgstr "Activ până la"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Adaugă"
 
@@ -855,19 +860,19 @@ msgstr "Adaugă"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -884,7 +889,7 @@ msgstr "Adaugă server"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -901,7 +906,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -909,7 +918,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -943,7 +952,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -952,12 +961,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Admin"
@@ -967,6 +984,10 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrare"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Etichete avansate"
@@ -1053,7 +1074,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Tot"
 
@@ -1062,8 +1083,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1071,7 +1092,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Toate linkurile trebuie sa aibă \"Nume\" și \"URL\" specificat"
 
@@ -1105,7 +1126,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1118,7 +1139,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Servere permise"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1136,7 +1157,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1177,12 +1198,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1202,15 +1223,15 @@ msgstr "Eroare aplicație."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Aplică"
 
@@ -1228,7 +1249,7 @@ msgstr "Abordare"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Aprilie"
 
@@ -1256,6 +1277,10 @@ msgstr "Tipul suprafeței"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Ca text simplu"
@@ -1304,8 +1329,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1383,7 +1408,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "August"
 
@@ -1413,7 +1438,7 @@ msgstr "Autentificare"
 msgid "Authentication algorithm"
 msgstr "Algoritm de autentificare"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1462,7 +1487,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Auto-login"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1472,7 +1497,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1657,11 +1682,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Jos"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1742,7 +1767,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculat"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1762,8 +1787,8 @@ msgstr "Apelare inversă"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1780,8 +1805,8 @@ msgstr "Apelare inversă"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -1811,7 +1836,7 @@ msgstr "Nu se poate adăuga acțiunea"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1822,7 +1847,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Nu se poate adăuga dependința server - șablon."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1942,7 +1967,7 @@ msgid "Cannot add user"
 msgstr "Nu se poate adăuga utilizatorul"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1950,11 +1975,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Nu se pate adăuga scenariul web"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2038,7 +2063,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2094,7 +2119,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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."
@@ -2552,7 +2577,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2724,7 +2749,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2786,7 +2811,7 @@ 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Nu se poate redenumi utilizatorul guest."
 
@@ -2845,7 +2870,12 @@ msgstr "Nu se pot seta câmpurile inventarului pentru un inventar dezactivat."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3276,6 +3306,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3417,7 +3448,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Verificările trebuie să fie unice."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3459,11 +3490,11 @@ msgstr "Șterge istoric și tendințe"
 msgid "Clear when unlinking"
 msgstr "Șterge la deconectare"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3493,7 +3524,7 @@ msgstr "Ceas"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Clonă"
 
@@ -3504,8 +3535,8 @@ msgstr "Clonă"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Închide"
 
@@ -3535,8 +3566,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3553,7 +3584,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3621,6 +3652,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Condiție"
 
@@ -3675,7 +3707,7 @@ msgstr "Condiții"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Configurare"
 
@@ -3938,7 +3970,7 @@ msgstr "Contact"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3975,8 +4007,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4037,8 +4069,8 @@ msgstr "Coordonate"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Copiază"
 
@@ -4171,11 +4203,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4292,7 +4324,7 @@ msgstr "Creează hartă"
 msgid "Create media type"
 msgstr "Creează tip media"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4308,7 +4340,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Creează script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4316,7 +4348,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Creează șablon"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Creează trigger"
 
@@ -4537,7 +4569,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4567,7 +4599,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4737,7 +4769,7 @@ msgstr "Ziua săptămânii"
 msgid "Days"
 msgstr "Zile"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Depanare"
 
@@ -4751,7 +4783,7 @@ msgstr "Mod depanare"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Decembrie"
 
@@ -4760,13 +4792,17 @@ msgstr "Decembrie"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Implicit"
 
@@ -4836,8 +4872,8 @@ msgid "Delayed by"
 msgstr "Întârziat de către"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4851,7 +4887,7 @@ msgstr "Întârziat de către"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4883,8 +4919,8 @@ msgstr "Întârziat de către"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Șterge"
 
@@ -4913,7 +4949,7 @@ msgstr "Ștergere acțiune curentă?"
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4957,7 +4993,7 @@ msgstr "Ștergere prototip de element?"
 msgid "Delete item?"
 msgstr "Ștergere element?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Ștergere legătura între elementele selectate?"
 
@@ -5013,7 +5049,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Ștergere regulă de detecție selectată?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Ștergere elemente selectate?"
 
@@ -5114,11 +5150,11 @@ msgstr "Ștergere scripturi selectate?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5134,7 +5170,7 @@ msgstr "Ștergere prototipuri de trigger selectați?"
 msgid "Delete selected triggers?"
 msgstr "Ștergere triggeri selectați?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Ștergere utilizator selectat?"
 
@@ -5185,7 +5221,7 @@ msgstr "Ștergere: Șablon \"%1$s\"."
 msgid "Delimiter"
 msgstr "Delimitator"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5199,7 +5235,7 @@ msgstr "Negare"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5207,7 +5243,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependențe"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Dependenţă"
 
@@ -5215,7 +5251,7 @@ msgstr "Dependenţă"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5243,7 +5279,7 @@ msgstr "Stare de implementare"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5407,7 +5443,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5420,14 +5456,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5510,7 +5546,7 @@ msgid "Discovery by proxy"
 msgstr "Detectat de către proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Verificare de detectare"
 
@@ -5522,7 +5558,7 @@ msgstr "Verificări de detectare"
 msgid "Discovery list"
 msgstr "Listă de detecție"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Obiect detectat"
 
@@ -5625,7 +5661,7 @@ msgstr "Regulă de detecție actualizată"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5636,7 +5672,7 @@ msgstr "Reguli de detecție"
 msgid "Discovery rules deleted"
 msgstr "Reguli de detecție șterse"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stare detecție"
@@ -5676,7 +5712,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Afișare %1$s din %2$s gasită"
@@ -5694,10 +5730,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Nu calculeză"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5712,7 +5744,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Doreşti să înlocuiești expresia condițională?"
 
@@ -5768,7 +5800,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Oprit"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5777,7 +5809,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Avarie"
@@ -5853,7 +5885,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5875,7 +5907,7 @@ msgstr "Item dinamic"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Fiecare URL trebuie să aibă un nume unic. Vă rugăm să vă asigurați că există un singur URL cu numele"
 
@@ -5883,13 +5915,14 @@ msgstr "Fiecare URL trebuie să aibă un nume unic. Vă rugăm să vă asiguraț
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5901,8 +5934,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Editare"
 
@@ -5918,11 +5951,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Editare trigger"
 
@@ -6197,7 +6230,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6219,12 +6252,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6283,7 +6316,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6307,7 +6340,7 @@ msgstr "Eroare"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Eroare in cererea de căutare pentru tabelul \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6347,7 +6380,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Detalii eveniment"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Generare eveniment"
 
@@ -6377,7 +6410,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tip eveniment"
 
@@ -6412,7 +6445,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Exclude"
 
@@ -6423,7 +6456,7 @@ msgstr "Exclude"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Execută"
 
@@ -6469,7 +6502,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Script executat"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Confirmare de executare"
 
@@ -6485,8 +6518,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6553,7 +6586,7 @@ msgstr "Export în CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6607,7 +6640,7 @@ msgstr "Expresii"
 msgid "External check"
 msgstr "Verificare externă"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6631,7 +6664,7 @@ msgid "Failed"
 msgstr "Eșec"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6640,24 +6673,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6665,7 +6698,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6689,7 +6722,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Februarie"
 
@@ -6835,8 +6868,8 @@ msgstr "Zone pline"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6914,6 +6947,10 @@ msgstr "Încadrează în hartă"
 msgid "Fixed"
 msgstr "Remediat"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6979,14 +7016,14 @@ msgstr "Franceză (fr_FR)"
 msgid "Fri"
 msgstr "Fri"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Vineri"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -7004,7 +7041,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acces la interfață"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Mesaje de interfață"
 
@@ -7086,7 +7123,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Expresia dată nu este macro"
 
@@ -7104,7 +7141,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Mergi la"
 
@@ -7153,7 +7190,7 @@ msgstr "Gradient linie"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7315,7 +7352,7 @@ msgstr "Graficul cu numele \"%1$s\" există deja în grafic sau în prototipuril
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafice"
 
@@ -7517,11 +7554,11 @@ msgstr "Ajutor"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Ascuns"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7566,14 +7603,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Istoric"
 
@@ -7637,7 +7674,7 @@ msgstr "Aliniere orizontală"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7645,8 +7682,7 @@ msgstr "Aliniere orizontală"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7658,7 +7694,7 @@ msgstr "Aliniere orizontală"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7742,7 +7778,7 @@ msgstr[2] "Servere activate"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7750,7 +7786,7 @@ msgstr[2] "Servere activate"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Grup server"
@@ -7781,7 +7817,7 @@ msgstr "Tipul etichetei grupului de servere"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7798,7 +7834,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7837,7 +7873,7 @@ msgstr "Interfață server"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7987,7 +8023,7 @@ msgstr "Server cu același nume vizibil \"%1$s\" există deja."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8219,14 +8255,68 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Dacă crezi ca acest mesaj este greșit, te rog să consulți administratorii pentru obținerea permisiunilor necesare."
@@ -8235,12 +8325,16 @@ msgstr "Dacă crezi ca acest mesaj este greșit, te rog să consulți administra
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Imagine"
 
@@ -8370,7 +8464,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8383,11 +8477,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8413,7 +8507,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Include"
 
@@ -8431,6 +8525,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8821,7 +8920,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Funcție incorectă utilizată"
 
@@ -8878,7 +8977,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Cheie item \"%1$s\" incorect prevăzut pentru expresia triggerului pe \"%2$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8909,7 +9008,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -9049,10 +9148,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9359,9 +9458,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9433,6 +9532,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Valoare incorectă folosită pentru stare proxy \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indoneză (id_ID)"
@@ -9444,12 +9547,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9522,7 +9625,7 @@ msgid "Insert"
 msgstr "Inserează"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9630,7 +9733,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9678,7 +9781,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9781,8 +9884,8 @@ msgstr "Parametrii metodei invalizi. "
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9986,7 +10089,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -10181,7 +10284,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10342,7 +10445,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Ian"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Ianuarie"
 
@@ -10364,7 +10467,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Iul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Iulie"
 
@@ -10372,7 +10475,7 @@ msgstr "Iulie"
 msgid "Jun"
 msgstr "Iun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Iunie"
 
@@ -10406,7 +10509,7 @@ msgstr "Cheie"
 msgid "Key passphrase"
 msgstr "Parola cheie"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Cuvânt cheie"
 
@@ -10476,7 +10579,7 @@ msgstr "Locație etichetă"
 msgid "Language"
 msgstr "Limbă"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10561,11 +10664,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Ultima verificare"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Graficul ultimei ore"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Graficul ultimei luni"
 
@@ -10603,7 +10706,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Ultima valoare"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Graficul ultimei săptămâni"
 
@@ -10616,11 +10719,11 @@ msgstr "Graficul ultimei săptămâni"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Cele mai recente date"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Cele mai recente valori"
 
@@ -10731,7 +10834,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10809,12 +10912,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10942,7 +11045,7 @@ msgstr "Nivel scăzut al regulii de detecție în stare \"nu este acceptată\""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -11102,7 +11205,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11131,7 +11234,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Hartă"
 
@@ -11170,7 +11273,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11196,7 +11299,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11232,7 +11335,7 @@ msgstr "Hărți"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Martie"
 
@@ -11259,7 +11362,7 @@ msgstr "Mască"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11330,9 +11433,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11346,12 +11449,12 @@ msgstr[0] "Perioada maximă de timp pentru afișare este %1$s zile."
 msgstr[1] "Perioada maximă de timp pentru afișare este %1$s zile."
 msgstr[2] "Perioada maximă de timp pentru afișare este %1$s zile."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mai"
 
@@ -11361,8 +11464,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11427,7 +11530,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Tipul media actualizat"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11500,8 +11603,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Mesaj expirat"
 
@@ -11519,7 +11622,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Mesaje"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Trimitere mesaje"
 
@@ -11547,6 +11650,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11562,11 +11670,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11717,7 +11820,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Lun"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Luni"
 
@@ -11757,11 +11860,11 @@ msgstr "Lună"
 msgid "Monthly"
 msgstr "Lunar"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Mai multe potriviri găsite..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11777,6 +11880,14 @@ msgstr "Mai mult de 10 minute"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Mai mult de un grafic cu numele \"%1$s\" fără server."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11786,11 +11897,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Evenimente PROBLEME multiple"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Mut"
 
@@ -11798,6 +11909,18 @@ msgstr "Mut"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11892,25 +12015,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12053,6 +12177,10 @@ msgstr ""
 msgid "Never"
 msgstr "Niciodată"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12064,7 +12192,7 @@ msgstr "Condiție nouă"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Element nou"
 
@@ -12088,7 +12216,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Exoresie uzuală nouă"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12105,7 +12233,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12123,20 +12251,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12269,7 +12397,7 @@ msgstr "Niciun detaliu"
 msgid "No discovery rule IDs given."
 msgstr "Nicio regulă de detecție IDs dată."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12331,7 +12459,7 @@ msgstr "Nicio imagine"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Nicio interfață găsită"
 
@@ -12371,7 +12499,7 @@ msgstr "Niciun macro găsit."
 msgid "No maps added."
 msgstr "Nicio hartă adaugată."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Nicio potrivire găsită"
 
@@ -12384,8 +12512,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Nicio permisiune de acces la sistem."
 
@@ -12397,7 +12525,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12405,11 +12532,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12527,19 +12655,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12548,15 +12676,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12583,7 +12711,7 @@ msgstr "Nu a fost specificat nici un fișier cu cheie publică."
 msgid "No recipients for action operation message."
 msgstr "Niciun destinatar pentru mesajul de acțiune a operațiunii."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12599,7 +12727,7 @@ msgstr "Nu a fost selectată nicio țintă"
 msgid "No target selected."
 msgstr "Nu a fost selectată nicio țintă."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12646,7 +12774,7 @@ msgstr "Niciunul"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12678,15 +12806,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nu este permisă setarea parolei pentru utilizatorul \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12718,8 +12846,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nesuportat"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Notă"
 
@@ -12749,7 +12877,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Noi"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Noiembrie"
 
@@ -12912,12 +13040,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numeric (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12932,18 +13060,17 @@ msgstr "Numeric (nesemnat)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12970,7 +13097,7 @@ msgstr "router OOB"
 msgid "OOB subnet mask"
 msgstr "Mască subnet OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "SAU"
 
@@ -12998,13 +13125,13 @@ msgstr "Oct"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Octombrie"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Oprit"
 
@@ -13016,7 +13143,7 @@ msgstr "Oprit"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -13035,7 +13162,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Pornit"
 
@@ -13043,7 +13170,7 @@ msgstr "Pornit"
 msgid "On status change triggers blink for"
 msgstr "Statusul pornit modifică triggerii să lumineze pentru "
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Odată"
 
@@ -13060,7 +13187,7 @@ msgid "One time only"
 msgstr "O singură dată"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Întrerupere unică"
 
@@ -13072,26 +13199,14 @@ msgstr "Numai super administratorii pot crea grupuri de servere."
 msgid "Only Super Admins can create media types."
 msgstr "Doar Superadministratorii pot crea tipuri de media."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Doar Superadministratorii pot șterge tipuri de media."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Numai super administratorii pot șterge grupuri de utilizatori."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Doar Superadministratorii pot edita tipuri de media."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13133,11 +13248,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13170,7 +13285,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13195,7 +13310,7 @@ msgstr "Operațiunea nu are grup de operare."
 msgid "Operation has no template to operate."
 msgstr "Operațiunea nu are șablon de operare."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13220,27 +13335,27 @@ msgstr "Operațiuni"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
@@ -13265,7 +13380,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13282,8 +13397,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13330,9 +13445,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Original"
 
@@ -13584,7 +13699,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEMĂ"
@@ -13631,7 +13746,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13654,13 +13769,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametru"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13691,9 +13808,7 @@ msgstr "Itemi părinte"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13782,15 +13897,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13864,19 +13983,20 @@ msgid "Periods"
 msgstr "Perioade"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Permisiuni"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Persmisiunea poate fi atribuită doar grupurilor de utilizatori."
 
@@ -13898,12 +14018,12 @@ msgstr "Plasare algoritm"
 msgid "Plain text"
 msgstr "Text simplu"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Redare"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Redare sunet"
 
@@ -13933,7 +14053,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Va rog selectați două elemente"
 
@@ -14062,7 +14182,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14120,7 +14240,7 @@ msgstr "Frază de acces de confidențialitate"
 msgid "Privacy protocol"
 msgstr "Ptotocol confidențial"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14140,12 +14260,12 @@ msgid "Privilege level"
 msgstr "Nivel privilegiat"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14175,7 +14295,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Afișare problemă"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14193,7 +14313,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problemă pe"
 
@@ -14206,8 +14326,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14220,14 +14340,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problemă, dacă toți copiii au probleme"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problemă, dacă cel puțin un copil are o problemă"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14244,7 +14356,7 @@ msgstr "Problemă, dacă cel puțin un copil are o problemă"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Probleme"
 
@@ -14278,12 +14390,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14305,7 +14417,7 @@ msgstr "Proxy-uri"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14370,7 +14482,7 @@ msgstr "Nume proxy"
 msgid "Proxy updated"
 msgstr "Proxy actualizat"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14464,8 +14576,8 @@ msgstr "Citire"
 msgid "Read only"
 msgstr "Numai citire"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14473,8 +14585,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14527,7 +14639,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14535,7 +14647,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Recuperare"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14570,7 +14682,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14632,7 +14744,7 @@ msgstr "Expresii uzuale"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14664,6 +14776,7 @@ msgstr "Comandă de la distanță"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14673,7 +14786,7 @@ msgstr "Comandă de la distanță"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14681,13 +14794,13 @@ msgstr "Comandă de la distanță"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14697,8 +14810,8 @@ msgstr "Comandă de la distanță"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14775,8 +14888,8 @@ msgstr "Comandă de la distanță"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Șterge"
 
@@ -14816,7 +14929,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14845,7 +14958,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14853,7 +14966,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Înlocuire"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Înlocuiește dependențele"
 
@@ -14960,7 +15073,7 @@ msgstr "Coduri de stare necesare"
 msgid "Required string"
 msgstr "Șir necesar"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Resetează"
@@ -14994,7 +15107,7 @@ msgstr "Confirmare de resetare"
 msgid "Reset defaults"
 msgstr "Resetează implicite"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Rezolvat"
 
@@ -15192,8 +15305,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15251,12 +15364,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Rusă (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15267,10 +15380,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15483,7 +15594,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Sâm"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sâmbătă"
 
@@ -15661,7 +15772,7 @@ msgstr "Script actualizat"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Scripturi"
 
@@ -15731,8 +15842,8 @@ msgid "Security name"
 msgstr "Nume securitate"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15740,7 +15851,7 @@ msgstr "Nume securitate"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Selectează"
 
@@ -15776,19 +15887,19 @@ msgstr "Elementele selectate"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15813,7 +15924,7 @@ msgstr "Trimite doar la"
 msgid "Send to"
 msgstr "Trimite la"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15846,7 +15957,7 @@ msgstr "Depărțit"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Septembrie"
 
@@ -15878,34 +15989,29 @@ msgid "Server time"
 msgstr "Timp server"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Serviciu"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15913,7 +16019,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Serviciu creat"
 
@@ -15943,7 +16049,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Timpul de pornire al serviciului trebuie sa fie mai puțin decât serviciul de sfârșit."
 
@@ -15959,11 +16065,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Timpuri de serviciu"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tip de serviciu"
 
@@ -15972,7 +16078,7 @@ msgstr "Tip de serviciu"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Serviciu actualizat"
 
@@ -15981,16 +16087,16 @@ msgstr "Serviciu actualizat"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Servicii"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Servicii formează o dependență circulară."
 
@@ -16002,9 +16108,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sesiune terminată, relogare, va rog."
 
@@ -16028,10 +16134,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16072,7 +16186,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16118,7 +16232,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16209,7 +16323,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16260,7 +16374,7 @@ msgstr "Arată avertizare dacă serverul Zabbix este căzut"
 msgid "Show working time"
 msgstr "Arată timpul de lucru"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Afișat"
 
@@ -16369,7 +16483,7 @@ msgstr "Copiere sărită a graficului \"%1$s\" la server \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovacă (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Amânare"
 
@@ -16415,7 +16529,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Ordinea sortării package list (0->999)"
 
@@ -16489,7 +16603,7 @@ msgstr "Începe la"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16537,12 +16651,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16553,17 +16669,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16587,13 +16710,10 @@ msgstr ""
 msgid "Status"
 msgstr "Stare"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Calcul stare"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritm calcul stare"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16624,6 +16744,10 @@ msgstr "Doar stare"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16655,8 +16779,8 @@ msgstr "Pas cu nume \"%1$s\" există deja."
 msgid "Steps"
 msgstr "Pași"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Stop"
 
@@ -16668,7 +16792,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16700,7 +16824,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16733,7 +16857,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Subhartă"
 
@@ -16749,7 +16873,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Verificare reușită"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16762,7 +16886,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Dum"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Duminică"
 
@@ -16854,12 +16978,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16895,8 +17019,8 @@ msgstr "Tabelul \"%1$s\" nu are un câmp numit \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etichetă"
@@ -16936,14 +17060,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16951,10 +17074,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17118,7 +17241,7 @@ msgstr "Șablon cu același nume vizibil \"%1$s\" există deja."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17405,12 +17528,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Joi"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Joi"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Până când"
 
@@ -17420,13 +17543,13 @@ msgstr "Până când"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17507,7 +17630,7 @@ msgstr "Dată"
 msgid "To"
 msgstr "Către"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Pentru setarea unei interfețe server selectează un singur tip de item pentru toți itemii"
 
@@ -17629,13 +17752,13 @@ msgstr "Tendințe"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17654,7 +17777,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Triggerul \"%1$s\" depinde de trigger \"%2$s\", care nu există."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17741,7 +17864,7 @@ msgstr "Prezentare triggeri"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17810,15 +17933,15 @@ msgstr "Prototipi trigger șters"
 msgid "Trigger prototypes updated"
 msgstr "Prototipi trigger actualizat"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severitate trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17870,7 +17993,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Mar"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Marți"
 
@@ -17883,7 +18006,7 @@ msgstr "Turcă (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Doi itemi (\"%1$s\" și \"%2$s\") nu pot popula un câmp inventar al unui server \"%3$s\", aceasta ar duce la un conflict. "
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17898,15 +18021,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17973,7 +18097,7 @@ msgid "UNKNOWN"
 msgstr "NECUNOSCUT"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17983,7 +18107,7 @@ msgstr "NECUNOSCUT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -18029,7 +18153,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URL-uri"
 
@@ -18077,7 +18201,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18124,7 +18248,8 @@ msgstr "Deblocare utilizatori selectați?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18143,7 +18268,8 @@ msgstr "Unități"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18154,9 +18280,9 @@ msgstr "Unități"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Necunoscut"
@@ -18175,12 +18301,12 @@ msgstr "Eroare necunoscută"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item server necunoscut, nu există asemenea item în serverul selectat"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Server necunoscut, nu există asemenea server prezent în sistem"
 
@@ -18227,7 +18353,7 @@ msgstr "Dezleagă de șablon"
 msgid "Unlink from templates"
 msgstr "Dezleagă de șabloane"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Pornire sunet"
 
@@ -18309,27 +18435,28 @@ msgstr "Sus"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18398,7 +18525,7 @@ msgid "Upper level maps"
 msgstr "Hărți de nivel superior"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Timp de la pornire"
@@ -18447,37 +18574,37 @@ msgstr "Utilizat în acțiuni"
 msgid "User"
 msgstr "Utilizator"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18494,13 +18621,13 @@ msgstr "Utilizator adăugat"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Utilizatorul nu poate să se adauge unui grup dezactivat sau  unui grup cu acces GUI dezactivat."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18526,32 +18653,32 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Grup utilizator"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Grup utilizator \"%1$s\" este utilizat în configurația pentru mesaje de cădere a bazei de date."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Grup utilizator \"%1$s\" folosit în script \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18584,7 +18711,7 @@ msgstr[2] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18592,14 +18719,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Grupuri utilizator"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Utilizatorului nu îi este permis să se șteargă."
 
@@ -18649,7 +18776,7 @@ msgstr[2] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18683,7 +18810,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18705,12 +18832,12 @@ msgstr "Utilizator actualizat"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18755,7 +18882,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19022,23 +19149,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19245,8 +19372,8 @@ msgstr "Aliniere verticală"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnameză (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19273,7 +19400,12 @@ msgstr "Nume vizibil"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Numele vizibil nu poate fi gol dacă lipsește numele serverului."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19290,11 +19422,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Ne pare rău, a fost atins numărul maxim posibil de elemente de amintit. "
 
@@ -19310,7 +19442,7 @@ msgstr "Ne pare rău, a fost atins numărul maxim posibil de elemente de amintit
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19381,7 +19513,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mie"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Miercuri"
 
@@ -19392,6 +19524,10 @@ msgstr "Miercuri"
 msgid "Weekly"
 msgstr "Săptămânal"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19409,7 +19545,7 @@ msgstr "Când e activ"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19622,8 +19758,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19665,19 +19801,19 @@ msgstr "Anual"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19745,19 +19881,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nu vă este permis să efectuați această operație."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr " Nu aveți permisiunea să creați utilizatori."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Nu aveți permisiunea să accesați această pagină."
@@ -19878,7 +20010,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19997,7 +20129,6 @@ msgstr "agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20293,9 +20424,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20375,7 +20506,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20422,7 +20553,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "z"
@@ -20621,13 +20752,13 @@ msgstr "setări interne globale"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20675,7 +20806,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20901,12 +21032,12 @@ msgstr "regulă de detecție de nivel inferior"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "l"
@@ -21010,8 +21141,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "ll"
 
@@ -21106,7 +21237,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "nou"
 
@@ -21173,7 +21304,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "al"
@@ -21241,7 +21372,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21368,7 +21499,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "descriere scurtă"
 
@@ -21453,7 +21584,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21463,8 +21594,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21545,7 +21676,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21608,7 +21739,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "scrie aici pentru căutare"
 
@@ -21635,7 +21766,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21729,7 +21860,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21749,7 +21880,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "valoare"
 
@@ -21896,7 +22027,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po
index be40327c3fd..250387974c0 100644
--- a/ui/locale/ru/LC_MESSAGES/frontend.po
+++ b/ui/locale/ru/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-06-17 14:02+0300\n"
 "Last-Translator: Alexey <dotneft@gmail.com>\n"
 "Language-Team: Zabbix translation team\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d день"
 msgstr[1] "%1$d дня"
 msgstr[2] "%1$d дней"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] "%1$s сообщений"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] "%1$s из %2$s элемента в состоянии проблем�
 msgstr[1] "%1$s из %2$s элементов в состоянии проблемы"
 msgstr[2] "%1$s из %2$s элементов в состоянии проблемы"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -236,10 +236,10 @@ msgstr[0] "%1$s попытка осталась"
 msgstr[1] "%1$s попытки осталось"
 msgstr[2] "%1$s попыток осталось"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s секунда"
 msgstr[1] "%1$s секунды"
 msgstr[2] "%1$s секунд"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "осталось %1$s символов"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Важность, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, только чтение"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -325,7 +325,7 @@ msgstr "(без прокси)"
 msgid "0 - use default port"
 msgstr "0 - использовать порт по умолчанию"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 или 1"
 
@@ -393,7 +393,7 @@ msgstr "<подменю/подменю/...>"
 msgid "ADD OVERRIDE"
 msgstr "ДОБАВЛЕНИЕ ЗАМЕЩЕНИЯ"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "И"
 
@@ -410,7 +410,7 @@ msgstr "API методы"
 msgid "API token"
 msgstr "API токен"
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr "API токен \"%1$s\" уже существует у userid \"%2$s\"."
@@ -478,40 +478,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Доступ запрещен"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Доступ запрещен!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr "Доступ к API"
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "Доступ к элементам веб-интерфейса"
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr "Доступ к действиям"
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr "Доступ к модулям"
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Подтверждено"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Подтвердить"
 
@@ -519,7 +519,7 @@ msgstr "Подтвердить"
 msgid "Acknowledge problems"
 msgstr "Подтверждение проблем"
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Подтверждено"
@@ -548,20 +548,22 @@ msgstr "Подтвержденные РЕШЕННЫЕ события"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -668,7 +670,7 @@ msgstr "Действие обновлено"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -677,7 +679,7 @@ msgstr "Действие обновлено"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Действия"
@@ -736,8 +738,8 @@ msgstr "Активно до"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -748,7 +750,6 @@ msgstr "Активно до"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -756,11 +757,13 @@ msgstr "Активно до"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -772,15 +775,17 @@ msgstr "Активно до"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -847,7 +852,7 @@ msgstr "Активно до"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Добавить"
 
@@ -855,19 +860,19 @@ msgstr "Добавить"
 msgid "Add (message type limit reached)"
 msgstr "Добавить (достигнуто максимальное количество типов сообщений)"
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Добавить новый виджет"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Добавить элемент потомка"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -884,7 +889,7 @@ msgstr "Добавить узел сети"
 msgid "Add missing"
 msgstr "Добавить отсутствующее"
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Добавить несколько карт"
 
@@ -901,7 +906,11 @@ msgstr "Добавить новый интерфейс"
 msgid "Add new override"
 msgstr "Добавить новое замещение"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -909,7 +918,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr "Добавление комментариев к проблемам"
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -943,7 +952,7 @@ msgstr "Добавить пользователя"
 msgid "Add user group"
 msgstr "Добавить группу пользователей"
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Добавить виджет"
 
@@ -952,12 +961,20 @@ msgstr "Добавить виджет"
 msgid "Added"
 msgstr "Добавлено"
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Добавлено, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Администратор"
@@ -967,6 +984,10 @@ msgstr "Администратор"
 msgid "Administration"
 msgstr "Администрирование"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Расширенные подписи"
@@ -1053,7 +1074,7 @@ msgstr "Выровнять элементы карты"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Все"
 
@@ -1062,8 +1083,8 @@ msgid "All dashboards"
 msgstr "Все панели"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Все группы"
 
@@ -1071,7 +1092,7 @@ msgstr "Все группы"
 msgid "All hosts"
 msgstr "Все узлы сети"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "У всех ссылок должны быть указаны \"Имя\" и \"URL\""
 
@@ -1105,7 +1126,7 @@ msgstr "Все шаблоны"
 msgid "Allow list"
 msgstr "Список разрешений"
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1118,7 +1139,7 @@ msgstr "Разрешить закрывать вручную"
 msgid "Allowed hosts"
 msgstr "Разрешенные хосты"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr "Разрешенные методы"
 
@@ -1136,7 +1157,7 @@ msgstr "Общее количество потребляемой физичес�
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1177,12 +1198,12 @@ msgstr "И/ИЛИ"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1202,15 +1223,15 @@ msgstr "Ошибка приложения."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Применить"
 
@@ -1228,7 +1249,7 @@ msgstr "Близится"
 msgid "Apr"
 msgstr "Апр."
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Апрель"
 
@@ -1256,6 +1277,10 @@ msgstr "Тип области"
 msgid "Arithmetic"
 msgstr "Арифметические"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Как простой текст"
@@ -1308,8 +1333,8 @@ msgstr "Необходимо выбрать по крайней мере оди�
 msgid "At least one action is mandatory."
 msgstr "По крайней мере одно действие обязательно."
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr "Должен существовать, по крайней мере, один активный пользователь с ролью \"%1$s\"."
@@ -1387,7 +1412,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Авг"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Август"
 
@@ -1417,7 +1442,7 @@ msgstr "Аутентификация"
 msgid "Authentication algorithm"
 msgstr "Алгоритм аутентификации"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "Ошибка при аутентификации: %1$s."
@@ -1466,7 +1491,7 @@ msgstr "Авто"
 msgid "Auto-login"
 msgstr "Авто-вход"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Опции авто-вход и авто-выход нельзя активировать вместе."
 
@@ -1476,7 +1501,7 @@ msgstr "Авто-выход"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1661,11 +1686,11 @@ msgstr "Оба пароля должны совпадать."
 msgid "Bottom"
 msgstr "По нижнему краю"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Переместить вперёд"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "На передний план"
 
@@ -1746,7 +1771,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Вычисляемое"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Календарь"
 
@@ -1766,8 +1791,8 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1784,8 +1809,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1815,7 +1840,7 @@ msgstr "Не удалось добавить действие"
 msgid "Cannot add correlation"
 msgstr "Не удалось добавить корреляцию"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr "Не удалось добавить страницу панели: уже добавлено максимальное количество %1$d страниц панелей"
@@ -1826,7 +1851,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Не удалось добавить зависимость от узла сети к шаблону."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1946,7 +1971,7 @@ msgid "Cannot add user"
 msgstr "Не удалось добавить пользователя"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr "Не удалось добавить группу пользователей"
 
@@ -1954,11 +1979,11 @@ msgstr "Не удалось добавить группу пользовател
 msgid "Cannot add web scenario"
 msgstr "Не удалось добавить веб-сценарий"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "Не удалось добавить виджет: не хватает свободного места на ПАНЕЛИ."
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2042,7 +2067,7 @@ msgstr[0] "Не удалось скопировать триггер"
 msgstr[1] "Не удалось скопировать триггеры"
 msgstr[2] "Не удалось скопировать триггеры"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Не удалось скопировать триггер \"%1$s:%2$s\", потому что он содержит несколько узлов сети в выражении."
@@ -2098,7 +2123,7 @@ msgstr[0] "Не удалось удалить API токен"
 msgstr[1] "Не удалось удалить API токены"
 msgstr[2] "Не удалось удалить API токены"
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Невозможно удалить внутреннего пользователя Zabbix \"%1$s\", попробуйте отключить его."
@@ -2551,7 +2576,7 @@ msgstr "Не удалось раскрыть выражение"
 msgid "Cannot execute script."
 msgstr "Не удалось выполнить скрипт."
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Не удалось раскрыть макросы."
 
@@ -2723,7 +2748,7 @@ msgstr[0] "Не удалось загрузить модуль с: %1$s."
 msgstr[1] "Не удалось загрузить модули с: %1$s."
 msgstr[2] "Не удалось загрузить модули с: %1$s."
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2785,7 +2810,7 @@ msgstr "Не удалось прочитать YAML: %1$s."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Не удалось прочитать ответ, проверьте соединение с Zabbix сервером \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Невозможно переименовать гостевого пользователя."
 
@@ -2844,7 +2869,12 @@ msgstr "Невозможно задать поля инвентарных дан
 msgid "Cannot set session cookie."
 msgstr "Не удалось установить cookie сессии."
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr "Поддержка аудио оповещений отсутствует для этого устройства."
 
@@ -3272,6 +3302,7 @@ msgid "Change per second"
 msgstr "Изменение в секунду"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Изменение важности"
 
@@ -3413,7 +3444,7 @@ msgstr "Проверяется производительность UDP серв
 msgid "Checks should be unique."
 msgstr "Проверки должны быть уникальными."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3455,11 +3486,11 @@ msgstr "Очистить историю и динамику изменений"
 msgid "Clear when unlinking"
 msgstr "Очистить при отсоединении"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "Нажмите и переместите до желаемого размера."
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "Нажмите для просмотра или изменения"
 
@@ -3489,7 +3520,7 @@ msgstr "Часы"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Клонировать"
 
@@ -3500,8 +3531,8 @@ msgstr "Клонировать"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Закрыть"
 
@@ -3531,8 +3562,8 @@ msgid "Close problems"
 msgstr "Закрытие проблем"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Свернуть"
 
@@ -3549,7 +3580,7 @@ msgstr "Свернуть боковую панель"
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3617,6 +3648,7 @@ msgstr "Одновременные сессии"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Условие"
 
@@ -3671,7 +3703,7 @@ msgstr "Условия"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Настройка"
 
@@ -3945,7 +3977,7 @@ msgstr "Контактная информация"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3982,8 +4014,8 @@ msgstr "Содержит"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4044,8 +4076,8 @@ msgstr "Координаты"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Копировать"
 
@@ -4178,11 +4210,11 @@ msgstr "Создать корреляцию"
 msgid "Create dashboard"
 msgstr "Создать панель"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "Создать зависимое правило обнаружения"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Создать зависимый элемент данных"
 
@@ -4299,7 +4331,7 @@ msgstr "Создать карту сети"
 msgid "Create media type"
 msgstr "Создать способ оповещения"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Создать новое"
 
@@ -4315,7 +4347,7 @@ msgstr "Создать отчет"
 msgid "Create script"
 msgstr "Создать скрипт"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4323,7 +4355,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Создать шаблон"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Создать триггер"
 
@@ -4544,7 +4576,7 @@ msgstr "Свойства страницы панели"
 msgid "Dashboard properties"
 msgstr "Свойства панели"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Общий доступ к панели"
 
@@ -4574,7 +4606,7 @@ msgstr "Панель с ID \"%1$s\" недоступна."
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Панели"
 
@@ -4744,7 +4776,7 @@ msgstr "День недели"
 msgid "Days"
 msgstr "Дни"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Отладка"
 
@@ -4758,7 +4790,7 @@ msgstr "Режим отладки"
 msgid "Dec"
 msgstr "Дек."
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Декабрь"
 
@@ -4767,13 +4799,17 @@ msgstr "Декабрь"
 msgid "Decimal places"
 msgstr "Число десятичных знаков"
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -4843,8 +4879,8 @@ msgid "Delayed by"
 msgstr "Задерживается на"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4858,7 +4894,7 @@ msgstr "Задерживается на"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4890,8 +4926,8 @@ msgstr "Задерживается на"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Удалить"
 
@@ -4920,7 +4956,7 @@ msgstr "Удалить текущее действие?"
 msgid "Delete current correlation?"
 msgstr "Удалить текущую корреляцию?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Удалить панель?"
 
@@ -4964,7 +5000,7 @@ msgstr "Удалить прототип элементов данных?"
 msgid "Delete item?"
 msgstr "Удалить элемент данных?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Удалить связи между выбранными элементами?"
 
@@ -5020,7 +5056,7 @@ msgstr "Удалить выбранные панели?"
 msgid "Delete selected discovery rules?"
 msgstr "Удалить выбранные правила обнаружения?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Удалить выбранные элементы?"
 
@@ -5121,11 +5157,11 @@ msgstr "Удалить выбранные скрипты?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Удалить выбранные фигуры?"
 
@@ -5141,7 +5177,7 @@ msgstr "Удалить выбранные прототипы триггеров?
 msgid "Delete selected triggers?"
 msgstr "Удалить выбранные триггеры?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Удалить выбранного пользователя?"
 
@@ -5192,7 +5228,7 @@ msgstr "Удалено: Шаблон \"%1$s\"."
 msgid "Delimiter"
 msgstr "Разделитель"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr "Запрещенные методы"
 
@@ -5206,7 +5242,7 @@ msgstr "Запрещено"
 msgid "Deny list"
 msgstr "Список запретов"
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5214,7 +5250,7 @@ msgstr "Список запретов"
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Зависимость"
 
@@ -5222,7 +5258,7 @@ msgstr "Зависимость"
 msgid "Dependent item"
 msgstr "Зависимый элемент данных"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5250,7 +5286,7 @@ msgstr "Состояние развертывания"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5414,7 +5450,7 @@ msgstr "Деактивировать выбранные веб-сценарии?
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5427,14 +5463,14 @@ msgstr "Деактивировать выбранные веб-сценарии?
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5517,7 +5553,7 @@ msgid "Discovery by proxy"
 msgstr "Обнаружение через прокси"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Проверка обнаружения"
 
@@ -5529,7 +5565,7 @@ msgstr "Проверки обнаружения"
 msgid "Discovery list"
 msgstr "Список обнаружений"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Объект обнаружения"
 
@@ -5631,7 +5667,7 @@ msgstr "Правило обнаружения обновлено"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5642,7 +5678,7 @@ msgstr "Правила обнаружения"
 msgid "Discovery rules deleted"
 msgstr "Правила обнаружения удалены"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Состояние обнаружения"
@@ -5682,7 +5718,7 @@ msgstr "Показать стэкируемый график"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Отображено %1$s из %2$s найденных"
@@ -5700,10 +5736,6 @@ msgstr "Опции отображения"
 msgid "Division denominator"
 msgstr "Знаменатель деления"
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Без вычисления"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5718,7 +5750,7 @@ msgstr "Не хранить историю"
 msgid "Do not keep trends"
 msgstr "Не хранить динамику изменений"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Вы хотите заменить условие выражения?"
 
@@ -5774,7 +5806,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недоступен"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr "Загрузить изображение"
 
@@ -5783,7 +5815,7 @@ msgid "Download the configuration file"
 msgstr "Загрузить конфигурационный файл"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Недоступен"
@@ -5859,7 +5891,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Дубликат userid \"%1$s\" в пользователях у карты сети \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5881,7 +5913,7 @@ msgstr "Динамический элемент"
 msgid "Dynamic items"
 msgstr "Динамические элементы данных"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "У каждого URL должно быть уникальное имя. Пожалуйста, удостоверьтесь, что есть только один URL с этим именем"
 
@@ -5889,13 +5921,14 @@ msgstr "У каждого URL должно быть уникальное имя.
 msgid "Each item"
 msgstr "Каждый элемент данных"
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5907,8 +5940,8 @@ msgstr "Каждый элемент данных"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Изменить"
 
@@ -5924,11 +5957,11 @@ msgstr "Изменить карту сети"
 msgid "Edit operation"
 msgstr "Изменить операцию"
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Изменит элемент дерева"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Изменить триггер"
 
@@ -6203,7 +6236,7 @@ msgstr "Активировать трапы"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6225,12 +6258,12 @@ msgstr "Активировать трапы"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6289,7 +6322,7 @@ msgstr "Запись с UUID \"%1$s\" уже существует."
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6313,7 +6346,7 @@ msgstr "Ошибка"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Ошибка в запросе поиска в таблицу \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Сообщение об ошибке"
 
@@ -6352,7 +6385,7 @@ msgstr "Правила корреляции событий"
 msgid "Event details"
 msgstr "Детали события"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Генерация события"
 
@@ -6382,7 +6415,7 @@ msgstr "Имя события"
 msgid "Event tag pair"
 msgstr "Пара тегов событий"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Тип события"
 
@@ -6417,7 +6450,7 @@ msgstr "Исключая выбранные"
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Исключить"
 
@@ -6428,7 +6461,7 @@ msgstr "Исключить"
 msgid "Exclude host groups"
 msgstr "Исключить группы узлов сети"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Выполнить"
 
@@ -6474,7 +6507,7 @@ msgstr "Выполнено"
 msgid "Executed script"
 msgstr "Выполняемый скрипт"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Подтверждение выполнения"
 
@@ -6490,8 +6523,8 @@ msgid "Exists"
 msgstr "Существует"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Раскрыть"
 
@@ -6558,7 +6591,7 @@ msgstr "Экспорт в CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6612,7 +6645,7 @@ msgstr "Выражения"
 msgid "External check"
 msgstr "Внешняя проверка"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
@@ -6636,7 +6669,7 @@ msgid "Failed"
 msgstr "Неудачно"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Ошибка при создании панели"
 
@@ -6645,24 +6678,24 @@ msgstr "Ошибка при создании панели"
 msgid "Failed to parse URL."
 msgstr "Ошибка при разборе URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr "Ошибка при вставке страницы панели."
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr "Ошибка при вставке виджета."
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Ошибка при обновлении панели"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr "Ошибка при обновлении свойств страницы панели."
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr "Ошибка при обновлении свойств панели."
 
@@ -6670,7 +6703,7 @@ msgstr "Ошибка при обновлении свойств панели."
 msgid "Failed to update template."
 msgstr "Ошибка при обновлении шаблона."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr "Ошибка при обновлении свойств виджета."
 
@@ -6694,7 +6727,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Фев."
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Февраль"
 
@@ -6840,8 +6873,8 @@ msgstr "Заполнение"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6919,6 +6952,10 @@ msgstr "Вписать в карту сети"
 msgid "Fixed"
 msgstr "Фиксированное"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6984,14 +7021,14 @@ msgstr "Французский (fr_FR)"
 msgid "Fri"
 msgstr "Пт"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Пятница"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -7009,7 +7046,7 @@ msgstr "URL веб-интерфейса"
 msgid "Frontend access"
 msgstr "Доступ к веб-интерфейсу"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Сообщения в веб-интерфейсе"
 
@@ -7091,7 +7128,7 @@ msgid "Get value from host"
 msgstr "Получить значение с узла сети"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Заданное выражение не является макросом"
 
@@ -7109,7 +7146,7 @@ msgstr "Глобальное значение"
 msgid "Go back to %1$s"
 msgstr "Вернуться к %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Перейти к"
 
@@ -7158,7 +7195,7 @@ msgstr "Градиентная линия"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7320,7 +7357,7 @@ msgstr "График с именем \"%1$s\" уже существует в г�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Графики"
 
@@ -7521,11 +7558,11 @@ msgstr "Помощь"
 msgid "Hexadecimal to decimal"
 msgstr "Шестнадцатеричное в десятичное"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Скрыта"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Скрыть отладку"
 
@@ -7570,14 +7607,14 @@ msgstr "Подсвечивать всю строку"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "История"
 
@@ -7641,7 +7678,7 @@ msgstr "Выравнивание по горизонтали"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7649,8 +7686,7 @@ msgstr "Выравнивание по горизонтали"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7662,7 +7698,7 @@ msgstr "Выравнивание по горизонтали"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7745,7 +7781,7 @@ msgstr[2] "Узлы сети активированы"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7753,7 +7789,7 @@ msgstr[2] "Узлы сети активированы"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Группа узлов сети"
@@ -7784,7 +7820,7 @@ msgstr "Тип подписи к группе узлов сети"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Группа узлов сети с ID \"%1$s\" недоступна."
@@ -7801,7 +7837,7 @@ msgstr "Группа узлов сети с ID \"%1$s\" недоступна."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7840,7 +7876,7 @@ msgstr "Интерфейс узла сети"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7989,7 +8025,7 @@ msgstr "Узел сети с таким же видимым именем \"%1$s\
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8221,14 +8257,68 @@ msgstr "Одинаковые пространства имён (%1$s) испол
 msgid "Identification of the system. Returns string"
 msgstr "Идентификация системы. Возвращает строку"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr "При соответствии фильтру"
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr "Если группы пользователей не указаны, в список рассылки необходимо включить по крайней мере одного пользователя."
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Если вы считаете это сообщение ошибкой, пожалуйста, свяжитесь с вашими администраторами для получения прав доступа."
@@ -8237,12 +8327,16 @@ msgstr "Если вы считаете это сообщение ошибкой,
 msgid "Iframe sandboxing exceptions"
 msgstr "Исключения для атрибута sandbox в iframe"
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Изображение"
 
@@ -8372,7 +8466,7 @@ msgstr "Недоступный прототип элементов данных"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8385,11 +8479,11 @@ msgstr "Недоступная карта сети"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "Недоступный шаблон"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "Недоступный триггер"
 
@@ -8415,7 +8509,7 @@ msgstr "Недоступная группа пользователей"
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Включено"
 
@@ -8433,6 +8527,11 @@ msgstr "Включая подгруппы"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Статистика входящего трафика сетевого интерфейса. Возвращает целое число"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8823,7 +8922,7 @@ msgstr "Некорректный тип условия фильтра для д�
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Использована некорректная функция"
 
@@ -8880,7 +8979,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "В выражении триггера \"%2$s\" указан некорректный ключ элемента данных \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Некорректный тип значений элемента данных"
 
@@ -8911,7 +9010,7 @@ msgstr "Некорректный ID типа оповещений."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Некорректный метод \"%1$s.%2$s\"."
@@ -9051,10 +9150,10 @@ msgstr "Указано некорректное значение ID пользо
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Указано некорректное значение ID группы пользователей у карты сети \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr "Некорректные имя пользователя или пароль или аккаунт временно заблокирован."
@@ -9361,9 +9460,9 @@ msgstr "Некорректное значение для \"%1$s\" поля."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9435,6 +9534,10 @@ msgstr "Использовано некорректное значение в п
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Использовано некорректное значение для состояния прокси \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Индонезийский (id_ID)"
@@ -9446,12 +9549,12 @@ msgstr "Бесконечно"
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9524,7 +9627,7 @@ msgid "Insert"
 msgstr "Вставить"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Вставить выражение"
 
@@ -9632,7 +9735,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9680,7 +9783,7 @@ msgstr "Ошибочная дата."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Ошибочный email адрес \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Ошибочный email адрес у способа оповещения с ID \"%1$s\"."
@@ -9783,8 +9886,8 @@ msgstr "Ошибочные параметры метода."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9988,7 +10091,7 @@ msgstr "Ошибочный период времени."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Инвентаризация"
 
@@ -10182,7 +10285,7 @@ msgstr "Прототипы элементов данных обновлены"
 msgid "Item tags"
 msgstr "Теги элемента данных"
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr "Тип элемента данных не использует интерфейс"
 
@@ -10343,7 +10446,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Янв"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Январь"
 
@@ -10365,7 +10468,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Июл"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Июль"
 
@@ -10373,7 +10476,7 @@ msgstr "Июль"
 msgid "Jun"
 msgstr "Июн"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Июнь"
 
@@ -10407,7 +10510,7 @@ msgstr "Ключ"
 msgid "Key passphrase"
 msgstr "Фраза-пароль ключа"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Ключевое слово"
 
@@ -10477,7 +10580,7 @@ msgstr "Расположение подписи"
 msgid "Language"
 msgstr "Язык"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr "Язык \"%1$s\" не поддерживается."
@@ -10562,11 +10665,11 @@ msgstr "Время последнего использования"
 msgid "Last check"
 msgstr "Последняя проверка"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "График за последний час"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "График за последний месяц"
 
@@ -10604,7 +10707,7 @@ msgstr "Последняя отправка"
 msgid "Last value"
 msgstr "Последнее значение"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "График за последнюю неделю"
 
@@ -10617,11 +10720,11 @@ msgstr "График за последнюю неделю"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Последние данные"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Последние значения"
 
@@ -10732,7 +10835,7 @@ msgid "Link new templates"
 msgstr "Присоединение новых шаблонов"
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10810,12 +10913,12 @@ msgstr "Список объектов экземпляров счётчиков
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr "Список объектов экзепляров счётчиков производительности Windows. Возвращает JSON"
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Список групп пользователей общего доступа"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Список пользователей общего доступа"
@@ -10943,7 +11046,7 @@ msgstr "Правило низкоуровневого обнаружения в
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
@@ -11103,7 +11206,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11132,7 +11235,7 @@ msgstr "Закрыт вручную"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Карта сети"
 
@@ -11171,7 +11274,7 @@ msgstr "Размещение подписи к элементам карты"
 msgid "Map element label type"
 msgstr "Тип подписи к элементам карты"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr "Карта обновлена! Вернуться в список карт?"
 
@@ -11197,7 +11300,7 @@ msgstr "Владелец карты сети не может быть пусты
 msgid "Map shape"
 msgstr "Фигура карты сети"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Ошибка при обновлении карты сети."
 
@@ -11233,7 +11336,7 @@ msgstr "Карты сетей"
 msgid "Mar"
 msgstr "Мрт."
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Март"
 
@@ -11260,7 +11363,7 @@ msgstr "Маска"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11331,10 +11434,10 @@ msgstr "Максимальное количество открытых файл�
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Максимальное количество процессов поддерживаемое ОС. Возвращает целое число"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
-msgstr "Максимально допустимая версия базы данных %1$s."
+msgid "Maximum required %1$s database version is %2$s."
+msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
 #: include/classes/mvc/CController.php:259
@@ -11347,12 +11450,12 @@ msgstr[0] "Максимальный период времени отображе
 msgstr[1] "Максимальный период времени отображения %1$s дня."
 msgstr[2] "Максимальный период времени отображения %1$s дней."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Превышена максимальная длина email адреса у способа оповещения с ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Май"
 
@@ -11362,8 +11465,8 @@ msgid "May"
 msgstr "Май"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Оповещения"
 
@@ -11427,7 +11530,7 @@ msgstr "Успешное тестирование способа оповеще�
 msgid "Media type updated"
 msgstr "Способ оповещений обновлен"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Способ оповещения с ID \"%1$s\" недоступен."
@@ -11500,8 +11603,8 @@ msgstr "Шаблон сообщений"
 msgid "Message templates"
 msgstr "Шаблоны сообщений"
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Время отображения сообщения"
 
@@ -11519,7 +11622,7 @@ msgstr "Сообщение/Команда"
 msgid "Messages"
 msgstr "Сообщения"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Сообщения"
 
@@ -11547,6 +11650,11 @@ msgstr "Мин"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11562,11 +11670,6 @@ msgstr "Минимально требуемый макс. размер загр�
 msgid "Minimum required PHP version is %1$s."
 msgstr "Минимально требуемая версия PHP - %1$s."
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr "Минимально требуемая версия базы данных %1$s."
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11717,7 +11820,7 @@ msgstr "Модули обновлены"
 msgid "Mon"
 msgstr "Пн"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -11757,11 +11860,11 @@ msgstr "Месяц"
 msgid "Monthly"
 msgstr "Ежемесячно"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Найдено больше совпадений..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11777,6 +11880,14 @@ msgstr "Более 10 минут"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Более чем один график с именем \"%1$s\" у узла сети."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11786,11 +11897,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Множественный"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Множественные события ПРОБЛЕМА"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Отключить звук"
 
@@ -11798,6 +11909,18 @@ msgstr "Отключить звук"
 msgid "My"
 msgstr "Моя"
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11892,25 +12015,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12053,6 +12177,10 @@ msgstr "Утилизация сети (совокупность скоросте
 msgid "Never"
 msgstr "Никогда"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12064,7 +12192,7 @@ msgstr "Новое условие"
 msgid "New dashboard"
 msgstr "Новая панель"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Новый элемент"
 
@@ -12088,7 +12216,7 @@ msgstr "Новая операция"
 msgid "New regular expression"
 msgstr "Новое регулярное выражение"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12105,7 +12233,7 @@ msgid "New triggers"
 msgstr "Новые триггера"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr "Следующая страница"
 
@@ -12123,20 +12251,20 @@ msgstr "Далее"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12269,7 +12397,7 @@ msgstr "Без деталей"
 msgid "No discovery rule IDs given."
 msgstr "ID правил обнаружения не указаны."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr "Активированные модули не найдены."
@@ -12331,7 +12459,7 @@ msgstr "Нет изображения"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Интерфейс не найден"
 
@@ -12371,7 +12499,7 @@ msgstr "Макросы не найдены."
 msgid "No maps added."
 msgstr "Карты сети не добавлены."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Совпадения не найдены"
 
@@ -12384,8 +12512,8 @@ msgstr "Новые модули не обнаружены"
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Тип операции не задан для корреляции \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Нет прав доступа в систему."
 
@@ -12397,7 +12525,6 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12405,11 +12532,12 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12527,19 +12655,19 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12548,15 +12676,15 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12583,7 +12711,7 @@ msgstr "Файл публичного ключа не указан."
 msgid "No recipients for action operation message."
 msgstr "Нет получателей сообщения в операции действия."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Не обновлять"
 
@@ -12599,7 +12727,7 @@ msgstr "Цель не выбрана"
 msgid "No target selected."
 msgstr "Цель не выбрана."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12646,7 +12774,7 @@ msgstr "Нет"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12678,15 +12806,15 @@ msgstr "Отображены не все результаты. Пожалуйс�
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "Не все шаблоны присоединены к \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "Нет прав доступа, чтобы задать язык пользователю \"guest\"."
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Не разрешено устанавливать пароль для пользователя \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "Нет прав доступа, чтобы задать тему пользователю \"guest\"."
 
@@ -12718,8 +12846,8 @@ msgstr "Без унаследованных элементов данных"
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Заметка"
 
@@ -12749,7 +12877,7 @@ msgstr "Оповещать всех участников"
 msgid "Nov"
 msgstr "Нбр."
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Ноябрь"
 
@@ -12912,12 +13040,12 @@ msgstr "Системы счисления"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Числовой (с плавающей точкой)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Числовой (целочисленный)"
 
@@ -12932,18 +13060,17 @@ msgstr "Числовой (целое положительное)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12970,7 +13097,7 @@ msgstr "OOB роутер"
 msgid "OOB subnet mask"
 msgstr "OOB маска подсети"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "ИЛИ"
 
@@ -12998,13 +13125,13 @@ msgstr "Окт"
 msgid "Octal to decimal"
 msgstr "Восьмеричное в десятичное"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Октябрь"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Выкл"
 
@@ -13016,7 +13143,7 @@ msgstr "Выкл"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -13035,7 +13162,7 @@ msgstr "Имя старого тега"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Вкл"
 
@@ -13043,7 +13170,7 @@ msgstr "Вкл"
 msgid "On status change triggers blink for"
 msgstr "Мигание триггеров при изменении состояния"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Один раз"
 
@@ -13060,7 +13187,7 @@ msgid "One time only"
 msgstr "Единовременно"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Однократная недоступность"
 
@@ -13072,26 +13199,14 @@ msgstr "Только Супер Администраторы могут созд
 msgid "Only Super Admins can create media types."
 msgstr "Только Супер Администраторы могут создавать способы оповещения."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Только Супер Администраторы могут создавать группы пользователей."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Только Супер Администраторы могут удалять способы оповещения."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Только Супер Администраторы могут удалять группы пользователей."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Только Супер Администраторы могут менять способы оповещения."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Только Супер Администраторы могут обновлять группы пользователей. "
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Только Zabbix агент, SNMPv1, SNMPv2 и SNMPv3 проверки могут быть сделаны уникальными."
@@ -13133,11 +13248,11 @@ msgstr[0] "Только выбранная проблема"
 msgstr[1] "Только выбранные проблемы"
 msgstr[2] "Только выбранные проблемы"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13170,7 +13285,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Информация об операционной системе. Возвращает строку"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr "Операция"
 
@@ -13195,7 +13310,7 @@ msgstr "Операция не имеет группу для функциони�
 msgid "Operation has no template to operate."
 msgstr "Операция не имеет шаблон для функционирования."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13220,27 +13335,27 @@ msgstr "Операции"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Оператор"
 
@@ -13265,7 +13380,7 @@ msgstr "Опции"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13282,8 +13397,8 @@ msgstr "Или"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13330,9 +13445,9 @@ msgstr "Или"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Оригинальное"
 
@@ -13584,7 +13699,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМА"
@@ -13631,7 +13746,7 @@ msgstr "Идентификатор PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK слишком короткий. Минимально %1$s шестнадцатеричных цифр."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr "Страница %1$d"
@@ -13654,13 +13769,15 @@ msgstr "Навигатор"
 msgid "Parameter"
 msgstr "Параметр"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13691,9 +13808,7 @@ msgstr "Родительские элементы данных"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13782,15 +13897,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Вставить"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr "Вставить виджет"
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Вставить без внешних связей"
 
@@ -13864,19 +13983,20 @@ msgid "Periods"
 msgstr "Периоды"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Права доступа"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права доступа могут быть назначены только группам пользователей."
 
@@ -13898,12 +14018,12 @@ msgstr "Алгоритм размещения"
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Воспроизведение звукового сигнала"
 
@@ -13933,7 +14053,7 @@ msgstr "Пожалуйста, включите \"allow_url_fopen\" директ�
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Пожалуйста, укажите имя хоста или IP адрес хоста и номер порта Zabbix сервера, а так же имя инсталляции (опционально)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Пожалуйста, выберите два элемента"
 
@@ -14062,7 +14182,7 @@ msgid "Previous month"
 msgstr "Предыдущий месяц"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
@@ -14120,7 +14240,7 @@ msgstr "Ключевая фраза безопасности"
 msgid "Privacy protocol"
 msgstr "Протокол безопасности"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Приватный"
@@ -14140,12 +14260,12 @@ msgid "Privilege level"
 msgstr "Уровень привилегий"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14175,7 +14295,7 @@ msgstr "Проблема создана"
 msgid "Problem display"
 msgstr "Отображение проблем"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Выражение проблемы"
@@ -14193,7 +14313,7 @@ msgstr "Проблема не подавлена"
 msgid "Problem is suppressed"
 msgstr "Проблема подавлена"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Проблема с"
 
@@ -14206,8 +14326,8 @@ msgstr "Восстановление проблемы"
 msgid "Problem resolved"
 msgstr "Проблема решена"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14220,14 +14340,6 @@ msgstr ""
 msgid "Problem update"
 msgstr "Обновление проблемы"
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Проблема, если все подчиненные имеют проблемы"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Проблема, если хотя бы у одного из подчиненных имеется проблема"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14244,7 +14356,7 @@ msgstr "Проблема, если хотя бы у одного из подчи
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Проблемы"
 
@@ -14278,12 +14390,12 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus в JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Свойства"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14305,7 +14417,7 @@ msgstr "Прокси"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14369,7 +14481,7 @@ msgstr "Имя прокси"
 msgid "Proxy updated"
 msgstr "Прокси обновлен"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Публичный"
@@ -14463,8 +14575,8 @@ msgstr "Чтение"
 msgid "Read only"
 msgstr "Только чтение"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14472,8 +14584,8 @@ msgstr "Только чтение"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14526,7 +14638,7 @@ msgstr "Получатели"
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14534,7 +14646,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Восстановление"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14569,7 +14681,7 @@ msgstr "Прямоугольник"
 msgid "Refresh"
 msgstr "Обновить"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Интервал обновления"
 
@@ -14631,7 +14743,7 @@ msgstr "Регулярные выражения"
 msgid "Related reports"
 msgstr "Связанные отчеты"
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr "Отпустите, чтобы создать виджет."
 
@@ -14663,6 +14775,7 @@ msgstr "Удаленная команда"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14672,7 +14785,7 @@ msgstr "Удаленная команда"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14680,13 +14793,13 @@ msgstr "Удаленная команда"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14696,8 +14809,8 @@ msgstr "Удаленная команда"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14774,8 +14887,8 @@ msgstr "Удаленная команда"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Удалить"
 
@@ -14815,7 +14928,7 @@ msgstr "Удаление, %1$s"
 msgid "Removed"
 msgstr "Удалено"
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14844,7 +14957,7 @@ msgstr "Периодичность"
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14852,7 +14965,7 @@ msgstr "Периодичность"
 msgid "Replace"
 msgstr "Замена"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Заменить зависимости"
 
@@ -14959,7 +15072,7 @@ msgstr "Требуемые коды состояния"
 msgid "Required string"
 msgstr "Требуемая строка"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Сбросить"
@@ -14993,7 +15106,7 @@ msgstr "Сбросить подтверждение"
 msgid "Reset defaults"
 msgstr "Сбросить по умолчанию"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Решено"
 
@@ -15191,8 +15304,8 @@ msgstr "Ось Y справа"
 msgid "Right trim"
 msgstr "Обрезать справа"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr "Роль"
 
@@ -15250,12 +15363,12 @@ msgstr "Выполнение заданной команды на узле се�
 msgid "Russian (ru_RU)"
 msgstr "Русский (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Вс"
@@ -15266,10 +15379,8 @@ msgstr "Настройки SAML"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15482,7 +15593,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Сб"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Суббота"
 
@@ -15659,7 +15770,7 @@ msgstr "Скрипт обновлен"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Скрипты"
 
@@ -15729,8 +15840,8 @@ msgid "Security name"
 msgstr "Имя безопасности"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15738,7 +15849,7 @@ msgstr "Имя безопасности"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Выбрать"
 
@@ -15774,19 +15885,19 @@ msgstr "Выбранные элементы"
 msgid "Selected items only"
 msgstr "Только выбранные элементы данных"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Выбран, %1$s в позиции %2$d из %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Выбран, %1$s, только чтение, в позиции %2$d из %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Переместить назад"
 
@@ -15811,7 +15922,7 @@ msgstr "Отправка только через"
 msgid "Send to"
 msgstr "Отправлять на"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "На задний план"
 
@@ -15844,7 +15955,7 @@ msgstr "Раздельно"
 msgid "Separately"
 msgstr "Раздельно"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Сентябрь"
 
@@ -15876,34 +15987,29 @@ msgid "Server time"
 msgstr "Время на сервере"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Услуга"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15911,7 +16017,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Услуга создана"
 
@@ -15941,7 +16047,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Время начала должно быть меньше чем время окончания."
 
@@ -15957,11 +16063,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Интервалы времени услуги"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Тип сервиса"
 
@@ -15970,7 +16076,7 @@ msgstr "Тип сервиса"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Услуга обновлена"
 
@@ -15979,16 +16085,16 @@ msgstr "Услуга обновлена"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Услуги"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Услуги образуют круговую зависимость."
 
@@ -16000,9 +16106,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr "Ошибка инициализации сессии."
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Сессия завершена, пожалуйста, зайдите повторно в систему."
 
@@ -16026,10 +16132,18 @@ msgstr "Задать дату и время срока действия"
 msgid "Set host inventory mode"
 msgstr "Задать режим инвентарных данных узлов сети"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr "Задать новое значение"
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16070,7 +16184,7 @@ msgstr "Настройки"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16116,7 +16230,7 @@ msgstr "Share"
 msgid "Shared"
 msgstr "Общий доступ"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Общий доступ"
 
@@ -16207,7 +16321,7 @@ msgstr "Отображать боковую панель"
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16258,7 +16372,7 @@ msgstr "Показывать предупреждение, если Zabbix се�
 msgid "Show working time"
 msgstr "Отображать рабочее время"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Отображено"
 
@@ -16367,7 +16481,7 @@ msgstr "Пропущено копирование графика \"%1$s\" в у�
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Заснуть"
 
@@ -16413,7 +16527,7 @@ msgstr "Некоторые данные истории этого элемент
 msgid "Sort entries by"
 msgstr "Сортировка записей по"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Порядок сортировки (0->999)"
 
@@ -16487,7 +16601,7 @@ msgstr "Начинать в"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr "Начать слайд-шоу"
 
@@ -16535,12 +16649,14 @@ msgstr "Статистика и доступность кэша записи в
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16551,17 +16667,24 @@ msgstr "Статистика и доступность кэша записи в
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16585,13 +16708,10 @@ msgstr "Статистика и доступность кэша записи в
 msgid "Status"
 msgstr "Состояние"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Вычисление состояния"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Алгоритм вычисления состояния"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16622,6 +16742,10 @@ msgstr "Только состояние"
 msgid "Status problem"
 msgstr "Состояние проблемы"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16653,8 +16777,8 @@ msgstr "Шаг с именем \"%1$s\" уже существует."
 msgid "Steps"
 msgstr "Шаги"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Остановить"
 
@@ -16666,7 +16790,7 @@ msgstr "Остановка обработки"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr "Остановить слайд-шоу"
 
@@ -16698,7 +16822,7 @@ msgid "Strict"
 msgstr "Строгий"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr "Строка"
 
@@ -16731,7 +16855,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Субъект"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Подкарта"
 
@@ -16747,7 +16871,7 @@ msgstr "Подписки"
 msgid "Success Audit"
 msgstr "Аудит успеха"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "Сообщение об успехе"
 
@@ -16760,7 +16884,7 @@ msgstr "Суммарная статистика входящего и исход
 msgid "Sun"
 msgstr "Вс"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -16852,12 +16976,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Системное время в секундах. Возвращает число"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -16893,8 +17017,8 @@ msgstr "У таблицы \"%1$s\" нет поля с названием \"%2$s\
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Этикетка"
@@ -16934,14 +17058,13 @@ msgstr "Значение тега"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16949,10 +17072,10 @@ msgstr "Значение тега"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17116,7 +17239,7 @@ msgstr "Шаблон с таким же видимым именем \"%1$s\" у�
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17403,12 +17526,12 @@ msgstr "Троттлинг"
 msgid "Thu"
 msgstr "Чт"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Четверг"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "До"
 
@@ -17418,13 +17541,13 @@ msgstr "До"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17505,7 +17628,7 @@ msgstr "Отметка времени"
 msgid "To"
 msgstr "К"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Чтобы задать интерфейс узла сети выберите один тип элемента данных из всех элементов данных"
 
@@ -17627,13 +17750,13 @@ msgstr "Динамика изменений"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Триггер"
 
@@ -17652,7 +17775,7 @@ msgstr "Триггер \"%1$s\" принадлежит шаблонам с ра�
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Триггер \"%1$s\" зависит от триггера \"%2$s\", который не существует."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr "URL триггера"
 
@@ -17739,7 +17862,7 @@ msgstr "Обзор триггеров"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17807,15 +17930,15 @@ msgstr "Прототипы триггеров удалены"
 msgid "Trigger prototypes updated"
 msgstr "Прототипы триггеров обновлены"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Важность триггеров"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Состояние триггера \"ОК\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Состояние триггера \"Проблема\""
 
@@ -17867,7 +17990,7 @@ msgstr "Обрезать"
 msgid "Tue"
 msgstr "Вт"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -17880,7 +18003,7 @@ msgstr "Турецкий (tr_TR)"
 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\" инвентарных данных узла сети, это может привести к конфликту."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "Необходимо выбрать два элемента карты"
 
@@ -17895,15 +18018,16 @@ msgstr "Необходимо выбрать два элемента карты"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17970,7 +18094,7 @@ msgid "UNKNOWN"
 msgstr "НЕИЗВЕСТНО"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17980,7 +18104,7 @@ msgstr "НЕИЗВЕСТНО"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -18026,7 +18150,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL должно быть с обоими полями \"name\" и \"url\" у карты сети \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLы"
 
@@ -18074,7 +18198,7 @@ msgstr "Не удалось загрузить API параметры настр
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Не удалось перезаписать существующий файл конфигурации."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr "Не удалось получить версию базы данных."
 
@@ -18121,7 +18245,8 @@ msgstr "Разблокировать выбранных пользователе
 msgid "Unexpected response for action %1$s."
 msgstr "Неожиданный ответ для действия %1$s."
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18140,7 +18265,8 @@ msgstr "Ед. измерения"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18151,9 +18277,9 @@ msgstr "Ед. измерения"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -18172,12 +18298,12 @@ msgstr "Неизвестная ошибка"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Неизвестный элемент данных узла сети, такого элемента данных нет у выбранного узла сети"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Неизвестный узел сети, такого узла сети нет в системе"
 
@@ -18224,7 +18350,7 @@ msgstr "Отсоединить от шаблона"
 msgid "Unlink from templates"
 msgstr "Отсоединить от шаблонов"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Включить звук"
 
@@ -18306,27 +18432,28 @@ msgstr "Доступен"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18395,7 +18522,7 @@ msgid "Upper level maps"
 msgstr "Карты верхнего уровня"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Доступен"
@@ -18444,37 +18571,37 @@ msgstr "Использование в действиях"
 msgid "User"
 msgstr "Пользователь"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Пользователь \"%1$s\" не может быть без группы пользователей."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "Пользователь \"%1$s\" владелец панели \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Пользователь \"%1$s\" является владельцем \"%2$s\" карты сети."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr "Пользователь \"%1$s\" является владельцем \"%2$s\" отчета."
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr "Пользователь \"%1$s\" является получателем \"%2$s\" отчета."
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "Пользователь \"%1$s\" используется в \"%2$s\" действии."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr "Пользователь \"%1$s\" является пользователем от имени которого создан \"%2$s\" шаблон."
@@ -18491,13 +18618,13 @@ msgstr "Пользователь добавлен"
 msgid "User agent string"
 msgstr "Строка user agent"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Пользователь не может добавить себя в отключенную группу или в группу с отключенным доступом к Веб-интерфейсу."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr "Пользователь не может изменить свою роль."
 
@@ -18523,32 +18650,32 @@ msgstr[2] "Пользователи удалены"
 msgid "User group"
 msgstr "Группа пользователей"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Группа пользователей \"%1$s\" уже существует."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr "Группа пользователей \"%1$s\" является получателем \"%2$s\" отчета."
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Группа пользователей \"%1$s\" используется в \"%2$s\" действии."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Группа пользователей \"%1$s\" используется в настройках отправки сообщений о недоступности базы данных."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Группа пользователей \"%1$s\" используется в скрипте \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr "Группа пользователей добавлена"
 
@@ -18581,7 +18708,7 @@ msgstr[2] "Группы пользователей обновлены"
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Группа пользователей с ID \"%1$s\" недоступна."
@@ -18589,14 +18716,14 @@ msgstr "Группа пользователей с ID \"%1$s\" недоступ�
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Группы пользователей"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Пользователю не разрешается удалять самого себя."
 
@@ -18646,7 +18773,7 @@ msgstr[2] "Роли пользователей удалены"
 msgid "User role updated"
 msgstr "Роль пользователя обновлена"
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr "Роль пользователя с ID \"%1$s\" недоступна."
@@ -18680,7 +18807,7 @@ msgstr "Настройки пользователя"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Общий доступ пользователям имеет отсутствующие параметры: %1$s у карты сети \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18702,12 +18829,12 @@ msgstr "Пользователь обновлен"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Пользователь с ID \"%1$s\" недоступен."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr "Пользователь с именем пользователя \"%1$s\" уже существует."
@@ -18752,7 +18879,7 @@ msgstr "Атрибут имени пользователя"
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19019,23 +19146,23 @@ msgstr "Валидация"
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19242,8 +19369,8 @@ msgstr "Выравнивание по вертикали"
 msgid "Vietnamese (vi_VN)"
 msgstr "Вьетнамский (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr "Просмотр"
@@ -19270,7 +19397,12 @@ msgstr "Видимое имя"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Видимое имя не может быть пустым, если имя узла сети не заполнено."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
@@ -19287,11 +19419,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr "Предупреждающее сообщение"
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Приносим свои извинения, достигнуто максимально возможное количество элементов."
 
@@ -19307,7 +19439,7 @@ msgstr "Приносим свои извинения, достигнуто ма�
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Веб"
 
@@ -19378,7 +19510,7 @@ msgstr "Webhook не содержит параметров."
 msgid "Wed"
 msgstr "Ср"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -19389,6 +19521,10 @@ msgstr "Среда"
 msgid "Weekly"
 msgstr "Еженедельно"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Добро пожаловать"
@@ -19406,7 +19542,7 @@ msgstr "Когда активен"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr "Виджет по X:%3$d, Y:%4$d на странице #%2$d панели \"%1$s\" выходит за границы."
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "Виджет слишком маленький для указанного количества колонок и строк."
 
@@ -19619,8 +19755,8 @@ msgid "YYYY-MM-DD"
 msgstr "ГГГГ-ММ-ДД"
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19662,19 +19798,19 @@ msgstr "Ежегодно"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19742,19 +19878,15 @@ msgstr "Вы не указали цели для глобального скри
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "У вас нет полномочий для выполнения этой операции."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "У вас нет полномочий для создания пользователей."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "У вас нет полномочий для доступа к этой странице."
@@ -19875,7 +20007,7 @@ msgstr "ожидается DNS имя"
 msgid "a boolean is expected"
 msgstr "ожидается логическое"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19994,7 +20126,6 @@ msgstr "агент"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20290,9 +20421,9 @@ msgstr "нельзя изменить"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20372,7 +20503,7 @@ msgstr "закольцованная зависимость не разреше�
 msgid "circular item dependency is not allowed"
 msgstr "закольцованная зависимость элементов данных не разрешена"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20419,7 +20550,7 @@ msgstr "count() - Количество успешно полученных зн�
 msgid "countunique() - The number of unique values"
 msgstr "countunique() - Количество уникальных значений"
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "д"
@@ -20618,13 +20749,13 @@ msgstr "глобальные настройки очистки истории"
 msgid "graph pattern"
 msgstr "шаблон графиков"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "ч"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "чч"
 
@@ -20672,7 +20803,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr "in() - Проверяет равно ли значение одному из перечисленных значений (1 - равно, 0 - в противном случае)"
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "включая подгруппы"
 
@@ -20898,12 +21029,12 @@ msgstr "правило низкоуровневого обнаружения"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr "ltrim() - Удаление указанных символов с начала строки"
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "м"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -21007,8 +21138,8 @@ msgstr "min() - Минимальное значение за период Т"
 msgid "minimum length is %1$s characters"
 msgstr "минимальная длина %1$s символов"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "мм"
 
@@ -21103,7 +21234,7 @@ msgstr ""
 msgid "name"
 msgstr "название"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "новый"
 
@@ -21170,7 +21301,7 @@ msgstr "now() - Количество секунд начиная с Epoch"
 msgid "number"
 msgstr "число"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "из"
@@ -21238,7 +21369,7 @@ msgstr "вывод"
 msgid "path/to/secret"
 msgstr "путь/к/секрету"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr "путь/к/секрету:ключ"
 
@@ -21365,7 +21496,7 @@ msgstr "выбрано"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "краткое описание"
 
@@ -21450,7 +21581,7 @@ msgstr "sum() - Сумма значений за период Т"
 msgid "sumofsquares() - The sum of squares"
 msgstr "sumofsquares() - Сумма квадратов"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "заданная учётная запись не уникальна"
 
@@ -21460,8 +21591,8 @@ msgstr "заданная учётная запись не уникальна"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21542,7 +21673,7 @@ msgstr "ожидается третий параметр"
 msgid "time filter default period exceeds the max period"
 msgstr "период времени фильтра по умолчанию превышает максимальный период"
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "сдвиг времени"
 
@@ -21605,7 +21736,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr "truncate() - Усечение значения до десятичных знаков"
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "начните печатать для поиска"
 
@@ -21632,7 +21763,7 @@ msgstr "неожиданная константа \"%1$s\""
 msgid "unexpected constant value \"%1$s\""
 msgstr "неожиданное значение константы \"%1$s\""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr "неожиданное завершение выражения макроса"
 
@@ -21726,7 +21857,7 @@ msgstr "неподдерживаемый номер версии"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21746,7 +21877,7 @@ msgstr "неподдерживаемый номер версии"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "значение"
 
@@ -21893,7 +22024,7 @@ msgstr "ошибочный тип правила обнаружения"
 msgid "wrong item type"
 msgstr "ошибочный тип элемента данных"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "г"
diff --git a/ui/locale/sk/LC_MESSAGES/frontend.po b/ui/locale/sk/LC_MESSAGES/frontend.po
index 68303f3f3d5..e1a5b4fce71 100644
--- a/ui/locale/sk/LC_MESSAGES/frontend.po
+++ b/ui/locale/sk/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2013-08-25 22:42+0300\n"
 "Last-Translator: Jan <jan.garaj@gmail.com>\n"
 "Language-Team: Zabbix translation team\n"
@@ -96,7 +96,7 @@ msgstr[0] "%1$d dni"
 msgstr[1] "%1$d dní"
 msgstr[2] "%1$d dní"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -188,7 +188,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -204,7 +204,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -237,10 +237,10 @@ msgstr[0] "ostáva %1$s pokus"
 msgstr[1] "ostávajú %1$s pokusy"
 msgstr[2] "ostáva %1$s pokusov"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -248,7 +248,7 @@ msgstr[0] "%1$s sekunda"
 msgstr[1] "%1$s sekundy"
 msgstr[2] "%1$s sekúnd"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -269,13 +269,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -326,7 +326,7 @@ msgstr "(bez proxy)"
 msgid "0 - use default port"
 msgstr "0 - použiť predvolený port"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 alebo 1"
 
@@ -394,7 +394,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "A"
 
@@ -411,7 +411,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -479,40 +479,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Prístup zamietnutý"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Prístup zamietnutý!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Potvrdenie"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Potvrdiť"
 
@@ -520,7 +520,7 @@ msgstr "Potvrdiť"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Potvrdenie"
@@ -549,20 +549,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -669,7 +671,7 @@ msgstr "Akcia aktualizovaná"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -678,7 +680,7 @@ msgstr "Akcia aktualizovaná"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Akcie"
@@ -737,8 +739,8 @@ msgstr "Aktívny do"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -749,7 +751,6 @@ msgstr "Aktívny do"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -757,11 +758,13 @@ msgstr "Aktívny do"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -773,15 +776,17 @@ msgstr "Aktívny do"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -848,7 +853,7 @@ msgstr "Aktívny do"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Pridať"
 
@@ -856,19 +861,19 @@ msgstr "Pridať"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -885,7 +890,7 @@ msgstr "Pridať hosta"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -902,7 +907,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -910,7 +919,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -944,7 +953,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -953,12 +962,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Administrátor"
@@ -968,6 +985,10 @@ msgstr "Administrátor"
 msgid "Administration"
 msgstr "Administrácia"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Rozšírené poznámky"
@@ -1054,7 +1075,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Všetky"
 
@@ -1063,8 +1084,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1072,7 +1093,7 @@ msgstr ""
 msgid "All hosts"
 msgstr "Všetky hosty"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Všetky linky by mali mať zadefinované \"Meno\" a \"URL\""
 
@@ -1106,7 +1127,7 @@ msgstr "Všetky šablóny"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1119,7 +1140,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Povolené hosty"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1137,7 +1158,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1178,12 +1199,12 @@ msgstr "A/Alebo"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1203,15 +1224,15 @@ msgstr "Chyba aplikácie."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Použiť"
 
@@ -1229,7 +1250,7 @@ msgstr "Budúca"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Apríl"
 
@@ -1257,6 +1278,10 @@ msgstr "Typ plochy"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Ako obyčajný text"
@@ -1305,8 +1330,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1384,7 +1409,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "August"
 
@@ -1414,7 +1439,7 @@ msgstr "Autentifikácia"
 msgid "Authentication algorithm"
 msgstr "Autentifikačný algoritmus"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1463,7 +1488,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Automatické prihlásenie"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1473,7 +1498,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1658,11 +1683,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Dole"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1743,7 +1768,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Vypočítaná"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1763,8 +1788,8 @@ msgstr "Callback úroveň"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1781,8 +1806,8 @@ msgstr "Callback úroveň"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -1812,7 +1837,7 @@ msgstr "Nie je možné pridať akciu"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1823,7 +1848,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Šablóna nemôže závisieť na hostovi."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1943,7 +1968,7 @@ msgid "Cannot add user"
 msgstr "Nie je možné pridať používateľa"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1951,11 +1976,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Nie je možné pridať scenár"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2039,7 +2064,7 @@ msgstr[0] "Nie je možné skopírovať spúšťač"
 msgstr[1] "Nie je možné skopírovať spúšťače"
 msgstr[2] "Nie je možné skopírovať spúšťače"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, 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."
@@ -2095,7 +2120,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, 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úť."
@@ -2549,7 +2574,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2721,7 +2746,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2783,7 +2808,7 @@ msgstr ""
 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/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Nie je možné premenovať používateľa guest."
 
@@ -2842,7 +2867,12 @@ msgstr "Nie je možné nastaviť inventárne polia pre zakázaný inventár."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3273,6 +3303,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3414,7 +3445,7 @@ msgstr "Kontroly výkonnosti UDP služby. Vráti 0 - služba je nedostupná, sek
 msgid "Checks should be unique."
 msgstr "Kontroly musia byť jedinečné."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3456,11 +3487,11 @@ msgstr "Vyčistiť históriu a trendy"
 msgid "Clear when unlinking"
 msgstr "Vyčistiť pri odpojení"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3490,7 +3521,7 @@ msgstr "Hodiny"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Klonovať"
 
@@ -3501,8 +3532,8 @@ msgstr "Klonovať"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Zatvoriť"
 
@@ -3532,8 +3563,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Zavrieť"
 
@@ -3550,7 +3581,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3618,6 +3649,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Podmienka"
 
@@ -3672,7 +3704,7 @@ msgstr "Podmienky"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Nastavenie"
 
@@ -3935,7 +3967,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3972,8 +4004,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4034,8 +4066,8 @@ msgstr "Poloha"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Kopírovať"
 
@@ -4168,11 +4200,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4289,7 +4321,7 @@ msgstr "Vytvoriť mapu"
 msgid "Create media type"
 msgstr "Vytvoriť typ média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Vytvoriť nové"
 
@@ -4305,7 +4337,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Vytvoriť skript"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4313,7 +4345,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Vytvoriť šablónu"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Vytvoriť spúšťač"
 
@@ -4534,7 +4566,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4564,7 +4596,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4734,7 +4766,7 @@ msgstr "Deň v týždni"
 msgid "Days"
 msgstr "dní"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Ladenie"
 
@@ -4748,7 +4780,7 @@ msgstr "Ladiaci režim"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "December"
 
@@ -4757,13 +4789,17 @@ msgstr "December"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Predvolený"
 
@@ -4833,8 +4869,8 @@ msgid "Delayed by"
 msgstr "Oneskorené o"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4848,7 +4884,7 @@ msgstr "Oneskorené o"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4880,8 +4916,8 @@ msgstr "Oneskorené o"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Zmazať"
 
@@ -4910,7 +4946,7 @@ msgstr "Zmazať aktuálnu akciu?"
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4954,7 +4990,7 @@ msgstr "Zmazať prototyp položky?"
 msgid "Delete item?"
 msgstr "Zmazať položku?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Zmazať prepojenia medzi označenými elementmi?"
 
@@ -5010,7 +5046,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Zmazať označené zisťovacie pravidlá?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Zmazať označené elementy?"
 
@@ -5111,11 +5147,11 @@ msgstr "Zmazať označené skripty?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5131,7 +5167,7 @@ msgstr "Zmazať označené prototypy spúšťačov?"
 msgid "Delete selected triggers?"
 msgstr "Zmazať označené spúšťače?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Zmazať označeného používateľa?"
 
@@ -5182,7 +5218,7 @@ msgstr "Zmazané: Šablóna \"%1$s\"."
 msgid "Delimiter"
 msgstr "Oddeľovač"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5196,7 +5232,7 @@ msgstr "Zakázať"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5204,7 +5240,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Závislosti"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Podradená závislosť (tento ovplyvňuje)"
 
@@ -5212,7 +5248,7 @@ msgstr "Podradená závislosť (tento ovplyvňuje)"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5240,7 +5276,7 @@ msgstr "Stav nasadenia"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5404,7 +5440,7 @@ msgstr "Zakázať označené scenáre?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5417,14 +5453,14 @@ msgstr "Zakázať označené scenáre?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5507,7 +5543,7 @@ msgid "Discovery by proxy"
 msgstr "Zisťovanie cez proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Kontrola zisťovania"
 
@@ -5519,7 +5555,7 @@ msgstr "Kontroly zisťovania"
 msgid "Discovery list"
 msgstr "Zisťovací zoznam"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objekt zisťovania"
 
@@ -5622,7 +5658,7 @@ msgstr "Zisťovacie pravidlo aktualizované"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5633,7 +5669,7 @@ msgstr "Zisťovacie pravidlá"
 msgid "Discovery rules deleted"
 msgstr "Zisťovacie pravidlá vymazané"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stav zisťovania"
@@ -5673,7 +5709,7 @@ msgstr "Zobraziť skladaný graf"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zobrazujem %1$s z %2$s nájdených"
@@ -5691,10 +5727,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Nevypočítavať"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5709,7 +5741,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Prajete si zameniť podmienkový výraz?"
 
@@ -5765,7 +5797,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nedostupné"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5774,7 +5806,7 @@ msgid "Download the configuration file"
 msgstr "Stiahnuť konfiguračný súbor"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Prestoj"
@@ -5850,7 +5882,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Duplicitné userid \"%1$s\" v používateľoch pre mapu \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5872,7 +5904,7 @@ msgstr "Dynamická položka"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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"
 
@@ -5880,13 +5912,14 @@ msgstr "Každá URL by mala mať jedinečné meno. Prosim uistite sa, že existu
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5898,8 +5931,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Aktualizovať"
 
@@ -5915,11 +5948,11 @@ msgstr "Aktualizovať mapu"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Aktualizovať spúštač"
 
@@ -6194,7 +6227,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6216,12 +6249,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6280,7 +6313,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6304,7 +6337,7 @@ msgstr "Chyba"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Chyba vo vyhľadávacej požiadavke nad tabuľkou \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6343,7 +6376,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Podrobnosti udalosti"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Generovanie udalosti"
 
@@ -6373,7 +6406,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Typ udalosti"
 
@@ -6408,7 +6441,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Vylúčiť"
 
@@ -6419,7 +6452,7 @@ msgstr "Vylúčiť"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Vykonať"
 
@@ -6465,7 +6498,7 @@ msgstr "Vykonané"
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Potvrdenie vykonania"
 
@@ -6481,8 +6514,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Rozbaliť"
 
@@ -6549,7 +6582,7 @@ msgstr "Export do CSV súboru"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6603,7 +6636,7 @@ msgstr "Výrazy"
 msgid "External check"
 msgstr "Externá kontrola"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Pi"
@@ -6627,7 +6660,7 @@ msgid "Failed"
 msgstr "Zlyhanie"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6636,24 +6669,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6661,7 +6694,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Zlyhanie aktualizácie šablóny."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6685,7 +6718,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Február"
 
@@ -6831,8 +6864,8 @@ msgstr "Oblasť výplne"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6910,6 +6943,10 @@ msgstr "Prispôsobiť mape"
 msgid "Fixed"
 msgstr "Pevná"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6975,14 +7012,14 @@ msgstr "Francúzsky (fr_FR)"
 msgid "Fri"
 msgstr "Pi"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Piatok"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -7000,7 +7037,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Frontend prístup"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Povoliť frontend správy"
 
@@ -7082,7 +7119,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Zadaný výraz nie je makro"
 
@@ -7100,7 +7137,7 @@ msgstr "Globálna hodnota"
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Choď na"
 
@@ -7149,7 +7186,7 @@ msgstr "Gradientová čiara"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7311,7 +7348,7 @@ msgstr "Graf s menom \"%1$s\" už existuje v grafoch alebo prototypoch grafov."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafy"
 
@@ -7512,11 +7549,11 @@ msgstr "Pomoc"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Skryť debug"
 
@@ -7561,14 +7598,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "História"
 
@@ -7632,7 +7669,7 @@ msgstr "Vodorovné zarovnanie"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7640,8 +7677,7 @@ msgstr "Vodorovné zarovnanie"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7653,7 +7689,7 @@ msgstr "Vodorovné zarovnanie"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7736,7 +7772,7 @@ msgstr[2] "Hosty povolené"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7744,7 +7780,7 @@ msgstr[2] "Hosty povolené"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Skupina hostov"
@@ -7775,7 +7811,7 @@ msgstr "Typ popisku skupiny"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7792,7 +7828,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7831,7 +7867,7 @@ msgstr "Rozhranie hosta"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7981,7 +8017,7 @@ msgstr "Host s rovnakým zobrazovaným menom \"%1$s\" už existuje."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8213,14 +8249,68 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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 nesprávna, prosím kontaktuje vášho administrátora pre pridelenie potrebných oprávnení."
@@ -8229,12 +8319,16 @@ msgstr "Pokiaľ si myslíte, že táto správa je nesprávna, prosím kontaktuje
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Obrázok"
 
@@ -8364,7 +8458,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8377,11 +8471,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8407,7 +8501,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Vrátane"
 
@@ -8425,6 +8519,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Štatistika príchodzej prevádzky na sieťovom rozhraní. Vráti celé číslo"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8815,7 +8914,7 @@ msgstr "Nesprávny typ filtrovacej podmienky pre akciu \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Nie je použitá platná funkcia"
 
@@ -8872,7 +8971,7 @@ 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\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8903,7 +9002,7 @@ msgstr "Nesprávny typ média ID."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Neplatná metóda \"%1$s.%2$s\"."
@@ -9043,10 +9142,10 @@ msgstr "Nesprávne user ID špecifikované pre mapu \"%1$s\"."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Nesprávne user group ID špecifikované pre mapu \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9353,9 +9452,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9427,6 +9526,10 @@ msgstr "Nesprávna hodnota použitá v PSK poli. Malo by to byť iba párne čí
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Neplatná hodnota použitá pre proxy stav \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonézsky (id_ID)"
@@ -9438,12 +9541,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9516,7 +9619,7 @@ msgid "Insert"
 msgstr "Vložiť"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Vložiť výraz"
 
@@ -9624,7 +9727,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9672,7 +9775,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9775,8 +9878,8 @@ msgstr "Neplatné parametre metódy."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9980,7 +10083,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventár"
 
@@ -10175,7 +10278,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10336,7 +10439,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Január"
 
@@ -10358,7 +10461,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Júl"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Júl"
 
@@ -10366,7 +10469,7 @@ msgstr "Júl"
 msgid "Jun"
 msgstr "Jún"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Jún"
 
@@ -10400,7 +10503,7 @@ msgstr "Kľúč"
 msgid "Key passphrase"
 msgstr "Fráza kľúča"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Kľúčové slovo"
 
@@ -10470,7 +10573,7 @@ msgstr "Umiestnenie popisku"
 msgid "Language"
 msgstr "Jazyk"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10555,11 +10658,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Posledná kontrola"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Graf poslednej hodiny"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Graf posledného mesiaca"
 
@@ -10597,7 +10700,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Posledná hodnota"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Graf posledného týždňa"
 
@@ -10610,11 +10713,11 @@ msgstr "Graf posledného týždňa"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Posledné údaje"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Posledné hodnoty"
 
@@ -10725,7 +10828,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10803,12 +10906,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Zoznam skupinových zdieľaní"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Zoznam používateľských zdieľaní"
@@ -10936,7 +11039,7 @@ msgstr "Nízko úrovňové zisťovacie pravidlo v \"not supported\" stave"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Po"
@@ -11096,7 +11199,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11125,7 +11228,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11164,7 +11267,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11190,7 +11293,7 @@ msgstr "Vlastník mapy nemôže byť prázdny."
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Aktulizácia mapy zlyhala."
 
@@ -11226,7 +11329,7 @@ msgstr "Mapy"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Marec"
 
@@ -11253,7 +11356,7 @@ msgstr "Maska"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11324,9 +11427,9 @@ msgstr "Maximálny počet otvorených súborov podporovaný OS. Vráti celé č�
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Maximálny počet procesov podporovaný OS. Vráti celé číslo"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11340,12 +11443,12 @@ 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í."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Máj"
 
@@ -11355,8 +11458,8 @@ msgid "May"
 msgstr "Máj"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Médiá"
 
@@ -11420,7 +11523,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Typ média aktualizovaný"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11493,8 +11596,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Časový limit správy"
 
@@ -11512,7 +11615,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Správy"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Správy"
 
@@ -11540,6 +11643,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11555,11 +11663,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11710,7 +11813,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Po"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -11750,11 +11853,11 @@ msgstr "Mesiac"
 msgid "Monthly"
 msgstr "Mesačne"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Viacero výberov bolo nájdených..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11770,6 +11873,14 @@ msgstr "Viac ako 10 minút"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Viac ako jeden graf s menom \"%1$s\" pre host."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11779,11 +11890,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Viacnásobné PROBLÉMOVÉ udalosti"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Stlmiť"
 
@@ -11791,6 +11902,18 @@ msgstr "Stlmiť"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11885,25 +12008,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12046,6 +12170,10 @@ msgstr ""
 msgid "Never"
 msgstr "Nikdy"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12057,7 +12185,7 @@ msgstr "Nová podmienka"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Nový element"
 
@@ -12081,7 +12209,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nový regulárny výraz"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12098,7 +12226,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12116,20 +12244,20 @@ msgstr "Ďalší krok"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12262,7 +12390,7 @@ msgstr "Bez podrobností"
 msgid "No discovery rule IDs given."
 msgstr "Žiadne stanovené ID zisťovacích pravidiel."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12324,7 +12452,7 @@ msgstr "Žiadny obrázok"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Nenájdené žiadne rozhranie"
 
@@ -12364,7 +12492,7 @@ msgstr "Nenájdené žiadne makrá."
 msgid "No maps added."
 msgstr "Žiadne mapy neboli pridané."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Žiadne výbery nenájdené"
 
@@ -12377,8 +12505,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Žiadne oprávnenia pre prístup do systému."
 
@@ -12390,7 +12518,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12398,11 +12525,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12520,19 +12648,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12541,15 +12669,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12576,7 +12704,7 @@ msgstr "Žiadny špecifikovaný súbor s verejným kľúčom."
 msgid "No recipients for action operation message."
 msgstr "Žiadny príjemcovia pre operáciu odoslania správy."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12592,7 +12720,7 @@ msgstr "Nie je vybraný cieľ"
 msgid "No target selected."
 msgstr "Nie je vybraný cieľ."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12639,7 +12767,7 @@ msgstr "Žiadna"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12671,15 +12799,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nie je povolené nastavenie hesla pre používateľa \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12711,8 +12839,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nepodporované"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Poznámka"
 
@@ -12742,7 +12870,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "November"
 
@@ -12905,12 +13033,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Číslo (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12925,18 +13053,17 @@ msgstr "Číslo (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12963,7 +13090,7 @@ msgstr "OOB smerovač"
 msgid "OOB subnet mask"
 msgstr "OOB sieťová maska"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "ALEBO"
 
@@ -12991,13 +13118,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Október"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -13009,7 +13136,7 @@ msgstr "Vypnuté"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -13028,7 +13155,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Zapnuté"
 
@@ -13036,7 +13163,7 @@ msgstr "Zapnuté"
 msgid "On status change triggers blink for"
 msgstr "Pri zmena stavu spúšťača blikať po dobu"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Raz"
 
@@ -13053,7 +13180,7 @@ msgid "One time only"
 msgstr "Jednorázovo"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Jednorázový prestoj"
 
@@ -13065,26 +13192,14 @@ msgstr "Len super administrátori môžu vytvoriť skupiny."
 msgid "Only Super Admins can create media types."
 msgstr "Len super administrátori môžu vytvoriť typy médií."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Len super administrátori môžu zmazať typy médií."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Len super administrátori môžu zmazať používateľské skupiny."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Len super administrátori môžu upravovať typy médií."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 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."
@@ -13126,11 +13241,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13163,7 +13278,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informácie o operačnom systéme. Vráti reťazec"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13188,7 +13303,7 @@ msgstr "Operácia nemá skupinu na vykonanie."
 msgid "Operation has no template to operate."
 msgstr "Operácia nemá šablónu na vykonanie."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13213,27 +13328,27 @@ msgstr "Operácie"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operátor"
 
@@ -13258,7 +13373,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13275,8 +13390,8 @@ msgstr "Alebo"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13323,9 +13438,9 @@ msgstr "Alebo"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Originálny"
 
@@ -13577,7 +13692,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLÉM"
@@ -13624,7 +13739,7 @@ msgstr "PSK identita"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK je príliš krátky. Minimum je %1$s hexadecimálnych čísel."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13647,13 +13762,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13684,9 +13801,7 @@ msgstr "Nadradená položka"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13775,15 +13890,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13857,19 +13976,20 @@ msgid "Periods"
 msgstr "Periódy"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Oprávnenia"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 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."
 
@@ -13891,12 +14011,12 @@ msgstr "Algoritmus umiestňovania"
 msgid "Plain text"
 msgstr "Jednoduchý text"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Prehrať"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Prehrávať zvuk"
 
@@ -13926,7 +14046,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Prosím zadajte meno Zabbix hosta alebo jeho IP adresu a číslo portu Zabbix servera. Meno inštalácie je nepovinné."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Označte prosím dva elementy"
 
@@ -14055,7 +14175,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14113,7 +14233,7 @@ msgstr "Fráza utajenia"
 msgid "Privacy protocol"
 msgstr "Protokol utajenia"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Privátny"
@@ -14133,12 +14253,12 @@ msgid "Privilege level"
 msgstr "Úroveň oprávnenia"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14168,7 +14288,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Zobraziť problémy"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14186,7 +14306,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Problém na"
 
@@ -14199,8 +14319,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14213,14 +14333,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problém, ak všetci podriadení majú problém"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problém, ak najmenej jeden podriadený má problém"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14237,7 +14349,7 @@ msgstr "Problém, ak najmenej jeden podriadený má problém"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problémy"
 
@@ -14271,12 +14383,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14298,7 +14410,7 @@ msgstr "Proxy"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14362,7 +14474,7 @@ msgstr "Meno proxy"
 msgid "Proxy updated"
 msgstr "Proxy aktualizovaná"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Verejný"
@@ -14456,8 +14568,8 @@ msgstr "Čítanie"
 msgid "Read only"
 msgstr "Len čítanie"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14465,8 +14577,8 @@ msgstr "Len na čítanie"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14519,7 +14631,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14527,7 +14639,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Zotavenie"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14562,7 +14674,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14624,7 +14736,7 @@ msgstr "Regulárne výrazy"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14656,6 +14768,7 @@ msgstr "Vzdialený príkaz"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14665,7 +14778,7 @@ msgstr "Vzdialený príkaz"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14673,13 +14786,13 @@ msgstr "Vzdialený príkaz"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14689,8 +14802,8 @@ msgstr "Vzdialený príkaz"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14767,8 +14880,8 @@ msgstr "Vzdialený príkaz"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Zmazať"
 
@@ -14808,7 +14921,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14837,7 +14950,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14845,7 +14958,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Nahradiť"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Nahradiť závislosti"
 
@@ -14952,7 +15065,7 @@ msgstr "Požadovaný stavový kód"
 msgid "Required string"
 msgstr "Požadovaný reťazec"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reset"
@@ -14986,7 +15099,7 @@ msgstr "Potvrdenie obnovenia"
 msgid "Reset defaults"
 msgstr "Obnoviť pôvodné hodnoty"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Vyriešené"
 
@@ -15184,8 +15297,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15243,12 +15356,12 @@ msgstr "Spustí špecifikovaný príkaz na hostovi. Vráti text ako výsledok sp
 msgid "Russian (ru_RU)"
 msgstr "Rusky (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "So"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Ne"
@@ -15259,10 +15372,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15475,7 +15586,7 @@ msgstr ""
 msgid "Sat"
 msgstr "So"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -15652,7 +15763,7 @@ msgstr "Skript aktualizovaný"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Skripty"
 
@@ -15722,8 +15833,8 @@ msgid "Security name"
 msgstr "Bezpečnostné meno"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15731,7 +15842,7 @@ msgstr "Bezpečnostné meno"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Vybrať"
 
@@ -15767,19 +15878,19 @@ msgstr "Označené elementy"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15804,7 +15915,7 @@ msgstr "Poslať len na"
 msgid "Send to"
 msgstr "Posielať na"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15837,7 +15948,7 @@ msgstr "Oddelene"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "September"
 
@@ -15869,34 +15980,29 @@ msgid "Server time"
 msgstr "Čas na servery"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Služba"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15904,7 +16010,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Služba vytvorená"
 
@@ -15934,7 +16040,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Čas štartu služby musi byť menší ako jej koniec."
 
@@ -15950,11 +16056,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Časy služby"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Typ služby"
 
@@ -15963,7 +16069,7 @@ msgstr "Typ služby"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Služba aktualizovaná"
 
@@ -15972,16 +16078,16 @@ msgstr "Služba aktualizovaná"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Služby"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Služby tvoria kruhovú závislosť."
 
@@ -15993,9 +16099,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Sedenie ukončené, prosím prihláste sa znovu."
 
@@ -16019,10 +16125,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Nastaviť hostov mód inventára"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16063,7 +16177,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16109,7 +16223,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Zdieľanie"
 
@@ -16200,7 +16314,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16251,7 +16365,7 @@ msgstr "Zobraziť varovanie ak je Zabbix server vypnutý"
 msgid "Show working time"
 msgstr "Zobraziť pracovný čas"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Zobraz"
 
@@ -16360,7 +16474,7 @@ msgstr "Preskočené kopírovanie grafu \"%1$s\" na host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovensky (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Odložiť"
 
@@ -16406,7 +16520,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Zoradiť záznamy podľa"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Radenie (0->999)"
 
@@ -16480,7 +16594,7 @@ msgstr "Začiatok v"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16528,12 +16642,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16544,17 +16660,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16578,13 +16701,10 @@ msgstr ""
 msgid "Status"
 msgstr "Stav"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Výpočet stavu"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritmus výpočtu stavu"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16615,6 +16735,10 @@ msgstr "Len stav"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16646,8 +16770,8 @@ msgstr "Krok s menom \"%1$s\" už existuje."
 msgid "Steps"
 msgstr "Kroky"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Zastaviť"
 
@@ -16659,7 +16783,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16691,7 +16815,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16724,7 +16848,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Subjekt"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Podmapa"
 
@@ -16740,7 +16864,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Audit úspešný"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16753,7 +16877,7 @@ msgstr "Suma príchodzej a odchodzej prevádzky na sieťovom rozhraní. Vráti c
 msgid "Sun"
 msgstr "Ne"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -16845,12 +16969,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Doba prevádzky v sekundách. Vráti celé číslo"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Št"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Št"
@@ -16886,8 +17010,8 @@ msgstr "Tabuľka \"%1$s\" neobsahuje pole s menom \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Označenie"
@@ -16927,14 +17051,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16942,10 +17065,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17109,7 +17232,7 @@ msgstr "Šablóna s rovnakým viditeľným menom \"%1$s\" už existuje."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17396,12 +17519,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Št"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Do"
 
@@ -17411,13 +17534,13 @@ msgstr "Do"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17498,7 +17621,7 @@ msgstr "Časová značka"
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 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"
 
@@ -17620,13 +17743,13 @@ msgstr "Trendy"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Spúšťač"
 
@@ -17645,7 +17768,7 @@ msgstr ""
 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."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17732,7 +17855,7 @@ msgstr "Prehľad spúšťačov"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17801,15 +17924,15 @@ msgstr "Prototypy spúšťačov zmazané"
 msgid "Trigger prototypes updated"
 msgstr "Prototypy spúšťačov aktualizované"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Závažnosť spúšťača"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "\"OK\" status spúšťača"
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "\"Problém\" status spúšťača"
 
@@ -17861,7 +17984,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Ut"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -17874,7 +17997,7 @@ msgstr "Turecky (tr_TR)"
 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."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17889,15 +18012,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17964,7 +18088,7 @@ msgid "UNKNOWN"
 msgstr "NEZNÁMY"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17974,7 +18098,7 @@ msgstr "NEZNÁMY"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -18020,7 +18144,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL musí mať \"meno\" a \"url\" v mape \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLky"
 
@@ -18068,7 +18192,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Nie je možné prepísať existujúci konfiguračný súbor."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18115,7 +18239,8 @@ msgstr "Odblokovať označených používateľov?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18134,7 +18259,8 @@ msgstr "Jednotky"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18145,9 +18271,9 @@ msgstr "Jednotky"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Neznámy"
@@ -18166,12 +18292,12 @@ msgstr "Neznáma chyba"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Neznáme položky hosta, nenájdené položky na označenom hostovi"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Neznámy host, nie je prítomný v systéme"
 
@@ -18218,7 +18344,7 @@ msgstr "Odpojiť od šablóny"
 msgid "Unlink from templates"
 msgstr "Odpojiť od šablón"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Povoliť zvuky"
 
@@ -18300,27 +18426,28 @@ msgstr "Dostupný"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18389,7 +18516,7 @@ msgid "Upper level maps"
 msgstr "Mapa najvyššej úrovne"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Doba prevádzky"
@@ -18438,37 +18565,37 @@ msgstr "Používané v akciách"
 msgid "User"
 msgstr "Používateľ"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Používateľ \"%1$s\" je vlastníkom mapy \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18485,13 +18612,13 @@ msgstr "Používateľ pridaný"
 msgid "User agent string"
 msgstr "User agent reťazec"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 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."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18517,32 +18644,32 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Používateľská skupina"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Používateľská skupina \"%1$s\" už existuje."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, 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."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, 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\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18575,7 +18702,7 @@ msgstr[2] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18583,14 +18710,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Používateľské skupiny"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Používateľ nemá dovolené zmazať sám seba."
 
@@ -18640,7 +18767,7 @@ msgstr[2] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18674,7 +18801,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Používateľské zdieľanie je chýbajúci parameter: %1$s pre obrazovku \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18696,12 +18823,12 @@ msgstr "Používateľ aktualizovaný"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18746,7 +18873,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19013,23 +19140,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19236,8 +19363,8 @@ msgstr "Vertikálne zarovnanie"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamsky (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19264,7 +19391,12 @@ msgstr "Zobrazované meno"
 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:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "St"
@@ -19281,11 +19413,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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ý."
 
@@ -19301,7 +19433,7 @@ msgstr "Je nám ľúto, maximálný počet elementov na zapamätanie bol už dos
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19372,7 +19504,7 @@ msgstr ""
 msgid "Wed"
 msgstr "St"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -19383,6 +19515,10 @@ msgstr "Streda"
 msgid "Weekly"
 msgstr "Týždenne"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Vitajte"
@@ -19400,7 +19536,7 @@ msgstr "Iba v dňoch/časoch"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19613,8 +19749,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19656,19 +19792,19 @@ msgstr "Ročne"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19736,19 +19872,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nemáte oprávnenie na vykonanie tejto operácie."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Nemáte oprávnenia na vytváranie používateľov."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Nemáte oprávnenia k prístupu k tejto stránke."
@@ -19869,7 +20001,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19988,7 +20120,6 @@ msgstr "agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20284,9 +20415,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20366,7 +20497,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20413,7 +20544,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20612,13 +20743,13 @@ msgstr "globálne nastavenia údržby"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20666,7 +20797,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20892,12 +21023,12 @@ msgstr "nízko úrovňové zisťovacie pravidlo"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21001,8 +21132,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -21097,7 +21228,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "nový"
 
@@ -21164,7 +21295,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "z"
@@ -21232,7 +21363,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21359,7 +21490,7 @@ msgstr "označené"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "krátky popis"
 
@@ -21444,7 +21575,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21454,8 +21585,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21536,7 +21667,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21599,7 +21730,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "Vyhľadávanie"
 
@@ -21626,7 +21757,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21720,7 +21851,7 @@ msgstr "nepodporované číslo verzie"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21740,7 +21871,7 @@ msgstr "nepodporované číslo verzie"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "hodnota"
 
@@ -21887,7 +22018,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "r"
diff --git a/ui/locale/sv/LC_MESSAGES/frontend.po b/ui/locale/sv/LC_MESSAGES/frontend.po
index 93eb0ab52e9..a8bafe23b3a 100644
--- a/ui/locale/sv/LC_MESSAGES/frontend.po
+++ b/ui/locale/sv/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -308,7 +308,7 @@ msgstr ""
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr ""
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -458,40 +458,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr ""
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Bekräfta"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Bekräfta"
 
@@ -499,7 +499,7 @@ msgstr "Bekräfta"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bekräftade"
@@ -528,20 +528,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -646,7 +648,7 @@ msgstr "Åtgärd uppdaterad"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -655,7 +657,7 @@ msgstr "Åtgärd uppdaterad"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Åtgärder"
@@ -714,8 +716,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -726,7 +728,6 @@ msgstr ""
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -734,11 +735,13 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -750,15 +753,17 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -825,7 +830,7 @@ msgstr ""
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Lägg till"
 
@@ -833,19 +838,19 @@ msgstr "Lägg till"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -862,7 +867,7 @@ msgstr ""
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -879,7 +884,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -887,7 +896,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -921,7 +930,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -930,12 +939,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr ""
@@ -945,6 +962,10 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr ""
@@ -1031,7 +1052,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr ""
 
@@ -1040,8 +1061,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1049,7 +1070,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1083,7 +1104,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1096,7 +1117,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "Tillåtna värdar"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1114,7 +1135,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1155,12 +1176,12 @@ msgstr ""
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1180,15 +1201,15 @@ msgstr ""
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr ""
 
@@ -1206,7 +1227,7 @@ msgstr ""
 msgid "Apr"
 msgstr ""
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr ""
 
@@ -1234,6 +1255,10 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Som ren text"
@@ -1282,8 +1307,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1361,7 +1386,7 @@ msgstr ""
 msgid "Aug"
 msgstr ""
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr ""
 
@@ -1391,7 +1416,7 @@ msgstr ""
 msgid "Authentication algorithm"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1440,7 +1465,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1450,7 +1475,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1635,11 +1660,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Nederkant"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1720,7 +1745,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Beräknade"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1740,8 +1765,8 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1758,8 +1783,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1789,7 +1814,7 @@ msgstr "Kan inte lägga till åtgärd"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1800,7 +1825,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
@@ -1919,7 +1944,7 @@ msgid "Cannot add user"
 msgstr "Kan inte lägga till användare"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1927,11 +1952,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2012,7 +2037,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
@@ -2067,7 +2092,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
@@ -2483,7 +2508,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2653,7 +2678,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2715,7 +2740,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2774,7 +2799,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3196,6 +3226,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3337,7 +3368,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3379,11 +3410,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3413,7 +3444,7 @@ msgstr "Klocka"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr ""
 
@@ -3424,8 +3455,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr ""
 
@@ -3455,8 +3486,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3473,7 +3504,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3541,6 +3572,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Villkor"
 
@@ -3595,7 +3627,7 @@ msgstr "Villkor"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -3858,7 +3890,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3895,8 +3927,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3957,8 +3989,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr ""
 
@@ -4088,11 +4120,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4209,7 +4241,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4225,7 +4257,7 @@ msgstr ""
 msgid "Create script"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4233,7 +4265,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr ""
 
@@ -4453,7 +4485,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4483,7 +4515,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4653,7 +4685,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr ""
 
@@ -4667,7 +4699,7 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr ""
 
@@ -4676,13 +4708,17 @@ msgstr ""
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Standard"
 
@@ -4752,8 +4788,8 @@ msgid "Delayed by"
 msgstr ""
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4767,7 +4803,7 @@ msgstr ""
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4799,8 +4835,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -4829,7 +4865,7 @@ msgstr ""
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4873,7 +4909,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4929,7 +4965,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5030,11 +5066,11 @@ msgstr ""
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5050,7 +5086,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5101,7 +5137,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5115,7 +5151,7 @@ msgstr ""
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5123,7 +5159,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr ""
 
@@ -5131,7 +5167,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5159,7 +5195,7 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5323,7 +5359,7 @@ msgstr ""
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5336,14 +5372,14 @@ msgstr ""
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5426,7 +5462,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5438,7 +5474,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5537,7 +5573,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5548,7 +5584,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5588,7 +5624,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5606,10 +5642,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Beräkna inte"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5624,7 +5656,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5680,7 +5712,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5689,7 +5721,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr ""
@@ -5765,7 +5797,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5787,7 +5819,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5795,13 +5827,14 @@ msgstr ""
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5813,8 +5846,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Redigera"
 
@@ -5830,11 +5863,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr ""
 
@@ -6109,7 +6142,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6131,12 +6164,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6195,7 +6228,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6219,7 +6252,7 @@ msgstr "Fel"
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6258,7 +6291,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr ""
 
@@ -6288,7 +6321,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6322,7 +6355,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr ""
 
@@ -6333,7 +6366,7 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr ""
 
@@ -6379,7 +6412,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6395,8 +6428,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6463,7 +6496,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6517,7 +6550,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6541,7 +6574,7 @@ msgid "Failed"
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6550,24 +6583,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6575,7 +6608,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6599,7 +6632,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr ""
 
@@ -6745,8 +6778,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6824,6 +6857,10 @@ msgstr ""
 msgid "Fixed"
 msgstr "Fast"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6889,14 +6926,14 @@ msgstr "Franska (fr_FR)"
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr ""
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6914,7 +6951,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr ""
 
@@ -6996,7 +7033,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr ""
 
@@ -7014,7 +7051,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr ""
 
@@ -7063,7 +7100,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7224,7 +7261,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Diagram"
 
@@ -7425,11 +7462,11 @@ msgstr "Hjälp"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7474,14 +7511,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Historik"
 
@@ -7545,7 +7582,7 @@ msgstr "Horisontell justering"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7553,8 +7590,7 @@ msgstr "Horisontell justering"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7566,7 +7602,7 @@ msgstr "Horisontell justering"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7646,7 +7682,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7654,7 +7690,7 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Värdgrupp"
@@ -7685,7 +7721,7 @@ msgstr ""
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7702,7 +7738,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7741,7 +7777,7 @@ msgstr ""
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7889,7 +7925,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8121,14 +8157,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
@@ -8137,12 +8225,16 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Bild"
 
@@ -8272,7 +8364,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8285,11 +8377,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8315,7 +8407,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr ""
 
@@ -8333,6 +8425,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8723,7 +8820,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr ""
 
@@ -8780,7 +8877,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8811,7 +8908,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8951,10 +9048,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9261,9 +9358,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9335,6 +9432,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr ""
@@ -9346,12 +9447,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9424,7 +9525,7 @@ msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9532,7 +9633,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9580,7 +9681,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9683,8 +9784,8 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9888,7 +9989,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Inventarier"
 
@@ -10078,7 +10179,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10239,7 +10340,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr ""
 
@@ -10261,7 +10362,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr ""
 
@@ -10269,7 +10370,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr ""
 
@@ -10303,7 +10404,7 @@ msgstr "Nyckel"
 msgid "Key passphrase"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr ""
 
@@ -10373,7 +10474,7 @@ msgstr "Etikettposition"
 msgid "Language"
 msgstr "Språk"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10452,11 +10553,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Senaste kontroll"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Diagram för senaste timmen"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr ""
 
@@ -10494,7 +10595,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Senaste värde"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr ""
 
@@ -10507,11 +10608,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Senaste data"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr ""
 
@@ -10622,7 +10723,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10700,12 +10801,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10833,7 +10934,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10993,7 +11094,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11022,7 +11123,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Karta"
 
@@ -11061,7 +11162,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11087,7 +11188,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11123,7 +11224,7 @@ msgstr "Kartor"
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr ""
 
@@ -11150,7 +11251,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11221,9 +11322,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11236,12 +11337,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr ""
 
@@ -11251,8 +11352,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11313,7 +11414,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Mediatyp uppdaterad"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11386,8 +11487,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr ""
 
@@ -11405,7 +11506,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr ""
 
@@ -11433,6 +11534,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11448,11 +11554,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11598,7 +11699,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr ""
 
@@ -11638,11 +11739,11 @@ msgstr "Månad"
 msgid "Monthly"
 msgstr "Månatligen"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11658,6 +11759,14 @@ msgstr ""
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr ""
@@ -11667,11 +11776,11 @@ msgstr ""
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr ""
 
@@ -11679,6 +11788,18 @@ msgstr ""
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr ""
@@ -11773,25 +11894,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11934,6 +12056,10 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11945,7 +12071,7 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr ""
 
@@ -11969,7 +12095,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11986,7 +12112,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12004,20 +12130,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12150,7 +12276,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12212,7 +12338,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr ""
 
@@ -12252,7 +12378,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12265,8 +12391,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr ""
 
@@ -12278,7 +12404,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12286,11 +12411,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12408,19 +12534,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12429,15 +12555,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12464,7 +12590,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12480,7 +12606,7 @@ msgstr ""
 msgid "No target selected."
 msgstr ""
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12527,7 +12653,7 @@ msgstr "Ingen"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12559,15 +12685,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12599,8 +12725,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Stöds inte"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
 
@@ -12630,7 +12756,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr ""
 
@@ -12793,12 +12919,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Numerisk (flyttal)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12813,18 +12939,17 @@ msgstr "Numerisk (heltal 64-bit)"
 msgid "OEM"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12851,7 +12976,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr ""
 
@@ -12879,13 +13004,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "AV"
 
@@ -12897,7 +13022,7 @@ msgstr "AV"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12916,7 +13041,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "P"
 
@@ -12924,7 +13049,7 @@ msgstr "P"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr ""
 
@@ -12941,7 +13066,7 @@ msgid "One time only"
 msgstr ""
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
@@ -12953,26 +13078,14 @@ msgstr ""
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13013,11 +13126,11 @@ msgid_plural "Only selected problems"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13050,7 +13163,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13075,7 +13188,7 @@ msgstr ""
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13100,27 +13213,27 @@ msgstr ""
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13145,7 +13258,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13162,8 +13275,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13210,9 +13323,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr ""
 
@@ -13464,7 +13577,7 @@ msgstr ""
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr ""
@@ -13511,7 +13624,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13534,13 +13647,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13571,9 +13686,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13662,15 +13775,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13744,19 +13861,20 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13778,12 +13896,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Ren text"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr ""
 
@@ -13813,7 +13931,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr ""
 
@@ -13942,7 +14060,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14000,7 +14118,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -14020,12 +14138,12 @@ msgid "Privilege level"
 msgstr ""
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14055,7 +14173,7 @@ msgstr ""
 msgid "Problem display"
 msgstr ""
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -14073,7 +14191,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr ""
 
@@ -14086,8 +14204,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14100,14 +14218,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr ""
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr ""
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14124,7 +14234,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problem"
 
@@ -14158,12 +14268,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14185,7 +14295,7 @@ msgstr ""
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14248,7 +14358,7 @@ msgstr ""
 msgid "Proxy updated"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14342,8 +14452,8 @@ msgstr ""
 msgid "Read only"
 msgstr "Endast läs"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14351,8 +14461,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14405,7 +14515,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14413,7 +14523,7 @@ msgstr ""
 msgid "Recovery"
 msgstr ""
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14448,7 +14558,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14509,7 +14619,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14541,6 +14651,7 @@ msgstr "Fjärrkommando"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14550,7 +14661,7 @@ msgstr "Fjärrkommando"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14558,13 +14669,13 @@ msgstr "Fjärrkommando"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14574,8 +14685,8 @@ msgstr "Fjärrkommando"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14652,8 +14763,8 @@ msgstr "Fjärrkommando"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr ""
 
@@ -14693,7 +14804,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14722,7 +14833,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14730,7 +14841,7 @@ msgstr ""
 msgid "Replace"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr ""
 
@@ -14837,7 +14948,7 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
@@ -14871,7 +14982,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr ""
 
@@ -15069,8 +15180,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15128,12 +15239,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Ryska (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15144,10 +15255,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15360,7 +15469,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr ""
 
@@ -15533,7 +15642,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr ""
 
@@ -15603,8 +15712,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15612,7 +15721,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Välj"
 
@@ -15648,19 +15757,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15685,7 +15794,7 @@ msgstr ""
 msgid "Send to"
 msgstr "Skicka till"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15718,7 +15827,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr ""
 
@@ -15750,34 +15859,29 @@ msgid "Server time"
 msgstr "Servertid"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Tjänst"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15785,7 +15889,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15814,7 +15918,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr ""
 
@@ -15830,11 +15934,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -15843,7 +15947,7 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Tjänst uppdaterad"
 
@@ -15852,16 +15956,16 @@ msgstr "Tjänst uppdaterad"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15873,9 +15977,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr ""
 
@@ -15899,10 +16003,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15943,7 +16055,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15989,7 +16101,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -16080,7 +16192,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16131,7 +16243,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Visa arbetstid"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr ""
 
@@ -16240,7 +16352,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr ""
 
@@ -16286,7 +16398,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sorteringsordning (0->999)"
 
@@ -16360,7 +16472,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16408,12 +16520,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16424,17 +16538,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16458,13 +16579,10 @@ msgstr ""
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Statusberäkning"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Algoritm för statusberäkning"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16495,6 +16613,10 @@ msgstr "Endast status"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16526,8 +16648,8 @@ msgstr ""
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr ""
 
@@ -16539,7 +16661,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16571,7 +16693,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16604,7 +16726,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr ""
 
@@ -16620,7 +16742,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16633,7 +16755,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr ""
 
@@ -16725,12 +16847,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16766,8 +16888,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tagg"
@@ -16807,14 +16929,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16822,10 +16943,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16989,7 +17110,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17274,12 +17395,12 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Till"
 
@@ -17289,13 +17410,13 @@ msgstr "Till"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17376,7 +17497,7 @@ msgstr "Tidsstämpel"
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -17498,13 +17619,13 @@ msgstr "Trender"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Utlösare"
 
@@ -17523,7 +17644,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17607,7 +17728,7 @@ msgstr "Översikt över utlösare"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17674,15 +17795,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Allvarlighetsgrad för utlösare"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17734,7 +17855,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr ""
 
@@ -17747,7 +17868,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17762,15 +17883,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17837,7 +17959,7 @@ msgid "UNKNOWN"
 msgstr "OKÄNT"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17847,7 +17969,7 @@ msgstr "OKÄNT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17893,7 +18015,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr ""
 
@@ -17941,7 +18063,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17988,7 +18110,8 @@ msgstr ""
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18007,7 +18130,8 @@ msgstr "Enheter"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18018,9 +18142,9 @@ msgstr "Enheter"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Okänd"
@@ -18039,12 +18163,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -18091,7 +18215,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr ""
 
@@ -18172,27 +18296,28 @@ msgstr ""
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18261,7 +18386,7 @@ msgid "Upper level maps"
 msgstr ""
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr ""
@@ -18310,37 +18435,37 @@ msgstr ""
 msgid "User"
 msgstr "Användare"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18357,13 +18482,13 @@ msgstr "Användare lades till"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18388,32 +18513,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Användargrupp"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18444,7 +18569,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18452,14 +18577,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Användargrupper"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr ""
 
@@ -18508,7 +18633,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18542,7 +18667,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18563,12 +18688,12 @@ msgstr "Användare uppdaterades"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18613,7 +18738,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18880,23 +19005,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19103,8 +19228,8 @@ msgstr "Vertikal justering"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19131,7 +19256,12 @@ msgstr ""
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19148,11 +19278,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19168,7 +19298,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr ""
 
@@ -19237,7 +19367,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr ""
 
@@ -19248,6 +19378,10 @@ msgstr ""
 msgid "Weekly"
 msgstr "Veckovis"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19265,7 +19399,7 @@ msgstr "När aktiv"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19478,8 +19612,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19521,19 +19655,19 @@ msgstr "Årligen"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19601,19 +19735,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr ""
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr ""
@@ -19734,7 +19864,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19853,7 +19983,6 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20149,9 +20278,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20231,7 +20360,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20278,7 +20407,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20477,13 +20606,13 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr ""
 
@@ -20531,7 +20660,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20757,12 +20886,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20866,8 +20995,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr ""
 
@@ -20962,7 +21091,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr ""
 
@@ -21029,7 +21158,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr ""
@@ -21097,7 +21226,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21224,7 +21353,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr ""
 
@@ -21309,7 +21438,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21319,8 +21448,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21401,7 +21530,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21464,7 +21593,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr ""
 
@@ -21491,7 +21620,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21585,7 +21714,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21605,7 +21734,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr ""
 
@@ -21752,7 +21881,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/tr/LC_MESSAGES/frontend.po b/ui/locale/tr/LC_MESSAGES/frontend.po
index b58fefb6716..b2a82a6e90f 100644
--- a/ui/locale/tr/LC_MESSAGES/frontend.po
+++ b/ui/locale/tr/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix translation team\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d gün"
 msgstr[1] "%1$d gün"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -223,17 +223,17 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Kalan deneme sayısı %1$s"
 msgstr[1] "Kalan deneme sayısı %1$s"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s saniye"
 msgstr[1] "%1$s saniye"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -309,7 +309,7 @@ msgstr "(vekil sunucu yok)"
 msgid "0 - use default port"
 msgstr "0 - öntanımlı bağlantı noktasını kullan"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 veya 1"
 
@@ -378,7 +378,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "VE"
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -460,40 +460,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Erişim reddedildi"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Erişim reddedildi!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Onay"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Onay"
 
@@ -501,7 +501,7 @@ msgstr "Onay"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Onaylandı"
@@ -530,20 +530,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -648,7 +650,7 @@ msgstr "Eylem güncellendi"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -657,7 +659,7 @@ msgstr "Eylem güncellendi"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Eylemler"
@@ -716,8 +718,8 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -728,7 +730,6 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -736,11 +737,13 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -752,15 +755,17 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -827,7 +832,7 @@ msgstr "Şu zamana kadar aktif"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Ekle"
 
@@ -835,19 +840,19 @@ msgstr "Ekle"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Yeni bir parçacık ekle"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Alt öğe ekle"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -864,7 +869,7 @@ msgstr "Ana makine ekle"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Birden çok harita ekle"
 
@@ -881,7 +886,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -889,7 +898,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -923,7 +932,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Parçacık ekle"
 
@@ -932,12 +941,20 @@ msgstr "Parçacık ekle"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Yönetici"
@@ -947,6 +964,10 @@ msgstr "Yönetici"
 msgid "Administration"
 msgstr "Yönetim"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Gelişmiş etiket"
@@ -1033,7 +1054,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Tümü"
 
@@ -1042,8 +1063,8 @@ msgid "All dashboards"
 msgstr "Tüm panolar"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Tüm gruplar"
 
@@ -1051,7 +1072,7 @@ msgstr "Tüm gruplar"
 msgid "All hosts"
 msgstr "Tüm ana makineler"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tüm bağlantılarda \"Name\" ve \"URL\" tanımlanmış olmalıdır"
 
@@ -1085,7 +1106,7 @@ msgstr "Tüm şablonlar"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1098,7 +1119,7 @@ msgstr "Elle kapatmaya izin ver"
 msgid "Allowed hosts"
 msgstr "İzin verilen ana makineler"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1116,7 +1137,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1157,12 +1178,12 @@ msgstr "Ve/Veya"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1182,15 +1203,15 @@ msgstr "Uygulama hatası."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Uygula"
 
@@ -1208,7 +1229,7 @@ msgstr "Yaklaşma"
 msgid "Apr"
 msgstr "Nis"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Nisan"
 
@@ -1236,6 +1257,10 @@ msgstr "Alan tipi"
 msgid "Arithmetic"
 msgstr "Aritmetik"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Düz metin olarak"
@@ -1284,8 +1309,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1363,7 +1388,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ağu"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Ağustos"
 
@@ -1393,7 +1418,7 @@ msgstr "Kimlik Doğrulama"
 msgid "Authentication algorithm"
 msgstr "Kimlik doğrulama algoritması"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1442,7 +1467,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "Otomatik giriş"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Otomatik giriş ve otomatik çıkış seçenekleri birlikte etkinleştirilemez."
 
@@ -1452,7 +1477,7 @@ msgstr "Otomatik çıkış"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1637,11 +1662,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Alt"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Öne getir"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Öne getir"
 
@@ -1723,7 +1748,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Hesaplanmış"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1743,8 +1768,8 @@ msgstr "Geri çağırma"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1761,8 +1786,8 @@ msgstr "Geri çağırma"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "İptal"
 
@@ -1792,7 +1817,7 @@ msgstr "Eylem eklenemiyor"
 msgid "Cannot add correlation"
 msgstr "Korelasyon eklenemez"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1803,7 +1828,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Bir ana makineden bir şablona bağımlılık eklenemiyor."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\" tetiğinden var olmayan \"%3$s:%4$s\" tetiğine bağımlılık eklenemiyor."
@@ -1922,7 +1947,7 @@ msgid "Cannot add user"
 msgstr "Kullanıcı eklenemiyor"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1930,11 +1955,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Web senaryosu eklenemiyor"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2015,7 +2040,7 @@ msgid_plural "Cannot copy triggers"
 msgstr[0] "Tetikleyici kopyalanamıyor"
 msgstr[1] "Tetikleyiciler kopyalanamıyor"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "\"%1$s:%2$s\" tetikleyicisi kopyalanamıyor, çünkü ifadede birden çok ana makine var."
@@ -2070,7 +2095,7 @@ msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "\"%1$s\" Zabbix dahili kullanıcısı silinemiyor, bu kullanıcıyı devredışı bırakmayı deneyin."
@@ -2487,7 +2512,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Makrolar genişletilemiyor."
 
@@ -2657,7 +2682,7 @@ msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2719,7 +2744,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Yanıt okunamıyor, Zabbix sunucusu \"%1$s\" ile bağlantıyı kontrol edin."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Misafir kullanıcısı yeniden adlandırılamıyor."
 
@@ -2778,7 +2803,12 @@ msgstr "Devre dışı envanter için envanter alanları tanımlanamaz."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3200,6 +3230,7 @@ msgid "Change per second"
 msgstr "Saniye başına değişim"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3341,7 +3372,7 @@ msgstr "UDP hizmetinin performansını denetler. Servis kesintideyse 0 döner; d
 msgid "Checks should be unique."
 msgstr "Kontroller benzersiz olmalıdır."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3383,11 +3414,11 @@ msgstr "Geçmişi ve eğilimleri temizle"
 msgid "Clear when unlinking"
 msgstr "Bağlantı kaldırılırken temizle"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3417,7 +3448,7 @@ msgstr "Saat"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Klonla"
 
@@ -3428,8 +3459,8 @@ msgstr "Klonla"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Kapat"
 
@@ -3459,8 +3490,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Daralt"
 
@@ -3477,7 +3508,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3545,6 +3576,7 @@ msgstr "Eşzamanlı oturumlar"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Koşul"
 
@@ -3599,7 +3631,7 @@ msgstr "Koşullar"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Yapılandırma"
 
@@ -3862,7 +3894,7 @@ msgstr "Kontak"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3899,8 +3931,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3961,8 +3993,8 @@ msgstr "Koordinatlar"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Kopyala"
 
@@ -4093,11 +4125,11 @@ msgstr "Korelasyon oluştur"
 msgid "Create dashboard"
 msgstr "Pano oluştur"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Bağımlı öğe oluştur"
 
@@ -4214,7 +4246,7 @@ msgstr "Harita oluştur"
 msgid "Create media type"
 msgstr "Medya türü oluştur"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Yeni oluştur"
 
@@ -4230,7 +4262,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Betik oluştur"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4238,7 +4270,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Şablon oluştur"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Tetikleyici oluştur"
 
@@ -4458,7 +4490,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Pano özellikleri"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Pano paylaşımı"
 
@@ -4488,7 +4520,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Panolar"
 
@@ -4658,7 +4690,7 @@ msgstr "Haftanın günü"
 msgid "Days"
 msgstr "Günler"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Hata Ayıklama"
 
@@ -4672,7 +4704,7 @@ msgstr "Hata ayıklama kipi"
 msgid "Dec"
 msgstr "Ara"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Aralık"
 
@@ -4681,13 +4713,17 @@ msgstr "Aralık"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -4757,8 +4793,8 @@ msgid "Delayed by"
 msgstr "Gecikmenin yapıldığı"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4772,7 +4808,7 @@ msgstr "Gecikmenin yapıldığı"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4804,8 +4840,8 @@ msgstr "Gecikmenin yapıldığı"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Sil"
 
@@ -4834,7 +4870,7 @@ msgstr "Şu anki eylem silinsin mi?"
 msgid "Delete current correlation?"
 msgstr "Mevcut korelasyon silinsin mi?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Pano silinsin mi?"
 
@@ -4878,7 +4914,7 @@ msgstr "Öğe prototipi silinsin mi?"
 msgid "Delete item?"
 msgstr "Öğe silinsin mi?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Seçili elemanlar arasındaki bağlar silinsin mi?"
 
@@ -4934,7 +4970,7 @@ msgstr "Seçilen panolar silinsin mi?"
 msgid "Delete selected discovery rules?"
 msgstr "Seçilen keşif kuralları silinsin mi?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Seçilen elemanlar silinsin mi?"
 
@@ -5035,11 +5071,11 @@ msgstr "Seçilen betikler silinsin mi?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Seçilen şekiller silinsin mi?"
 
@@ -5055,7 +5091,7 @@ msgstr "Seçili tetikleyici prototipleri silinsin mi?"
 msgid "Delete selected triggers?"
 msgstr "Seçilen tetikleyiciler silinsin mi?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Seçilen kullanıcı silinsin mi?"
 
@@ -5106,7 +5142,7 @@ msgstr "Silindi: \"%1$s\" şablonu."
 msgid "Delimiter"
 msgstr "Sınırlayıcı"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5120,7 +5156,7 @@ msgstr "Reddet"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5128,7 +5164,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Bağımlılıklar"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Bağımlı"
 
@@ -5136,7 +5172,7 @@ msgstr "Bağımlı"
 msgid "Dependent item"
 msgstr "Bağımlı öğe"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5164,7 +5200,7 @@ msgstr "Dağıtım durumu"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5328,7 +5364,7 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5341,14 +5377,14 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5431,7 +5467,7 @@ msgid "Discovery by proxy"
 msgstr "Vekil sunucu aracılığıyla keşif"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Keşif kontrolü"
 
@@ -5443,7 +5479,7 @@ msgstr "Keşif kontrolleri"
 msgid "Discovery list"
 msgstr "Keşif listesi"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Keşif objesi"
 
@@ -5543,7 +5579,7 @@ msgstr "Keşif kuralı güncellendi"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5554,7 +5590,7 @@ msgstr "Keşif kuralları"
 msgid "Discovery rules deleted"
 msgstr "Keşif kuralları silindi"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Keşif durumu"
@@ -5594,7 +5630,7 @@ msgstr "Yığılmış grafik göster"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "%2$s bulunandan %1$s kadarı gösteriliyor"
@@ -5612,10 +5648,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Hesaplama yapma"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5630,7 +5662,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Koşulsal ifadeyi değiştirmek ister misiniz?"
 
@@ -5686,7 +5718,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Kapalı"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5695,7 +5727,7 @@ msgid "Download the configuration file"
 msgstr "Yapılandırma dosyasını indir"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Aksama Süresi"
@@ -5771,7 +5803,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "\"%2$s\" haritası için kullanıcılarda \"%1$s\" userid'si mükerrer."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5793,7 +5825,7 @@ msgstr "Dinamik öğe"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 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"
 
@@ -5801,13 +5833,14 @@ msgstr "Her URL tekil bir isme sahip olmalıdır. Lütfen URL'in yalnızca bir i
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5819,8 +5852,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Düzenle"
 
@@ -5836,11 +5869,11 @@ msgstr "Haritayı düzenle"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Ağaç öğesini düzenle"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Tetikleyiciyi düzenle"
 
@@ -6115,7 +6148,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6137,12 +6170,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6201,7 +6234,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6225,7 +6258,7 @@ msgstr "Hata"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "\"%1$s\" tablosu için arama isteği hatası."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6264,7 +6297,7 @@ msgstr "Olay korelasyon kuralları"
 msgid "Event details"
 msgstr "Olay detayları"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Olay oluşturma"
 
@@ -6294,7 +6327,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Olay etiket çifti"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Olay tipi"
 
@@ -6328,7 +6361,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Dahil etme"
 
@@ -6339,7 +6372,7 @@ msgstr "Dahil etme"
 msgid "Exclude host groups"
 msgstr "Ana makine gruplarını hariç tut"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Çalıştır"
 
@@ -6385,7 +6418,7 @@ msgstr "Çalıştırılmış"
 msgid "Executed script"
 msgstr "Çalıştırılmış betik"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Çalıştırma onayı"
 
@@ -6401,8 +6434,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Genişlet"
 
@@ -6469,7 +6502,7 @@ msgstr "CSV'e aktar"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6523,7 +6556,7 @@ msgstr "İfadeler"
 msgid "External check"
 msgstr "Harici kontrol"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Cum"
@@ -6547,7 +6580,7 @@ msgid "Failed"
 msgstr "Başarısız"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Pano oluşturma başarısız"
 
@@ -6556,24 +6589,24 @@ msgstr "Pano oluşturma başarısız"
 msgid "Failed to parse URL."
 msgstr "URL ayrıştırılamadı."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Pano güncelleme başarısız"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6581,7 +6614,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Şablon güncellenemedi."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6605,7 +6638,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Şub"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Şubat"
 
@@ -6751,8 +6784,8 @@ msgstr "Dolu bölge"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6830,6 +6863,10 @@ msgstr "Haritaya sığdır"
 msgid "Fixed"
 msgstr "Sabit"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6895,14 +6932,14 @@ msgstr "Fransızca (fr_FR)"
 msgid "Fri"
 msgstr "Cum"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Cuma"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6920,7 +6957,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Önyüz erişimi"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Önyüz mesajlaşması"
 
@@ -7002,7 +7039,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Verilen ifade bir makro değil"
 
@@ -7020,7 +7057,7 @@ msgstr "Genel değer"
 msgid "Go back to %1$s"
 msgstr "Dönüş yap: %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Buraya git"
 
@@ -7069,7 +7106,7 @@ msgstr "Gradyan çizgi"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7230,7 +7267,7 @@ msgstr "\"%1$s\" adlı grafik, grafikler veya grafik prototipleri içinde haliha
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Grafikler"
 
@@ -7430,11 +7467,11 @@ msgstr "Yardım"
 msgid "Hexadecimal to decimal"
 msgstr "Onaltılıktan ondalığa"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Gizli"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Hata ayıklamayı gizle"
 
@@ -7479,14 +7516,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Geçmiş"
 
@@ -7550,7 +7587,7 @@ msgstr "Yatay hizalama"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7558,8 +7595,7 @@ msgstr "Yatay hizalama"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7571,7 +7607,7 @@ msgstr "Yatay hizalama"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7651,7 +7687,7 @@ msgstr[1] "Ana makineler etkin"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7659,7 +7695,7 @@ msgstr[1] "Ana makineler etkin"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Ana makine grubu"
@@ -7690,7 +7726,7 @@ msgstr "Ana makine grubu etiket türü"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li ana makine grubu mevcut değil."
@@ -7707,7 +7743,7 @@ msgstr "\"%1$s\" ID'li ana makine grubu mevcut değil."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7746,7 +7782,7 @@ msgstr "Ana makine arayüzü"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7894,7 +7930,7 @@ msgstr "\"%1$s\" görünür adlı bir ana makine halihazırda mevcut."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8126,14 +8162,66 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Sistemin tanımlanması. String döndürür"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 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."
@@ -8142,12 +8230,16 @@ msgstr "Eğer bu mesajın yanlış olduğunu düşünüyorsanız gerekli izinler
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Resim"
 
@@ -8277,7 +8369,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8290,11 +8382,11 @@ msgstr "Erişilemeyen harita"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8320,7 +8412,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "İçer"
 
@@ -8338,6 +8430,11 @@ msgstr "Alt grupları içer"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Ağ arayüzündeki gelen trafik istatistikleri. Tam sayı döndürür"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8728,7 +8825,7 @@ msgstr "\"%1$s\" eylemi için yanlış süzgeç koşul türü."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Yanlış fonksiyon kullanıldı"
 
@@ -8785,7 +8882,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "\"%2$s\" üzerindeki tetikleyici ifadesi için yanlış öğe anahtarı \"%1$s\" sağlandı."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Yanlış öğe değeri türü"
 
@@ -8816,7 +8913,7 @@ msgstr "Yanlış medya türü ID'si."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Yanlış yöntem \"%1$s.%2$s\"."
@@ -8956,10 +9053,10 @@ msgstr "Harita \"%1$s\" için yanlış kullanıcı ID'si belirtildi."
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Harita \"%1$s\" için yanlış kullanıcı grubu ID'si belirtildi."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9266,9 +9363,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9340,6 +9437,10 @@ msgstr "PSK alanı için yanlış değer kullanıldı. Çift sayıda onaltılık
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Vekil sunucu durumu için yanlış değer kullanıldı \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Endonezyaca (id_ID)"
@@ -9351,12 +9452,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9429,7 +9530,7 @@ msgid "Insert"
 msgstr "Ekle"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "İfade ekle"
 
@@ -9537,7 +9638,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9585,7 +9686,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9688,8 +9789,8 @@ msgstr "Geçersiz yöntem parametreleri."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9893,7 +9994,7 @@ msgstr "Geçersiz zaman periyodu."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Envanter"
 
@@ -10083,7 +10184,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10244,7 +10345,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Oca"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Ocak"
 
@@ -10266,7 +10367,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Tem"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Temmuz"
 
@@ -10274,7 +10375,7 @@ msgstr "Temmuz"
 msgid "Jun"
 msgstr "Haz"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Haziran"
 
@@ -10308,7 +10409,7 @@ msgstr "Anahtar"
 msgid "Key passphrase"
 msgstr "Anahtar parola deyimi"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Anahtar Kelime"
 
@@ -10378,7 +10479,7 @@ msgstr "Etiket konumu"
 msgid "Language"
 msgstr "Dil"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10457,11 +10558,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Son kontrol"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Son saat grafiği"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Son ayın grafiği"
 
@@ -10499,7 +10600,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Son değer"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Son haftanın grafiği"
 
@@ -10512,11 +10613,11 @@ msgstr "Son haftanın grafiği"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "En Son Veriler"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "En son değerler"
 
@@ -10627,7 +10728,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10705,12 +10806,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Kullanıcı grubu paylaşımlarının listesi"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Kullanıcı paylaşımlarının listesi"
@@ -10838,7 +10939,7 @@ msgstr "\"Desteklenmiyor\" durumundaki düşük seviye keşif kuralı"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Pzt"
@@ -10998,7 +11099,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11027,7 +11128,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Harita"
 
@@ -11066,7 +11167,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11092,7 +11193,7 @@ msgstr "Harita sahibi boş olamaz."
 msgid "Map shape"
 msgstr "Harita şekli"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Harita güncelleme başarısız."
 
@@ -11128,7 +11229,7 @@ msgstr "Haritalar"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Mart"
 
@@ -11155,7 +11256,7 @@ msgstr "Maske"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11226,9 +11327,9 @@ msgstr "İşletim sistemi tarafından desteklenen maksimum açılan dosya sayıs
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "İşletim sistemi tarafından desteklenen maksimum işlem sayısı. Tam sayı döndürür"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11241,12 +11342,12 @@ msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "Görüntülenecek maksimum süre %1$s gün."
 msgstr[1] "Görüntülenecek maksimum süre %1$s gün."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Mayıs"
 
@@ -11256,8 +11357,8 @@ msgid "May"
 msgstr "May"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Medya"
 
@@ -11318,7 +11419,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Medya türü güncellendi"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li medya türü mevcut değil."
@@ -11391,8 +11492,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Mesaj zaman aşımı"
 
@@ -11410,7 +11511,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Mesajlar"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Mesajlaşma"
 
@@ -11438,6 +11539,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11453,11 +11559,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11603,7 +11704,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Pzt"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -11643,11 +11744,11 @@ msgstr "Ay"
 msgid "Monthly"
 msgstr "Aylık"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Daha çok eşleşen bulundu..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11663,6 +11764,14 @@ msgstr "10 dakikadan çok"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Ana makine içinde \"%1$s\" ismiyle birden çok grafik var."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11672,11 +11781,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Çoklu"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Birden çok PROBLEM olayı"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Sesi Kapat"
 
@@ -11684,6 +11793,18 @@ msgstr "Sesi Kapat"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11778,25 +11899,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11939,6 +12061,10 @@ msgstr ""
 msgid "Never"
 msgstr "Hiç"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11950,7 +12076,7 @@ msgstr "Yeni koşul"
 msgid "New dashboard"
 msgstr "Yeni pano"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Yeni eleman"
 
@@ -11974,7 +12100,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Yeni düzenli ifade"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11991,7 +12117,7 @@ msgid "New triggers"
 msgstr "Yeni tetikleyiciler"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12009,20 +12135,20 @@ msgstr "Sonraki adım"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12155,7 +12281,7 @@ msgstr "Hiçbir detay yok"
 msgid "No discovery rule IDs given."
 msgstr "Hiçbir keşif kuralı ID'si verilmedi."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12217,7 +12343,7 @@ msgstr "Resim yok"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Hiçbir arabirim bulunamadı"
 
@@ -12257,7 +12383,7 @@ msgstr "Hiçbir makro bulunmadı."
 msgid "No maps added."
 msgstr "Hiçbir harita eklenmemiş."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Hiçbir eşleşen bulunmadı"
 
@@ -12270,8 +12396,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "\"%1$s\" korelasyonu için verilen herhangi bir işlem türü yok."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Sistem erişimi için izin yok."
 
@@ -12283,7 +12409,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12291,11 +12416,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12413,19 +12539,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12434,15 +12560,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12469,7 +12595,7 @@ msgstr "Hiçbir açık anahtar dosyası belirtilmemiş."
 msgid "No recipients for action operation message."
 msgstr "Eylem işlem mesajı için hiçbir alıcı yok."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Tazeleme yok"
 
@@ -12485,7 +12611,7 @@ msgstr "Hiçbir hedef seçilmemiş"
 msgid "No target selected."
 msgstr "Hiçbir hedef seçilmemiş."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12532,7 +12658,7 @@ msgstr "Hiçbiri"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12564,15 +12690,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "\"guest\" kullanıcısı için parola konulmasına izin yok."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12604,8 +12730,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Desteklenmiyor"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Not"
 
@@ -12635,7 +12761,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Kas"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Kasım"
 
@@ -12798,12 +12924,12 @@ msgstr "Sayısal sistemler"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Sayısal (kayan noktalı)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Sayısal (tam sayısal)"
 
@@ -12818,18 +12944,17 @@ msgstr "Sayısal (işaretsiz)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "TAMAM"
@@ -12856,7 +12981,7 @@ msgstr "OOB yönlendiricisi"
 msgid "OOB subnet mask"
 msgstr "OOB alt ağ maskesi"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "VEYA"
 
@@ -12884,13 +13009,13 @@ msgstr "Eki"
 msgid "Octal to decimal"
 msgstr "Sekizlikten ondalığa"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Ekim"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Kapalı"
 
@@ -12902,7 +13027,7 @@ msgstr "Kapalı"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Tamam"
@@ -12921,7 +13046,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Açık"
 
@@ -12929,7 +13054,7 @@ msgstr "Açık"
 msgid "On status change triggers blink for"
 msgstr "Durum değişikliğinde tetikleyiciler şunun için yanıp söner"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Bir kere"
 
@@ -12946,7 +13071,7 @@ msgid "One time only"
 msgstr "Yalnızca bir kere"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Bir kerelik aksama süresi"
 
@@ -12958,26 +13083,14 @@ msgstr "Yalnızca Süper Yöneticiler ana makine grupları oluşturabilir."
 msgid "Only Super Admins can create media types."
 msgstr "Yalnızca Süper Yöneticiler medya türü oluşturabilir."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Yalnızca Süper Yöneticiler kullanıcı grupları oluşturabilir."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Yalnızca Süper Yöneticiler medya türlerini silebilir."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Yalnızca Süper Yöneticiler kullanıcı gruplarını silebilir."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Yalnızca Süper Yöneticiler medya türlerini düzenleyebilir."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Yalnızca Süper Yöneticiler kullanıcı gruplarını güncelleyebilir."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Yalnızca Zabbix aracısı, SNMPv1, SNMPv2 ve SNMPv3 kontrolleri benzersiz yapılabilir."
@@ -13018,11 +13131,11 @@ msgid_plural "Only selected problems"
 msgstr[0] "Yalnızca seçili problem"
 msgstr[1] "Yalnızca seçili problemler"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13055,7 +13168,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "İşletim sistemi bilgileri. String döndürür"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13080,7 +13193,7 @@ msgstr "İşlem, işlem yapılacak hiçbir gruba sahip değil."
 msgid "Operation has no template to operate."
 msgstr "İşlem, işlem yapacak şablona sahip değil."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13105,27 +13218,27 @@ msgstr "İşlemler"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "İşlemci"
 
@@ -13150,7 +13263,7 @@ msgstr "Seçenekler"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13167,8 +13280,8 @@ msgstr "Veya"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13215,9 +13328,9 @@ msgstr "Veya"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Orjinal"
 
@@ -13469,7 +13582,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "SORUN"
@@ -13516,7 +13629,7 @@ msgstr "PSK kimliği"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK çok kısa. En az %1$s onaltılık basamak olmalıdır."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13539,13 +13652,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametre"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13576,9 +13691,7 @@ msgstr "Üst öğeler"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13667,15 +13780,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Harici bağlantılar olmadan yapıştır"
 
@@ -13749,19 +13866,20 @@ msgid "Periods"
 msgstr "Dönemler"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "İzinler"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "İzinler yalnızca kullanıcı grupları için atanabilir."
 
@@ -13783,12 +13901,12 @@ msgstr "Yerleştirme algoritması"
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Oynat"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Sesi oynat"
 
@@ -13818,7 +13936,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Lütfen, (isteğe bağlı) kurulum adının yanı sıra Zabbix sunucusunun ana makine adını veya ana makine IP adresini ve bağlantı noktası numarasını girin."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Lütfen iki eleman seçiniz"
 
@@ -13947,7 +14065,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14005,7 +14123,7 @@ msgstr "Gizlilik parola deyimi"
 msgid "Privacy protocol"
 msgstr "Gizlilik protokolü"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Özel"
@@ -14025,12 +14143,12 @@ msgid "Privilege level"
 msgstr "Öncelik seviyesi"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14060,7 +14178,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "Problem gösterimi"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Problem ifadesi"
@@ -14078,7 +14196,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Üzerinde problem"
 
@@ -14091,8 +14209,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14105,14 +14223,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problem, eğer bütün altlarda sorun varsa"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Problem, eğer en az alttakilerden birinde sorun varsa"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14129,7 +14239,7 @@ msgstr "Problem, eğer en az alttakilerden birinde sorun varsa"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Problemler"
 
@@ -14163,12 +14273,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Özellikler"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14190,7 +14300,7 @@ msgstr "Vekil sunucular"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14253,7 +14363,7 @@ msgstr "Vekil sunucu adı"
 msgid "Proxy updated"
 msgstr "Vekil sunucu güncellendi"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Herkese açık"
@@ -14347,8 +14457,8 @@ msgstr "Okuma"
 msgid "Read only"
 msgstr "Yalnızca okuma"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14356,8 +14466,8 @@ msgstr "Yalnızca okunur"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14410,7 +14520,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14418,7 +14528,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Kurtarma"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14453,7 +14563,7 @@ msgstr "Dikdörtgen"
 msgid "Refresh"
 msgstr "Tazele"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14514,7 +14624,7 @@ msgstr "Düzenli ifadeler"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14546,6 +14656,7 @@ msgstr "Uzak komut"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14555,7 +14666,7 @@ msgstr "Uzak komut"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14563,13 +14674,13 @@ msgstr "Uzak komut"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14579,8 +14690,8 @@ msgstr "Uzak komut"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14657,8 +14768,8 @@ msgstr "Uzak komut"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -14698,7 +14809,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14727,7 +14838,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14735,7 +14846,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Değiştir"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Bağımlılıkları değiştir"
 
@@ -14842,7 +14953,7 @@ msgstr "Gerekli durum kodları"
 msgid "Required string"
 msgstr "Gerekli string"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Sıfırla"
@@ -14876,7 +14987,7 @@ msgstr "Sıfırlama onayı"
 msgid "Reset defaults"
 msgstr "Öntanımlılara sıfırla"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Çözüldü"
 
@@ -15074,8 +15185,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Sağ kırpma"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15133,12 +15244,12 @@ msgstr "Ana makinede belirtilen komutu çalıştırır. Komutun metin sonucunu d
 msgid "Russian (ru_RU)"
 msgstr "Rusça (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Cmt"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Pzr"
@@ -15149,10 +15260,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15365,7 +15474,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Cts"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -15538,7 +15647,7 @@ msgstr "Betik güncellendi"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Betikler"
 
@@ -15608,8 +15717,8 @@ msgid "Security name"
 msgstr "Güvenlik adı"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15617,7 +15726,7 @@ msgstr "Güvenlik adı"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Seç"
 
@@ -15653,19 +15762,19 @@ msgstr "Seçilen öğeler"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Geriye gönder"
 
@@ -15690,7 +15799,7 @@ msgstr "Yalnızca şuna gönder"
 msgid "Send to"
 msgstr "Şuna gönder"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Geriye gönder"
 
@@ -15723,7 +15832,7 @@ msgstr "Ayrılmış"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Eylül"
 
@@ -15755,34 +15864,29 @@ msgid "Server time"
 msgstr "Sunucu zamanı"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Servis"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15790,7 +15894,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Servis oluşturuldu"
 
@@ -15819,7 +15923,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Servis başlangıç zamanı, bitiş zamanında daha önce olmalıdır."
 
@@ -15835,11 +15939,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Servis zamanları"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Servis türü"
 
@@ -15848,7 +15952,7 @@ msgstr "Servis türü"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Servis güncellendi"
 
@@ -15857,16 +15961,16 @@ msgstr "Servis güncellendi"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Servisler"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Servisler bir çevrimsel bağımlılık oluşturuyor."
 
@@ -15878,9 +15982,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Oturum sonlandı, lütfen tekrar oturum açın."
 
@@ -15904,10 +16008,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Ana makine envanter kipini ayarla"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15948,7 +16060,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15994,7 +16106,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Paylaşım"
 
@@ -16085,7 +16197,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16136,7 +16248,7 @@ msgstr "Eğer Zabbix sunucusu erişilemezse uyarı göster"
 msgid "Show working time"
 msgstr "Çalışma zamanlarını göster"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Gösterilen"
 
@@ -16246,7 +16358,7 @@ msgstr "\"%2$s\" ana makinesine \"%1$s\" grafiğinin kopyalanması atlandı."
 msgid "Slovak (sk_SK)"
 msgstr "Slovakça (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Ertele"
 
@@ -16292,7 +16404,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Girişleri şuna göre sırala"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sıralama düzeni (0->999)"
 
@@ -16366,7 +16478,7 @@ msgstr "Başlama yeri"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16414,12 +16526,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16430,17 +16544,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16464,13 +16585,10 @@ msgstr ""
 msgid "Status"
 msgstr "Durum"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Durum hesaplaması"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Durum hesaplama algortiması"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16501,6 +16619,10 @@ msgstr "Yalnızca durum"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16532,8 +16654,8 @@ msgstr "\"%1$s\" adına sahip adım halihazırda mevcut."
 msgid "Steps"
 msgstr "Adımlar"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Dur"
 
@@ -16545,7 +16667,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16577,7 +16699,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16610,7 +16732,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Konu"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Altharita"
 
@@ -16626,7 +16748,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Başarı denetimi"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16639,7 +16761,7 @@ msgstr "Ağ arayüzündeki gelen ve giden trafik istatistiklerinin toplamı. Tam
 msgid "Sun"
 msgstr "Paz"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -16731,12 +16853,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Saniye olarak sistem çalışma süresi. Tam sayı döndürür"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Per"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Sal"
@@ -16772,8 +16894,8 @@ msgstr "\"%1$s\" tablosunda \"%2$s\" adlı alan yok."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiket"
@@ -16813,14 +16935,13 @@ msgstr "Etiket değeri"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16828,10 +16949,10 @@ msgstr "Etiket değeri"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16995,7 +17116,7 @@ msgstr "\"%1$s\" ile aynı görünür adlı şablon halihazırda mevcut."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17280,12 +17401,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Per"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Kadar"
 
@@ -17295,13 +17416,13 @@ msgstr "Kadar"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17382,7 +17503,7 @@ msgstr "Zaman damgası"
 msgid "To"
 msgstr "Kime"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Ana makine arayüzü ayarlamak için tüm öğeler için tek bir öğe türü seçin"
 
@@ -17504,13 +17625,13 @@ msgstr "Yönelimler"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Tetikleyici"
 
@@ -17529,7 +17650,7 @@ msgstr "\"%1$s\" tetikleyicisi farklı bağlantılara sahip şablonlara ait."
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "\"%1$s\" tetikleyicisi, varolmayan \"%2$s\" tetikleyicisine bağımlı."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17613,7 +17734,7 @@ msgstr "Tetikleyicilere genel bakış"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17680,15 +17801,15 @@ msgstr "Tetikleyici prototipleri silindi"
 msgid "Trigger prototypes updated"
 msgstr "Tetikleyici prototipleri güncellendi"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Tetikleyici önem derecesi"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Tetikleyici durumu \"TAMAM\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Tetikleyici durumu \"Problem\""
 
@@ -17740,7 +17861,7 @@ msgstr "Kırp"
 msgid "Tue"
 msgstr "Sal"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Salı"
 
@@ -17753,7 +17874,7 @@ msgstr "Türkçe (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "İki öğe (\"%1$s\" ve \"%2$s\"), bir ana makine envanter alanını (\"%3$s\") oluşturamaz, bu durum çakışmaya neden olur."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17768,15 +17889,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17843,7 +17965,7 @@ msgid "UNKNOWN"
 msgstr "BİLİNMEYEN"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17853,7 +17975,7 @@ msgstr "BİLİNMEYEN"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17899,7 +18021,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL, \"%1$s\" haritası için hem \"name\" hem de \"url\" alanlarına sahip olmalıdır."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URL'ler"
 
@@ -17947,7 +18069,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Varolan yapılandırma dosyasının üzerine yazılamadı."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17994,7 +18116,8 @@ msgstr "Seçilen kullanıcıların bloklaması kaldırılsın mı?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18013,7 +18136,8 @@ msgstr "Birim"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18024,9 +18148,9 @@ msgstr "Birim"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -18045,12 +18169,12 @@ msgstr "Bilinmeyen hata"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Bilinmeyen ana makine öğesi, seçilen ana makinede böyle bir öğe yok"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Bilinmeyen ana makine, sistemde böyle bir ana makine bulunmuyor"
 
@@ -18097,7 +18221,7 @@ msgstr "Şablon ile bağlantıyı kaldır"
 msgid "Unlink from templates"
 msgstr "Şablonlar ile bağlantıyı kaldır"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Sesi Aç"
 
@@ -18178,27 +18302,28 @@ msgstr "Açık"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18267,7 +18392,7 @@ msgid "Upper level maps"
 msgstr "Daha üst seviye haritalar"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Çalışma Süresi"
@@ -18316,37 +18441,37 @@ msgstr "Eylemlerde kullanılır"
 msgid "User"
 msgstr "Kullanıcı"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "\"%1$s\" kullanıcısı, kullanıcı grubu olmadan bulunamaz."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "\"%1$s\" kullanıcısı \"%2$s\" panosunun sahibidir."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "\"%1$s\" kullanıcısı \"%2$s\" haritasının sahibidir."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "\"%1$s\" kullanıcısı \"%2$s\" eyleminde kullanılıyor."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18363,13 +18488,13 @@ msgstr "Kullanıcı eklendi"
 msgid "User agent string"
 msgstr "Kullanıcı aracısı stringi"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Kullanıcı kendini devre dışı bir gruba veya grafik arayüzü erişimi devre dışı olan bir gruba ekleyemez."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18394,32 +18519,32 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Kullanıcı grubu"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Kullanıcı grubu \"%1$s\" halihazırda mevcut."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "\"%1$s\" kullanıcı grubu \"%2$s\" eyleminde kullanılıyor."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Kullanıcı grubu \"%1$s\", veritabanı çalışmıyor mesajlarını yapılandırmada kullanılır."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, 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ış."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18450,7 +18575,7 @@ msgstr[1] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li kullanıcı grubu mevcut değil."
@@ -18458,14 +18583,14 @@ msgstr "\"%1$s\" ID'li kullanıcı grubu mevcut değil."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Kullanıcı grupları"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Kullanıcının kendisini silmesine izin verilmez."
 
@@ -18514,7 +18639,7 @@ msgstr[1] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18548,7 +18673,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Kullanıcı paylaşımında eksik parametreler: \"%2$s\" haritası için %1$s."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18569,12 +18694,12 @@ msgstr "Kullanıcı güncellendi"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li kullanıcı mevcut değil."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18619,7 +18744,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18886,23 +19011,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19109,8 +19234,8 @@ msgstr "Dikey hizalama"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamca (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19137,7 +19262,12 @@ msgstr "Görünen isim"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Ana makine adı eksikse görünür adı boş olamaz."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Çar"
@@ -19154,11 +19284,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Uyarı"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 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ı."
 
@@ -19174,7 +19304,7 @@ msgstr "Özür dileriz, hatırlamak için olası maksimum eleman sayısına ula�
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19243,7 +19373,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Pts"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Çarşamba"
 
@@ -19254,6 +19384,10 @@ msgstr "Çarşamba"
 msgid "Weekly"
 msgstr "Haftalık"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Hoş geldiniz"
@@ -19271,7 +19405,7 @@ msgstr "Aktif olduğunda"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19484,8 +19618,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19527,19 +19661,19 @@ msgstr "Yıllık"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19607,19 +19741,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Bu işlemi gerçekleştirmek için izniniz yok."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Kullanıcıları oluşturmak için izniniz yok."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Bu sayfaya erişmek için izniniz yok."
@@ -19740,7 +19870,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "bir boole bekleniyor"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19859,7 +19989,6 @@ msgstr "aracı"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20155,9 +20284,9 @@ msgstr "değiştirilemez"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20237,7 +20366,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "çevrimsel öğe bağımlılığına izin verilmiyor"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20284,7 +20413,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "g"
@@ -20483,13 +20612,13 @@ msgstr "genel temizlik hizmeti ayarları"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "sa"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "ss"
 
@@ -20537,7 +20666,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "alt gruplar dahil"
 
@@ -20763,12 +20892,12 @@ msgstr "düşük seviye keşif kuralı"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "dk"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "ay"
@@ -20872,8 +21001,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr "minimum uzunluk %1$s karakter"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20968,7 +21097,7 @@ msgstr ""
 msgid "name"
 msgstr "ad"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "yeni"
 
@@ -21035,7 +21164,7 @@ msgstr ""
 msgid "number"
 msgstr "sayı"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "un"
@@ -21103,7 +21232,7 @@ msgstr "çıktı"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21230,7 +21359,7 @@ msgstr "seçilen"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "kısa tanımlama"
 
@@ -21315,7 +21444,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21325,8 +21454,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21407,7 +21536,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21470,7 +21599,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "aramak için buraya yazın"
 
@@ -21497,7 +21626,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21591,7 +21720,7 @@ msgstr "desteklenmeyen sürüm numarası"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21611,7 +21740,7 @@ msgstr "desteklenmeyen sürüm numarası"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "değer"
 
@@ -21758,7 +21887,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/uk/LC_MESSAGES/frontend.po b/ui/locale/uk/LC_MESSAGES/frontend.po
index 3ee1675db57..d29b79c265b 100644
--- a/ui/locale/uk/LC_MESSAGES/frontend.po
+++ b/ui/locale/uk/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2016-02-09 16:27+0300\n"
 "Last-Translator: Oleksii <oleksii.zagorskyi@zabbix.com>\n"
 "Language-Team: Zabbix translation team\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d день"
 msgstr[1] "%1$d дні"
 msgstr[2] "%1$d днів"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] "%1$s повідомлень"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] "%1$s з %2$s елемента в стані проблеми"
 msgstr[1] "%1$s з %2$s елементів в стані проблеми"
 msgstr[2] "%1$s з %2$s елементів в стані проблеми"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -236,10 +236,10 @@ msgstr[0] "залишилась %1$s спроба"
 msgstr[1] "залишилось %1$s спроби"
 msgstr[2] "залишилось %1$s спроб"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s секунда"
 msgstr[1] "%1$s секунди"
 msgstr[2] "%1$s секунд"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "залишилось %1$s символів"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Важливість, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, тільки читання"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -325,7 +325,7 @@ msgstr "(без проксі)"
 msgid "0 - use default port"
 msgstr "0 - використовувати порт по замовчуванню"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 або 1"
 
@@ -393,7 +393,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "ДОДАТИ ЗАМІЩЕННЯ"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "ТА"
 
@@ -410,7 +410,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -478,40 +478,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Доступ заборонено"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Доступ заборонено!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Підтверджено"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Підтвердити"
 
@@ -519,7 +519,7 @@ msgstr "Підтвердити"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Підтверджено"
@@ -548,20 +548,22 @@ msgstr "Підтверджені ВИРІШЕНІ події"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -668,7 +670,7 @@ msgstr "Дію оновлено"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -677,7 +679,7 @@ msgstr "Дію оновлено"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Дії"
@@ -736,8 +738,8 @@ msgstr "Активно до"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -748,7 +750,6 @@ msgstr "Активно до"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -756,11 +757,13 @@ msgstr "Активно до"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -772,15 +775,17 @@ msgstr "Активно до"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -847,7 +852,7 @@ msgstr "Активно до"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Додати"
 
@@ -855,19 +860,19 @@ msgstr "Додати"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Додати новий віджет"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Додати підлеглий елемент"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -884,7 +889,7 @@ msgstr "Додати вузел мережі"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Додати кілька карт"
 
@@ -901,7 +906,11 @@ msgstr ""
 msgid "Add new override"
 msgstr "Додати нове заміщення"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -909,7 +918,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -943,7 +952,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Додати віджет"
 
@@ -952,12 +961,20 @@ msgstr "Додати віджет"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Додано, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Адміністратор"
@@ -967,6 +984,10 @@ msgstr "Адміністратор"
 msgid "Administration"
 msgstr "Адміністрування"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Розширені ярлики"
@@ -1053,7 +1074,7 @@ msgstr "Вирівняти елементи карти"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Все"
 
@@ -1062,8 +1083,8 @@ msgid "All dashboards"
 msgstr "Всі панелі"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Всі групи"
 
@@ -1071,7 +1092,7 @@ msgstr "Всі групи"
 msgid "All hosts"
 msgstr "Всі вузли мережі"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Всі посилання повинні мати вказані \"І'мя\" та \"URL-запит\""
 
@@ -1105,7 +1126,7 @@ msgstr "Всі шаблони"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1118,7 +1139,7 @@ msgstr "Дозволити закриття вручну"
 msgid "Allowed hosts"
 msgstr "Дозволені вузли мережі"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1136,7 +1157,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1177,12 +1198,12 @@ msgstr "Та/Або"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1202,15 +1223,15 @@ msgstr "Помилка програми."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Задіяти"
 
@@ -1228,7 +1249,7 @@ msgstr "Наближається"
 msgid "Apr"
 msgstr "Кві"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Квітень"
 
@@ -1256,6 +1277,10 @@ msgstr "Тип області"
 msgid "Arithmetic"
 msgstr "Арифметика"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "Як простий текст"
@@ -1308,8 +1333,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1387,7 +1412,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Сер"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Серпень"
 
@@ -1417,7 +1442,7 @@ msgstr "Аутентифікація"
 msgid "Authentication algorithm"
 msgstr "Алгоритм аутентифікації"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "Невдала аутентийікація: %1$s."
@@ -1466,7 +1491,7 @@ msgstr "Авто"
 msgid "Auto-login"
 msgstr "Авто-вхід"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Опції авто-вхід та авто-вихід неможливо активувати разом."
 
@@ -1476,7 +1501,7 @@ msgstr "Авто-вихід"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1661,11 +1686,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "По нижньому краю"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Перемістити вперед"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Перемістити на самий перед"
 
@@ -1746,7 +1771,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Вираховується автоматично"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Календар"
 
@@ -1766,8 +1791,8 @@ msgstr "Зворотній виклик"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1784,8 +1809,8 @@ msgstr "Зворотній виклик"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Скасувати та повернутись"
 
@@ -1815,7 +1840,7 @@ msgstr "Не вдалося додати дію"
 msgid "Cannot add correlation"
 msgstr "Не вдалося додати кореляцію"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1826,7 +1851,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Не вдалося додати залежність від вузла мережі до шаблону."
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1946,7 +1971,7 @@ msgid "Cannot add user"
 msgstr "Не вдалося додати користувача"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1954,11 +1979,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Не вдалося додати веб сценарій"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2042,7 +2067,7 @@ msgstr[0] "Не вдалося скопіювати тригер"
 msgstr[1] "Не вдалося скопіювати тригери"
 msgstr[2] "Не вдалося скопіювати тригери"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Не вдалося скопіювати тригер \"%1$s:%2$s\", тому що він містить декілька вузлів мережі у виразі."
@@ -2098,7 +2123,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Не вдалося видалити внутрішнього користувача Zabbix \"%1$s\", спробуйте відключити цього користувача."
@@ -2553,7 +2578,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Не вдалося розкрити макроси."
 
@@ -2725,7 +2750,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2787,7 +2812,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Не вдалося прочитати відповідь, перевірте з'єднання з Zabbix сервером \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Не вдалось перейменувати гостьового користувача."
 
@@ -2846,7 +2871,12 @@ msgstr "Не вдалося задати поля інтентарних дан�
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3274,6 +3304,7 @@ msgid "Change per second"
 msgstr "Зміна в секунду"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Змінити важливість"
 
@@ -3415,7 +3446,7 @@ msgstr "Перевіряє швидкодію UDP сервісу. Поверта
 msgid "Checks should be unique."
 msgstr "Перевірки повинні бути унікальними."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3457,11 +3488,11 @@ msgstr "Очистити історію та динаміку змін"
 msgid "Clear when unlinking"
 msgstr "Очистити при від'єднанні"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "Натисніть та тягніть до бажаного розміру."
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr "Клацніть для перегляду або редагування"
 
@@ -3491,7 +3522,7 @@ msgstr "Годинник"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Клонувати"
 
@@ -3502,8 +3533,8 @@ msgstr "Клонувати"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Закрити"
 
@@ -3533,8 +3564,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Згорнути"
 
@@ -3551,7 +3582,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3619,6 +3650,7 @@ msgstr "Одночасні сесії"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Умова"
 
@@ -3673,7 +3705,7 @@ msgstr "Умови"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Налаштування"
 
@@ -3936,7 +3968,7 @@ msgstr "Контактна інформація"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3973,8 +4005,8 @@ msgstr "Містить"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -4035,8 +4067,8 @@ msgstr "Координати"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Копіювати"
 
@@ -4170,11 +4202,11 @@ msgstr "Створити кореляцію"
 msgid "Create dashboard"
 msgstr "Створити панель"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr "Створити залежне правило виявлення"
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Створити залежний елемент даних"
 
@@ -4291,7 +4323,7 @@ msgstr "Створити карту мережі"
 msgid "Create media type"
 msgstr "Створити метод повідомлень"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Створити нові"
 
@@ -4307,7 +4339,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Створити скрипт"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4315,7 +4347,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Створити шаблон"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Створити тригер"
 
@@ -4536,7 +4568,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Властивості панелі"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Спільний доступ до панелі"
 
@@ -4566,7 +4598,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Панелі"
 
@@ -4736,7 +4768,7 @@ msgstr "День в тиждень"
 msgid "Days"
 msgstr "Днів"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Дебаг"
 
@@ -4750,7 +4782,7 @@ msgstr "Режим діагност."
 msgid "Dec"
 msgstr "Гру"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Грудень"
 
@@ -4759,13 +4791,17 @@ msgstr "Грудень"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "По замовчуванню"
 
@@ -4835,8 +4871,8 @@ msgid "Delayed by"
 msgstr "Затримується на"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4850,7 +4886,7 @@ msgstr "Затримується на"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4882,8 +4918,8 @@ msgstr "Затримується на"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Видалити"
 
@@ -4912,7 +4948,7 @@ msgstr "Видалити поточну дію?"
 msgid "Delete current correlation?"
 msgstr "Видалити потчну кореляцію?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Видалити панель?"
 
@@ -4956,7 +4992,7 @@ msgstr "Видалити прототип елементів даних?"
 msgid "Delete item?"
 msgstr "Видалити елемент даних?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Видалити лінки між обраними елементами?"
 
@@ -5012,7 +5048,7 @@ msgstr "Видалити обрані панелі?"
 msgid "Delete selected discovery rules?"
 msgstr "Видалити вибрані правила виявлення?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Видалити вибрані елементи?"
 
@@ -5113,11 +5149,11 @@ msgstr "Видалити вибрані скрипти?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Видалити обрані фігури?"
 
@@ -5133,7 +5169,7 @@ msgstr "Видалити вибрані прототипи тригерів?"
 msgid "Delete selected triggers?"
 msgstr "Видалити вибрані тригери?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Видалити обраного користувача?"
 
@@ -5184,7 +5220,7 @@ msgstr "Видалено: Шаблон \"%1$s\"."
 msgid "Delimiter"
 msgstr "Розділювач"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5198,7 +5234,7 @@ msgstr "Заборонено"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5206,7 +5242,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Залежності"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Залежність"
 
@@ -5214,7 +5250,7 @@ msgstr "Залежність"
 msgid "Dependent item"
 msgstr "Залежний елемент даних"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5242,7 +5278,7 @@ msgstr "Статус розгортання"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5406,7 +5442,7 @@ msgstr "Дезактивувати вибрані веб сценарії?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5419,14 +5455,14 @@ msgstr "Дезактивувати вибрані веб сценарії?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5509,7 +5545,7 @@ msgid "Discovery by proxy"
 msgstr "Виявлення через проксі"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Перевірка виявлення"
 
@@ -5521,7 +5557,7 @@ msgstr "Перевірки виявлення"
 msgid "Discovery list"
 msgstr "Список виявлення"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Об'єкт виявлення"
 
@@ -5624,7 +5660,7 @@ msgstr "Правило виявлення оновлено"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5635,7 +5671,7 @@ msgstr "Правила виявлення"
 msgid "Discovery rules deleted"
 msgstr "Правила виявлення видалено"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Стан виявлення"
@@ -5675,7 +5711,7 @@ msgstr "Показати стекований графік"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Відображено %1$s із %2$s знайдених"
@@ -5693,10 +5729,6 @@ msgstr "Опції відображення"
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Не підраховувати"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5711,7 +5743,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Ви дійсно хочете замінити умовний вираз?"
 
@@ -5767,7 +5799,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недоступний"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5776,7 +5808,7 @@ msgid "Download the configuration file"
 msgstr "Завантажити конфігураційний файл"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Недоступний"
@@ -5852,7 +5884,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Дублікат userid \"%1$s\" у користувачів для карти мережі \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5874,7 +5906,7 @@ msgstr "Динамічний елемент"
 msgid "Dynamic items"
 msgstr "Динамічні елементи даних"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Кожнен URL-запит повинен мати унікальне ім'я. Будь ласка переконайтесь що це тільки один URL-запит з таким іменем"
 
@@ -5882,13 +5914,14 @@ msgstr "Кожнен URL-запит повинен мати унікальне �
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5900,8 +5933,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Змінити"
 
@@ -5917,11 +5950,11 @@ msgstr "Редагувати карту мережі"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Редагувати елемент дерева"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Редагувати тригер"
 
@@ -6196,7 +6229,7 @@ msgstr "Активувати трапи"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6218,12 +6251,12 @@ msgstr "Активувати трапи"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6282,7 +6315,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6306,7 +6339,7 @@ msgstr "Помилка"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Помилка в запиті пошуку в таблиці \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Повідомлення про помилку"
 
@@ -6345,7 +6378,7 @@ msgstr "Правила кореляції події"
 msgid "Event details"
 msgstr "Подробиці події"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Генерація події"
 
@@ -6375,7 +6408,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Пара тегів події"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Тип події"
 
@@ -6410,7 +6443,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Виключено"
 
@@ -6421,7 +6454,7 @@ msgstr "Виключено"
 msgid "Exclude host groups"
 msgstr "Виключити групи вузлів мережі"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Виконати"
 
@@ -6467,7 +6500,7 @@ msgstr "Виконано"
 msgid "Executed script"
 msgstr "Скрипт для виконання"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Підтвердження виконання"
 
@@ -6483,8 +6516,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Розгорнути"
 
@@ -6551,7 +6584,7 @@ msgstr "Експортувати в CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6605,7 +6638,7 @@ msgstr "Вирази"
 msgid "External check"
 msgstr "Зовнішня перевірка"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
@@ -6629,7 +6662,7 @@ msgid "Failed"
 msgstr "Помилковий"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Помилка при створенні панелі"
 
@@ -6638,24 +6671,24 @@ msgstr "Помилка при створенні панелі"
 msgid "Failed to parse URL."
 msgstr "Помилка при обробці URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Помилка при оновленні панелі"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6663,7 +6696,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Помилка при оновленні шаблону."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6687,7 +6720,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Лют"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Лютий"
 
@@ -6833,8 +6866,8 @@ msgstr "Заповнений регіон"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6912,6 +6945,10 @@ msgstr "Вписати в карту мережі"
 msgid "Fixed"
 msgstr "Фіксоване"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6977,14 +7014,14 @@ msgstr "Французька (fr_FR)"
 msgid "Fri"
 msgstr "П'ят"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "П'ятниця"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -7002,7 +7039,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Доступ до веб-інтерфейсу"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Повідомлення у веб-інтерфейсі"
 
@@ -7084,7 +7121,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Наданий вираз це не макрос"
 
@@ -7102,7 +7139,7 @@ msgstr "Глобальне значення"
 msgid "Go back to %1$s"
 msgstr "Повернутись до %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Перейти до"
 
@@ -7151,7 +7188,7 @@ msgstr "Градієнтна лінія"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7313,7 +7350,7 @@ msgstr "Графік з іменем \"%1$s\" вже існує в графік�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Графіки"
 
@@ -7514,11 +7551,11 @@ msgstr "Допомога"
 msgid "Hexadecimal to decimal"
 msgstr "Шістнадцяткове в десяткове"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Прихована"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Сховати діагностичну інф."
 
@@ -7563,14 +7600,14 @@ msgstr "Підсвічувати весь рядок"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Історія"
 
@@ -7634,7 +7671,7 @@ msgstr "Вирівнювання по горизонталі"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7642,8 +7679,7 @@ msgstr "Вирівнювання по горизонталі"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7655,7 +7691,7 @@ msgstr "Вирівнювання по горизонталі"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7738,7 +7774,7 @@ msgstr[2] "Вузли мережі активовано"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7746,7 +7782,7 @@ msgstr[2] "Вузли мережі активовано"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Група вузлів мережі"
@@ -7777,7 +7813,7 @@ msgstr "Тип ярлика до групи вузлів мережі"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Група вузлів мережі з ID \"%1$s\" недоступна."
@@ -7794,7 +7830,7 @@ msgstr "Група вузлів мережі з ID \"%1$s\" недоступна
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7833,7 +7869,7 @@ msgstr "Інтерфейс вузла мережі"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7982,7 +8018,7 @@ msgstr "Вузел мережі з таким самим видимим імен
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8214,14 +8250,68 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Ідентифікатор системи. Повертає рядок"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Якщо Ви вважаєте це повідомлення помилковим, то зверніться до вашого адміністратора для отримання необхідних прав доступу."
@@ -8230,12 +8320,16 @@ msgstr "Якщо Ви вважаєте це повідомлення помил�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Картинка"
 
@@ -8365,7 +8459,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8378,11 +8472,11 @@ msgstr "Недоступна карта мережі"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "Недоступний шаблон"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "Недоступний тригер"
 
@@ -8408,7 +8502,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Включено"
 
@@ -8426,6 +8520,11 @@ msgstr "Включити субгрупи"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Статистика вхідного трафіку мережевого інтерфейсу. Повертає ціле число"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8816,7 +8915,7 @@ msgstr "Некоректний тип умови фільтру для дії \"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Використано некоректну функцію"
 
@@ -8873,7 +8972,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "У виразі тригера \"%2$s\" вказано некоректний ключ елемента даних \"%1$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Некоректний тип значення елемента даних"
 
@@ -8904,7 +9003,7 @@ msgstr "Некоректний ID методу повідомлень."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Некоректний метод \"%1$s.%2$s\"."
@@ -9044,10 +9143,10 @@ msgstr "Некоректне значення ID користувача вказ
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "Некоректне значення ID групи користувачів вказано для карти мережі \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9354,9 +9453,9 @@ msgstr "Некоректне значення для поля \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9428,6 +9527,10 @@ msgstr "Некоректне значення використано для по
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Некоректне значення використано для статусу проксі \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Індонезійська (id_ID)"
@@ -9439,12 +9542,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9517,7 +9620,7 @@ msgid "Insert"
 msgstr "Вставити"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Вставити вираз"
 
@@ -9625,7 +9728,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9673,7 +9776,7 @@ msgstr "Помилкова дата."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Помилкова адреса email \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Помилкова адреса email у методу повідомлень з ID \"%1$s\"."
@@ -9776,8 +9879,8 @@ msgstr "Неправильні параметри методу."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9981,7 +10084,7 @@ msgstr "Неправильний період часу."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Інвентаризація"
 
@@ -10175,7 +10278,7 @@ msgstr "Прототипи елементів даних оновлено"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10336,7 +10439,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Січ"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Січень"
 
@@ -10358,7 +10461,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Лип"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Липень"
 
@@ -10366,7 +10469,7 @@ msgstr "Липень"
 msgid "Jun"
 msgstr "Чер"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Червень"
 
@@ -10400,7 +10503,7 @@ msgstr "Ключ"
 msgid "Key passphrase"
 msgstr "Фраза-пароль ключа"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Ключове слово"
 
@@ -10470,7 +10573,7 @@ msgstr "Розміщення ярлика"
 msgid "Language"
 msgstr "Мова"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10555,11 +10658,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Остання перевірка"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Графік за останню годину"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Графік за останній місяць"
 
@@ -10597,7 +10700,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Останнє значення"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Графік за останній тиждень"
 
@@ -10610,11 +10713,11 @@ msgstr "Графік за останній тиждень"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Останні дані"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Останні значення"
 
@@ -10725,7 +10828,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10803,12 +10906,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Список груп користувачів спільного доступу"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Список користувачів спільного доступу"
@@ -10936,7 +11039,7 @@ msgstr "Правило низькорівневого виявлення в ст
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
@@ -11096,7 +11199,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -11125,7 +11228,7 @@ msgstr "Закритий вручну"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Карта мережі"
 
@@ -11164,7 +11267,7 @@ msgstr "Розміщення підпису до елементу карти м�
 msgid "Map element label type"
 msgstr "Тип підпису до елементу карти мережі"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11190,7 +11293,7 @@ msgstr "Власник карти мережі не може бути пусти
 msgid "Map shape"
 msgstr "Фігура карти мережі"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Оновлення карти мережі неуспішне."
 
@@ -11226,7 +11329,7 @@ msgstr "Карти мереж"
 msgid "Mar"
 msgstr "Бер"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Березень"
 
@@ -11253,7 +11356,7 @@ msgstr "Маска"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11324,9 +11427,9 @@ msgstr "Максимальна кількість відкритих файлі�
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Максимальна кількість процесів яку підтримує ОС. Повертає ціле число"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11340,12 +11443,12 @@ msgstr[0] "Максимальний період часу відображенн
 msgstr[1] "Максимальний період часу відображення %1$s дні."
 msgstr[2] "Максимальний період часу відображення %1$s днів."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Перевищено максимальну довжину email адреси у методу повідомлень з ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Тра"
 
@@ -11355,8 +11458,8 @@ msgid "May"
 msgstr "Травень"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Метод повідомлення"
 
@@ -11420,7 +11523,7 @@ msgstr "Тест медіа типу успішний."
 msgid "Media type updated"
 msgstr "Метод повідомлень оновлено"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Метод повідомлень з ID \"%1$s\" недоступний."
@@ -11493,8 +11596,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Таймаут повідомлення"
 
@@ -11512,7 +11615,7 @@ msgstr "Повідомлення/Команда"
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Повідомлення"
 
@@ -11540,6 +11643,11 @@ msgstr "Мін"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11555,11 +11663,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11710,7 +11813,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Пн"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Понеділок"
 
@@ -11750,11 +11853,11 @@ msgstr "Місяць"
 msgid "Monthly"
 msgstr "Щомісяця"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Знайдено більше співпадінь..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11770,6 +11873,14 @@ msgstr "Більше 10 хвилин"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Більше ніж один графік з ім'ям \"%1$s\" у вузла мережі."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11779,11 +11890,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Багатократно"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Багатократні події ПРОБЛЕМА"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Вимкнути звук"
 
@@ -11791,6 +11902,18 @@ msgstr "Вимкнути звук"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11885,25 +12008,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12046,6 +12170,10 @@ msgstr ""
 msgid "Never"
 msgstr "Ніколи"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -12057,7 +12185,7 @@ msgstr "Нова умова"
 msgid "New dashboard"
 msgstr "Нова панель"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Новий елемент"
 
@@ -12081,7 +12209,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Новий регулярний вираз"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -12098,7 +12226,7 @@ msgid "New triggers"
 msgstr "Нові тригери"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -12116,20 +12244,20 @@ msgstr "Наступний крок"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12262,7 +12390,7 @@ msgstr "Подробиці відсутні"
 msgid "No discovery rule IDs given."
 msgstr "ID правил виявлення не вказано."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12324,7 +12452,7 @@ msgstr "Немає картинки"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Інтерфейсу не знайдено"
 
@@ -12364,7 +12492,7 @@ msgstr "Макроси не знайдено."
 msgid "No maps added."
 msgstr "Карти мереж не додано."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Відповідностей не знайдено"
 
@@ -12377,8 +12505,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Тип операції не задано для кореляції \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Немає прав доступу до системи."
 
@@ -12390,7 +12518,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12398,11 +12525,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12520,19 +12648,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12541,15 +12669,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12576,7 +12704,7 @@ msgstr "Файл публічного ключа не вказано."
 msgid "No recipients for action operation message."
 msgstr "Немає отримувачів повідомлення в операції дії."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Не оновлювати"
 
@@ -12592,7 +12720,7 @@ msgstr "Ціль не обрано"
 msgid "No target selected."
 msgstr "Ціль не обрано."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12639,7 +12767,7 @@ msgstr "Немає"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12671,15 +12799,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Забороняється встановлювати пароль для користувача \"гість\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12711,8 +12839,8 @@ msgstr "Не успадковані елементи дані"
 msgid "Not supported"
 msgstr "Не підтримується"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Примітка"
 
@@ -12742,7 +12870,7 @@ msgstr "Повідомити всіх залучених"
 msgid "Nov"
 msgstr "Лис"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Листопад"
 
@@ -12905,12 +13033,12 @@ msgstr "Числові системи"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Числовий (дробове)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Числовий (ціле)"
 
@@ -12925,18 +13053,17 @@ msgstr "Числовий (ціле додатне)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12963,7 +13090,7 @@ msgstr "OOB роутер"
 msgid "OOB subnet mask"
 msgstr "OOB маска підмережі"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "АБО"
 
@@ -12991,13 +13118,13 @@ msgstr "Жов"
 msgid "Octal to decimal"
 msgstr "Вісімкове в десяткове"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Жовтень"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Вимкн"
 
@@ -13009,7 +13136,7 @@ msgstr "Вимкн"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ок"
@@ -13028,7 +13155,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "Увімк"
 
@@ -13036,7 +13163,7 @@ msgstr "Увімк"
 msgid "On status change triggers blink for"
 msgstr "Мигання тригерів при зміні стану протягом"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Один раз"
 
@@ -13053,7 +13180,7 @@ msgid "One time only"
 msgstr "Одноразово"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Однократна недоступність"
 
@@ -13065,26 +13192,14 @@ msgstr "Тільки Супер-Адміністратори можуть ств
 msgid "Only Super Admins can create media types."
 msgstr "Тільки Супер-Адміністратори можуть створювати методи повідомлень."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Тільки Супер Адміністратори можуть створювати групи користувачів."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Тільки Супер-Адміністратори можуть видаляти методи повідомлень."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Тільки Супер-Адміністратори можуть видаляти групи користувачів."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Тільки Супер-Адміністратори можуть редагувати методи повідомлень."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Тільки Супер Адміністратори можуть оновлювати групи користувачів."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Тільки Zabbix агент, SNMPv1, SNMPv2 та SNMPv3 перевірки можуть бути зроблені унікальними."
@@ -13126,11 +13241,11 @@ msgstr[0] "Тільки вибрана проблема"
 msgstr[1] "Тільки вибрані проблеми"
 msgstr[2] "Тільки вибрані проблеми"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -13163,7 +13278,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Інформація про операційну систему. Повертає рядок"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -13188,7 +13303,7 @@ msgstr "Операція не має групи для функціонуван�
 msgid "Operation has no template to operate."
 msgstr "Операція не має шаблону для функціонування."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13213,27 +13328,27 @@ msgstr "Операції"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Оператор"
 
@@ -13258,7 +13373,7 @@ msgstr "Опції"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13275,8 +13390,8 @@ msgstr "Або"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13323,9 +13438,9 @@ msgstr "Або"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Оригінальне"
 
@@ -13577,7 +13692,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМА"
@@ -13624,7 +13739,7 @@ msgstr "Ідентифікатор PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK занадто короткий. Мінімум це %1$s шістнадцяткових чисел."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13647,13 +13762,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Параметр"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13684,9 +13801,7 @@ msgstr "Батьківські елементи даних"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13775,15 +13890,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Вставити"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Вставити без зовнішніх зв'язків"
 
@@ -13857,19 +13976,20 @@ msgid "Periods"
 msgstr "Періоди"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права доступу можуть бути призначені тільки групам користувачів."
 
@@ -13891,12 +14011,12 @@ msgstr "Алгоритм розміщення"
 msgid "Plain text"
 msgstr "Текст"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Грати"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Програвати звуковий сигнал"
 
@@ -13926,7 +14046,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Будь-ласка, вкажіть ім'я хоста або IP адресу хоста та номер порту Zabbix сервера, а також ім'я інсталяції (опція)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Будь-ласка, оберіть два елементи"
 
@@ -14055,7 +14175,7 @@ msgid "Previous month"
 msgstr "Попередній місяць"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -14113,7 +14233,7 @@ msgstr "Ключова фраза приватності"
 msgid "Privacy protocol"
 msgstr "Протокол приватності"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Приватний"
@@ -14133,12 +14253,12 @@ msgid "Privilege level"
 msgstr "Рівень привілеїв"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -14168,7 +14288,7 @@ msgstr "Виникла Проблема"
 msgid "Problem display"
 msgstr "Відображення проблем"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Вираз для проблеми"
@@ -14186,7 +14306,7 @@ msgstr "Проблему не подавлено"
 msgid "Problem is suppressed"
 msgstr "Проблему подавлено"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Проблема на"
 
@@ -14199,8 +14319,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Проблему вирішено"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14213,14 +14333,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Проблема, якщо всі підлеглі мають проблеми"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Проблема, якщо хоча б у одного із підлеглих наявна проблема"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14237,7 +14349,7 @@ msgstr "Проблема, якщо хоча б у одного із підлег
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Проблеми"
 
@@ -14271,12 +14383,12 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus в JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Властивості"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14298,7 +14410,7 @@ msgstr "Проксі"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14362,7 +14474,7 @@ msgstr "Ім'я проксі"
 msgid "Proxy updated"
 msgstr "Проксі оновлено"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Публічний"
@@ -14456,8 +14568,8 @@ msgstr "Читання"
 msgid "Read only"
 msgstr "Тільки читання"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14465,8 +14577,8 @@ msgstr "Тільки читання"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14519,7 +14631,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14527,7 +14639,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Відновлення"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14562,7 +14674,7 @@ msgstr "Прямокутник"
 msgid "Refresh"
 msgstr "Оновити"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Період оновлення"
 
@@ -14624,7 +14736,7 @@ msgstr "Регулярні вирази"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14656,6 +14768,7 @@ msgstr "Віддалена команда"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14665,7 +14778,7 @@ msgstr "Віддалена команда"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14673,13 +14786,13 @@ msgstr "Віддалена команда"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14689,8 +14802,8 @@ msgstr "Віддалена команда"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14767,8 +14880,8 @@ msgstr "Віддалена команда"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Видалити"
 
@@ -14808,7 +14921,7 @@ msgstr "Видалити, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14837,7 +14950,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14845,7 +14958,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Замінити"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Замінити залежності"
 
@@ -14952,7 +15065,7 @@ msgstr "Необхідні коди статусу"
 msgid "Required string"
 msgstr "Необхідна строка"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Скинути"
@@ -14986,7 +15099,7 @@ msgstr "Скинути підтвердження"
 msgid "Reset defaults"
 msgstr "Скинути по замовчуванню"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Вирішено"
 
@@ -15184,8 +15297,8 @@ msgstr "Вісь Y справа"
 msgid "Right trim"
 msgstr "Обрізати справа"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15243,12 +15356,12 @@ msgstr "Виконує вказану команду на вузлі мереж�
 msgid "Russian (ru_RU)"
 msgstr "Російська (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Нд"
@@ -15259,10 +15372,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15475,7 +15586,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Суб"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Субота"
 
@@ -15652,7 +15763,7 @@ msgstr "Скрипт оновлено"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Скрипти"
 
@@ -15722,8 +15833,8 @@ msgid "Security name"
 msgstr "Ім'я безпеки"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15731,7 +15842,7 @@ msgstr "Ім'я безпеки"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Вибрати"
 
@@ -15767,19 +15878,19 @@ msgstr "Вибрані елементи"
 msgid "Selected items only"
 msgstr "Тільки обрані елементи даних"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Вибрано, %1$s в позиції %2$d з %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Вибрано, %1$s, тільки читання, в позиції %2$d з %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Перемістити назад"
 
@@ -15804,7 +15915,7 @@ msgstr "Надіслати тільки на"
 msgid "Send to"
 msgstr "Надіслати"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Перемістити на самий зад"
 
@@ -15837,7 +15948,7 @@ msgstr "Непідтверджені окремо"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Вересень"
 
@@ -15869,34 +15980,29 @@ msgid "Server time"
 msgstr "Час на сервері"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Послуга"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:623
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
-msgstr ""
-
-#: include/classes/api/services/CService.php:617
-#, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15904,7 +16010,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Послугу створено"
 
@@ -15934,7 +16040,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Час початку послуги має бути меншим за час закінчення."
 
@@ -15950,11 +16056,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Періоди послуги"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Тип сервісу"
 
@@ -15963,7 +16069,7 @@ msgstr "Тип сервісу"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Послугу оновлено"
 
@@ -15972,16 +16078,16 @@ msgstr "Послугу оновлено"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Послуги"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Послуги утворюють кільцеву залежність."
 
@@ -15993,9 +16099,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Сесія завершилась, будь-ласка повторно увійдіть в систему."
 
@@ -16019,10 +16125,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Встановити режим інвентарних даних вузла мережі"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -16063,7 +16177,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -16109,7 +16223,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Спільний доступ"
 
@@ -16200,7 +16314,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16251,7 +16365,7 @@ msgstr "Відображувати попередження, якщо Zabbix с�
 msgid "Show working time"
 msgstr "Відображувати робочий час"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Показана"
 
@@ -16360,7 +16474,7 @@ msgstr "Пропущено копіювання графіку \"%1$s\" у ву�
 msgid "Slovak (sk_SK)"
 msgstr "Словацька (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Подрімати"
 
@@ -16406,7 +16520,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Сортування записів за"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Порядок сортування (0->999)"
 
@@ -16480,7 +16594,7 @@ msgstr "Початок в"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16528,12 +16642,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16544,17 +16660,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16578,13 +16701,10 @@ msgstr ""
 msgid "Status"
 msgstr "Стан"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Підрахунок статусу"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Алгоритм підрахунку статусу"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16615,6 +16735,10 @@ msgstr "Тільки статус"
 msgid "Status problem"
 msgstr "Стан проблеми"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16646,8 +16770,8 @@ msgstr "Крок з іменем \"%1$s\" вже існує."
 msgid "Steps"
 msgstr "Кроки"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Стоп"
 
@@ -16659,7 +16783,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16691,7 +16815,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16724,7 +16848,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Суб'єкт"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Суб-карта"
 
@@ -16740,7 +16864,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Аудит успіхів"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "Повідомлення про успіх"
 
@@ -16753,7 +16877,7 @@ msgstr "Сумарна статистика вхідного та вихідно
 msgid "Sun"
 msgstr "Нед"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Неділя"
 
@@ -16845,12 +16969,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Час безперервної роботи системи в секундах (uptime). Повертає ціле число"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -16886,8 +17010,8 @@ msgstr "Таблиця \"%1$s\" не має поля з ім'ям \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Тег"
@@ -16927,14 +17051,13 @@ msgstr "Значення тегу"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16942,10 +17065,10 @@ msgstr "Значення тегу"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -17109,7 +17232,7 @@ msgstr "Шаблон із цим самим видимим ім'ям \"%1$s\" в
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17396,12 +17519,12 @@ msgstr "Дедуплікація"
 msgid "Thu"
 msgstr "Чет"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Четвер"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "До"
 
@@ -17411,13 +17534,13 @@ msgstr "До"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17498,7 +17621,7 @@ msgstr "Час виникнення (штамп)"
 msgid "To"
 msgstr "До"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Для встановлення інтерфейсу вузла мережі виберіть один тип елемента даних для всіх елементів даних"
 
@@ -17620,13 +17743,13 @@ msgstr "Динаміка"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Тригер"
 
@@ -17645,7 +17768,7 @@ msgstr "Тригер \"%1$s\" належить шаблонам з різним�
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Тригер \"%1$s\" залежить від тригера \"%2$s\", який не існує."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17732,7 +17855,7 @@ msgstr "Огляд тригерів"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17800,15 +17923,15 @@ msgstr "Прототипи тригера видалено"
 msgid "Trigger prototypes updated"
 msgstr "Прототипи тригерів оновлено"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Важливість тригера"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Стан тригера \"ОК\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Стан тригера \"Проблема\""
 
@@ -17860,7 +17983,7 @@ msgstr "Обрізати"
 msgid "Tue"
 msgstr "Вів"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Вівторок"
 
@@ -17873,7 +17996,7 @@ msgstr "Турецька (tr_TR)"
 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\" інвентарних даних вузла мережі, це призвело б до конфлікту."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "Необхідно вибрати два елемента карти мережі"
 
@@ -17888,15 +18011,16 @@ msgstr "Необхідно вибрати два елемента карти м�
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17963,7 +18087,7 @@ msgid "UNKNOWN"
 msgstr "НЕВІДОМО"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17973,7 +18097,7 @@ msgstr "НЕВІДОМО"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -18019,7 +18143,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL повинен мати обидва поля \"name\" та \"url\" для карти мережі \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLи"
 
@@ -18067,7 +18191,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Не вдалося перезаписати існуючий файл налаштувань."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -18114,7 +18238,8 @@ msgstr "Розблокувати вибраних користувачів?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -18133,7 +18258,8 @@ msgstr "Одиниця виміру"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -18144,9 +18270,9 @@ msgstr "Одиниця виміру"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Невідомо"
@@ -18165,12 +18291,12 @@ msgstr "Невідома помилка"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Невідомий елемент даних вузла мережі, немає цього елемента в обраному вузлі"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Невідомий вузел мережі, його не представлено в системі"
 
@@ -18217,7 +18343,7 @@ msgstr "Від'єднати від шаблону"
 msgid "Unlink from templates"
 msgstr "Від'єднати від шаблонів"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Увімк. звук"
 
@@ -18299,27 +18425,28 @@ msgstr "Доступний"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18388,7 +18515,7 @@ msgid "Upper level maps"
 msgstr "Карти верхнього рівня"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Доступний"
@@ -18437,37 +18564,37 @@ msgstr "Використовується в діях"
 msgid "User"
 msgstr "Користувач"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Користувач \"%1$s\" не може бути без групи користувачів."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "Користувач \"%1$s\" власник панелі \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Користувач \"%1$s\" є власником карти мережі \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "Користувач \"%1$s\" використовується в дії \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18484,13 +18611,13 @@ msgstr "Користувача додано"
 msgid "User agent string"
 msgstr "Рядок user agent"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Користувач не може додати сам себе у відключену групу або в групу з відключеним доступом до Веб-інтерфейсу."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18516,32 +18643,32 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Група користувачів"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Група користувачів \"%1$s\" вже існує."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Група користувачів \"%1$s\" використовується в дії \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Група користувачів \"%1$s\" використовується в налаштуваннях відправки повідомлень про недоступність бази даних."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Група користувачів \"%1$s\" використовується в скрипті \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18574,7 +18701,7 @@ msgstr[2] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Група користувачів з ID \"%1$s\" недоступна."
@@ -18582,14 +18709,14 @@ msgstr "Група користувачів з ID \"%1$s\" недоступна.
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Групи користувачів"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Користувачу не дозволено видалити самого себе."
 
@@ -18639,7 +18766,7 @@ msgstr[2] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18673,7 +18800,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "У спільного доступу користувачів відсутні параметри: %1$s для карти мережі \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18695,12 +18822,12 @@ msgstr "Дані користувача оновлено"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Користувач з ID \"%1$s\" недоступний."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18745,7 +18872,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -19012,23 +19139,23 @@ msgstr "Валідація"
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19235,8 +19362,8 @@ msgstr "Вирівнювання по вертикалі"
 msgid "Vietnamese (vi_VN)"
 msgstr "В'єтнамський (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19263,7 +19390,12 @@ msgstr "Видиме ім'я"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Видиме ім'я не може бути пустим, якщо ім'я вузла мережі відсутнє."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
@@ -19280,11 +19412,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Попередження"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Вибачте, але досягнуто максимум для запам'ятовування елементів."
 
@@ -19300,7 +19432,7 @@ msgstr "Вибачте, але досягнуто максимум для зап
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Веб"
 
@@ -19371,7 +19503,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Сер"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Середа"
 
@@ -19382,6 +19514,10 @@ msgstr "Середа"
 msgid "Weekly"
 msgstr "Щотижня"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Ласкаво просимо"
@@ -19399,7 +19535,7 @@ msgstr "Коли активно"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19612,8 +19748,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19655,19 +19791,19 @@ msgstr "Щороку"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19735,19 +19871,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "У вас немає повноважень для виконання цієї операції."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "У вас немає повноважень для створення користувачів."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "У вас недостатньо прав для доступу до цієї сторінки."
@@ -19868,7 +20000,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "очікується логічне значення"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19987,7 +20119,6 @@ msgstr "агент"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20283,9 +20414,9 @@ msgstr "неможливо змінити"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20365,7 +20496,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "кільцева залежність елементів даних не дозволена"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20412,7 +20543,7 @@ msgstr "count() - Кількість успішно отриманих знач�
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "д"
@@ -20611,13 +20742,13 @@ msgstr "глобальних налаштуваннях очистки істо�
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "г"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "гг"
 
@@ -20665,7 +20796,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "включаючи субгрупи"
 
@@ -20891,12 +21022,12 @@ msgstr "правило низькорівневого виявлення"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "хв"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -21000,8 +21131,8 @@ msgstr "max() - Мінімальне значення за період Т"
 msgid "minimum length is %1$s characters"
 msgstr "мінімальна довжина %1$s символів"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "мм"
 
@@ -21096,7 +21227,7 @@ msgstr ""
 msgid "name"
 msgstr "назва"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "новий"
 
@@ -21163,7 +21294,7 @@ msgstr "now() - Кількість секунд починаючи з Epoch"
 msgid "number"
 msgstr "число"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "із"
@@ -21231,7 +21362,7 @@ msgstr "вивід"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21358,7 +21489,7 @@ msgstr "вибрано"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "короткий опис"
 
@@ -21443,7 +21574,7 @@ msgstr "sum() - Сума значень за період Т"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "наданий обліковий запис не унікальний"
 
@@ -21453,8 +21584,8 @@ msgstr "наданий обліковий запис не унікальний"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21535,7 +21666,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "зсув часу"
 
@@ -21598,7 +21729,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "почніть друкувати для пошуку"
 
@@ -21625,7 +21756,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21719,7 +21850,7 @@ msgstr "непідтримуваний номер версії"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21739,7 +21870,7 @@ msgstr "непідтримуваний номер версії"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "значення"
 
@@ -21886,7 +22017,7 @@ msgstr "помилковий тип правила виявлення"
 msgid "wrong item type"
 msgstr "помилковий тип елементу даних"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "р"
diff --git a/ui/locale/vi/LC_MESSAGES/frontend.po b/ui/locale/vi/LC_MESSAGES/frontend.po
index 07780a0a24b..24ecad6d4a4 100644
--- a/ui/locale/vi/LC_MESSAGES/frontend.po
+++ b/ui/locale/vi/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -93,7 +93,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d ngày"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -171,7 +171,7 @@ msgstr[0] "%1$s tin nhắn "
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -183,7 +183,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "Trạng thái phần tử %1$s của %2$s gặp vấn đề"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -210,16 +210,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "%1$s thử lại "
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s giây"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -238,13 +238,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Chặt chẽ, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, chỉ đọc"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -291,7 +291,7 @@ msgstr "(không proxy)"
 msgid "0 - use default port"
 msgstr "0 - Cổng sử dụng mặc định"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 hoặc 1"
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "Thêm đè lên"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "VÀ"
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -438,40 +438,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "Truy cập bị từ chối"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "Truy cập bị từ chối!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "Ghi nhận"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "Ghi nhận"
 
@@ -479,7 +479,7 @@ msgstr "Ghi nhận"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Đã ghi nhận"
@@ -508,20 +508,22 @@ msgstr " Sự kiện được ghi nhận giải quyết"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -624,7 +626,7 @@ msgstr "Hành động đã cập nhật"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -633,7 +635,7 @@ msgstr "Hành động đã cập nhật"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Hành động"
@@ -692,8 +694,8 @@ msgstr "Kích hoạt"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -704,7 +706,6 @@ msgstr "Kích hoạt"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -712,11 +713,13 @@ msgstr "Kích hoạt"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -728,15 +731,17 @@ msgstr "Kích hoạt"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -803,7 +808,7 @@ msgstr "Kích hoạt"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "Add"
 
@@ -811,19 +816,19 @@ msgstr "Add"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "Thêm một ô điều khiển mới"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "Thêm phần tử con"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -840,7 +845,7 @@ msgstr "Thêm host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "Thêm nhiều sơ đồ "
 
@@ -857,7 +862,11 @@ msgstr ""
 msgid "Add new override"
 msgstr "Ghi đè"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -865,7 +874,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -899,7 +908,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "Thêm ô điều khiển"
 
@@ -908,12 +917,20 @@ msgstr "Thêm ô điều khiển"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "Đã thêm, %1$s"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "Quản trị"
@@ -923,6 +940,10 @@ msgstr "Quản trị"
 msgid "Administration"
 msgstr "Quản trị"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "Nhãn nâng cao"
@@ -1009,7 +1030,7 @@ msgstr "Sắp xếp phần tử sơ đồ"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "Tất cả"
 
@@ -1018,8 +1039,8 @@ msgid "All dashboards"
 msgstr "Tất cả bảng điều khiển"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "Tất cả nhóm"
 
@@ -1027,7 +1048,7 @@ msgstr "Tất cả nhóm"
 msgid "All hosts"
 msgstr "Tất cả máy chủ"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tất cả các đường dẫn phải có \"Tên\" và \"URL\""
 
@@ -1061,7 +1082,7 @@ msgstr "Tất cả mẫu"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1074,7 +1095,7 @@ msgstr "Cho phép đóng bằng tay"
 msgid "Allowed hosts"
 msgstr "Những host được phép"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1092,7 +1113,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1133,12 +1154,12 @@ msgstr "Và/Hoặc"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1158,15 +1179,15 @@ msgstr "Lỗi ứng dụng."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "Áp dụng"
 
@@ -1184,7 +1205,7 @@ msgstr "Đang tiếp cận"
 msgid "Apr"
 msgstr "Tháng Tư"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "Tháng tư"
 
@@ -1212,6 +1233,10 @@ msgstr "Loại vùng"
 msgid "Arithmetic"
 msgstr "Số học"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "dạng text"
@@ -1264,8 +1289,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1343,7 +1368,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Th8"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "Tháng 8"
 
@@ -1373,7 +1398,7 @@ msgstr "Xác thực"
 msgid "Authentication algorithm"
 msgstr "Thuật toán xác thực"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "Xác thực lỗi: %1$s."
@@ -1422,7 +1447,7 @@ msgstr "Tự động"
 msgid "Auto-login"
 msgstr "Tự động đăng nhập"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "Tùy chọn đăng nhập tự động hoặc đăng xuất tự động không thể bật cùng một lúc."
 
@@ -1432,7 +1457,7 @@ msgstr "Tự động đăng xuất"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1617,11 +1642,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Dưới"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "Đưa ra phía trước"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "Đặt phía trước"
 
@@ -1702,7 +1727,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Tính toán"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "Lịch"
 
@@ -1722,8 +1747,8 @@ msgstr "Gọi lại"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1740,8 +1765,8 @@ msgstr "Gọi lại"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
@@ -1771,7 +1796,7 @@ msgstr "Không thể thêm hành động"
 msgid "Cannot add correlation"
 msgstr "Không thể thêm liên kết"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1782,7 +1807,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "Không thể thêm quan hệ phụ thuộc từ host đến template"
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Không thể thêm quan hệ phụ thuộc từ trigger \"%1$s:%2$s\" đến trigger không tồn tại \"%3$s:%4$s\"."
@@ -1900,7 +1925,7 @@ msgid "Cannot add user"
 msgstr "Không thể thêm người dùng"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1908,11 +1933,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "Không thể thêm web scenario"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1990,7 +2015,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] "Không thể sao chép trigger"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Không thể sao chép trigger \"%1$s:%2$s\", bởi vì nó có nhiều host trong biểu thức."
@@ -2044,7 +2069,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Không thể xóa người dùng zabbix nội bộ \"%1$s\", thử vô hiệu hóa người dùng nào đó."
@@ -2427,7 +2452,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "Không thể mở rộng bộ lệnh."
 
@@ -2595,7 +2620,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Không thể đọc các câu trả lời, kiểm tra kết nối với zabbix server \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "Không thể đổi tên người dùng khách."
 
@@ -2716,7 +2741,12 @@ msgstr "Không thể đặt lại các trường inventory khi vô hiệu h
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3132,6 +3162,7 @@ msgid "Change per second"
 msgstr "Thay đổi trên giây"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "Thay đổi mức độ bảo mật"
 
@@ -3273,7 +3304,7 @@ msgstr "Kiểm tra performance của dịch vụ UDP. Trả về 0 - Dịch vụ
 msgid "Checks should be unique."
 msgstr "Kiểm tra phải là duy nhất."
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3315,11 +3346,11 @@ msgstr "Xóa lịch sử và phương hướng."
 msgid "Clear when unlinking"
 msgstr "Xóa khi không liên kết"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr "Nhấp và kéo đến kích thước mong muốn."
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3349,7 +3380,7 @@ msgstr "Đồng hồ"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "Tạo bản sao"
 
@@ -3360,8 +3391,8 @@ msgstr "Tạo bản sao"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "Đóng"
 
@@ -3391,8 +3422,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "Thu hẹp"
 
@@ -3409,7 +3440,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3477,6 +3508,7 @@ msgstr "Các phiên làm việc đồng thời"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "Điều kiện"
 
@@ -3531,7 +3563,7 @@ msgstr "Các điều kiện"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "Cấu hình"
 
@@ -3794,7 +3826,7 @@ msgstr "Liên lạc"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3831,8 +3863,8 @@ msgstr "Chứa"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3893,8 +3925,8 @@ msgstr "Tọa độ"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "Sao chép"
 
@@ -4022,11 +4054,11 @@ msgstr "Tạo liên kết"
 msgid "Create dashboard"
 msgstr "Tạo bảng điều khiển"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "Tạo item phụ thuộc"
 
@@ -4143,7 +4175,7 @@ msgstr "Tạo bản đồ"
 msgid "Create media type"
 msgstr "Tạo media type"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "Tạo mới"
 
@@ -4159,7 +4191,7 @@ msgstr ""
 msgid "Create script"
 msgstr "Tạo script"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4167,7 +4199,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Tạo template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "Tạo trigger"
 
@@ -4386,7 +4418,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "Thuộc tính bảng điều khiển"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "Bảng điều khiển chia sẻ"
 
@@ -4416,7 +4448,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "Bảng điều khiển"
 
@@ -4586,7 +4618,7 @@ msgstr "Ngày trong tuần "
 msgid "Days"
 msgstr "Các ngày"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "Gỡ lỗi"
 
@@ -4600,7 +4632,7 @@ msgstr "Chế độ gỡ lỗi"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "Tháng 12"
 
@@ -4609,13 +4641,17 @@ msgstr "Tháng 12"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "Mặc định"
 
@@ -4685,8 +4721,8 @@ msgid "Delayed by"
 msgstr "Trễ bởi"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4700,7 +4736,7 @@ msgstr "Trễ bởi"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4732,8 +4768,8 @@ msgstr "Trễ bởi"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "Xóa"
 
@@ -4762,7 +4798,7 @@ msgstr "Xóa hành động hiện tại?"
 msgid "Delete current correlation?"
 msgstr "Xóa sự liên kết hiện tại?"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "Xóa bảng điều khiển?"
 
@@ -4806,7 +4842,7 @@ msgstr "Xóa kiểu item?"
 msgid "Delete item?"
 msgstr "Xóa item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "Xóa liên kết giữa các phần tử được chọn?"
 
@@ -4862,7 +4898,7 @@ msgstr "Xóa bảng điều khiển đã chọn"
 msgid "Delete selected discovery rules?"
 msgstr "Xóa các quy tắc phát hiện được chọn?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "Xóa các phần tử được chọn?"
 
@@ -4963,11 +4999,11 @@ msgstr "Xóa các script được chọn?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "Xóa hình đã chọn?"
 
@@ -4983,7 +5019,7 @@ msgstr "Xóa các kiểu trigger được chọn?"
 msgid "Delete selected triggers?"
 msgstr "Xóa các trigger được chọn?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "Xóa người dùng được chọn?"
 
@@ -5034,7 +5070,7 @@ msgstr "Đã xóa: Template \"%1$s\"."
 msgid "Delimiter"
 msgstr "Bộ giới hạn"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5048,7 +5084,7 @@ msgstr "Từ chối"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5056,7 +5092,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Quan hệ phụ thuộc"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "Phụ thuộc"
 
@@ -5064,7 +5100,7 @@ msgstr "Phụ thuộc"
 msgid "Dependent item"
 msgstr "Item phụ thuộc"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5092,7 +5128,7 @@ msgstr "Trạng thái triển khai"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5256,7 +5292,7 @@ msgstr "Vô hiệu hóa web scenario đã chọn?"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5269,14 +5305,14 @@ msgstr "Vô hiệu hóa web scenario đã chọn?"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5359,7 +5395,7 @@ msgid "Discovery by proxy"
 msgstr "Phát hiện bởi proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Kiểm tra phát hiện"
 
@@ -5371,7 +5407,7 @@ msgstr "Các kiểm tra phát hiện"
 msgid "Discovery list"
 msgstr "Danh sách phát hiện"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Đối tượng phát hiện"
 
@@ -5468,7 +5504,7 @@ msgstr "Quy tắc phát hiện đã cập nhật"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5479,7 +5515,7 @@ msgstr "Các quy tắc phát hiện"
 msgid "Discovery rules deleted"
 msgstr "Các quy tắc phát hiện đã xóa"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Trạng thái phát hiện"
@@ -5519,7 +5555,7 @@ msgstr "Hiển thị sơ đồ xếp chồng"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Hiển thị %1$s của %2$s đã tìm được"
@@ -5537,10 +5573,6 @@ msgstr "Hiển thị tùy chọn"
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "Không tính toán"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5555,7 +5587,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Bạn có muốn thay thế biểu thức điều kiện không?"
 
@@ -5611,7 +5643,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5620,7 +5652,7 @@ msgid "Download the configuration file"
 msgstr "Tải xuống tệp tin cấu hình"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "Thời gian down"
@@ -5696,7 +5728,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "Tạo bản sao id người dùng \"%1$s\" trong người dùng cho sơ đồ \"%2$s\"."
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5718,7 +5750,7 @@ msgstr "Item động"
 msgid "Dynamic items"
 msgstr "Item động"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Mỗi URL cần có một tên duy nhất. Xin chắc chắn chỉ có một URl có tên"
 
@@ -5726,13 +5758,14 @@ msgstr "Mỗi URL cần có một tên duy nhất. Xin chắc chắn chi�
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5744,8 +5777,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "Chỉnh sửa"
 
@@ -5761,11 +5794,11 @@ msgstr "Chỉnh sửa sơ đồ"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "Chỉnh sửa phần tử cây"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "Chỉnh sửa trigger"
 
@@ -6040,7 +6073,7 @@ msgstr "Kích hoạt trap"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6062,12 +6095,12 @@ msgstr "Kích hoạt trap"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6126,7 +6159,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6150,7 +6183,7 @@ msgstr "Lỗi"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Lỗi trong yêu cầu tìm kiếm cho bảng \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "Tin nhắn lỗi"
 
@@ -6189,7 +6222,7 @@ msgstr "Quy tắc liên kết sự kiện"
 msgid "Event details"
 msgstr "Chi tiết sự kiện"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "Tạo ra sự kiện"
 
@@ -6219,7 +6252,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "Cặp thẻ sự kiện"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Kiểu sự kiện"
 
@@ -6252,7 +6285,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "Loại trừ"
 
@@ -6263,7 +6296,7 @@ msgstr "Loại trừ"
 msgid "Exclude host groups"
 msgstr "Loại trừ các nhóm máy chủ"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "Thực hiện"
 
@@ -6309,7 +6342,7 @@ msgstr "Thực thi"
 msgid "Executed script"
 msgstr "Câu lệnh đã thực hiện"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "Thực hiện xá nhận"
 
@@ -6325,8 +6358,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "Mở rộng"
 
@@ -6393,7 +6426,7 @@ msgstr "Export thành CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6447,7 +6480,7 @@ msgstr "Các biểu thức"
 msgid "External check"
 msgstr "Kiểm tra bên ngoài"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6471,7 +6504,7 @@ msgid "Failed"
 msgstr "Đã thất bại"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "Không thể tạo bảng điều khiển"
 
@@ -6480,24 +6513,24 @@ msgstr "Không thể tạo bảng điều khiển"
 msgid "Failed to parse URL."
 msgstr "Không thể phân tích cú pháp URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "Không thể cập nhật bảng điều khiển"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6505,7 +6538,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Không thể cập nhật mẫu."
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6529,7 +6562,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Tháng 2"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "Tháng 2"
 
@@ -6675,8 +6708,8 @@ msgstr "Khu vực được tô kín"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6754,6 +6787,10 @@ msgstr "Ăn khớp với bản đồ"
 msgid "Fixed"
 msgstr "Đã sửa lỗi"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6819,14 +6856,14 @@ msgstr "Pháp(fr_FR)"
 msgid "Fri"
 msgstr "Thứ sáu"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "Thứ sáu"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6844,7 +6881,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Truy cập Frontend"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "Thông điệp frontend"
 
@@ -6926,7 +6963,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "Biểu thức đã cho không phải là một macro"
 
@@ -6944,7 +6981,7 @@ msgstr "Giá trị toàn cục"
 msgid "Go back to %1$s"
 msgstr "Quay trở về %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "Đi tới"
 
@@ -6993,7 +7030,7 @@ msgstr "Đường độ dốc"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7153,7 +7190,7 @@ msgstr "Đồ thị với tên \"%1$s\" đã tồn tại trong số các �
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "Đồ thị"
 
@@ -7352,11 +7389,11 @@ msgstr "Trợ giúp"
 msgid "Hexadecimal to decimal"
 msgstr "Thập lục phân đến thập phân"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "Ẩn"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "Ẩn gỡ lỗi"
 
@@ -7401,14 +7438,14 @@ msgstr "Làm nổi bật toàn bộ hàng"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "Lịch sử"
 
@@ -7472,7 +7509,7 @@ msgstr "Sắp xếp theo chiều ngang"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7480,8 +7517,7 @@ msgstr "Sắp xếp theo chiều ngang"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7493,7 +7529,7 @@ msgstr "Sắp xếp theo chiều ngang"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7570,7 +7606,7 @@ msgstr[0] "Host được kích hoạtCác host được kích hoạt"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7578,7 +7614,7 @@ msgstr[0] "Host được kích hoạtCác host được kích hoạt"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "Nhóm host"
@@ -7609,7 +7645,7 @@ msgstr "Kiểu nhãn nhóm host"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Nhóm máy chủ với ID \"%1$s\" không sẵn sàng."
@@ -7626,7 +7662,7 @@ msgstr "Nhóm máy chủ với ID \"%1$s\" không sẵn sàng."
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7665,7 +7701,7 @@ msgstr "Giao diện host"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7812,7 +7848,7 @@ msgstr "Host với cùng một tên hiển thị \"%1$s\" đã tồn tại
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8044,14 +8080,64 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "Nhận dạng hệ thống. Trả về kiểu string"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Nếu bạn nghĩ rằng tin nhắn này là sai, xin vui lòng tham khảo ý kiên các quản trị viên của bạn về việc nhận các điều khoản cần thiết."
@@ -8060,12 +8146,16 @@ msgstr "Nếu bạn nghĩ rằng tin nhắn này là sai, xin vui lòng t
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "Hình ảnh"
 
@@ -8195,7 +8285,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8208,11 +8298,11 @@ msgstr "Sơ đồ không thể tiếp cận"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "Mẫu không thể tiếp cận"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "Trigger không thể tiếp cận"
 
@@ -8238,7 +8328,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "Bao gồm"
 
@@ -8256,6 +8346,11 @@ msgstr "Bao gồm các nhóm nhỏ"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Thống kê lưu lượng truy cập đến interface mạng. Trả về kiểu trigger"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8646,7 +8741,7 @@ msgstr "Kiểu điều kiện lọc không chính xác cho hoạt động \"%1$s
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "Hàm được sử dụng không chính xác."
 
@@ -8703,7 +8798,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Key item \"%1$s\" không chính xác được cung cấp cho biểu thức trigger trên \"%2$s\"."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "Kiểu giá trị item không chính xác"
 
@@ -8734,7 +8829,7 @@ msgstr "ID loại phương tiện không chính xác."
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "Phương pháp \"%1$s.%2$s\" không chính xác."
@@ -8874,10 +8969,10 @@ msgstr "ID người dùng không chính xác được chỉ định cho sơ đ�
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "ID nhóm người dùng không chính xác được chỉ định cho sơ đồ \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9184,9 +9279,9 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9258,6 +9353,10 @@ msgstr "Giá trị không chính xác được sử dụng cho trường PSK. N�
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Giá trị được sử dụng cho trạng thái proxy \"%1$s\" không chính xác."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "Indonesian (id_ID)"
@@ -9269,12 +9368,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9347,7 +9446,7 @@ msgid "Insert"
 msgstr "Chèn"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "Chèn biểu thức"
 
@@ -9455,7 +9554,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9503,7 +9602,7 @@ msgstr "Ngày kiểm kê."
 msgid "Invalid email address \"%1$s\"."
 msgstr "Địa chỉ email không hợp lệ \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "Địa chỉ email không hợp lệ cho loại phương tiện với ID \"%1$s\"."
@@ -9606,8 +9705,8 @@ msgstr "Phương pháp tham số không hợp lệ."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9811,7 +9910,7 @@ msgstr "Khoảng thời gian không hợp lệ."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "Kiểm kê"
 
@@ -9997,7 +10096,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10158,7 +10257,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Tháng 1"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "Tháng 1"
 
@@ -10180,7 +10279,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Tháng 7"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "Tháng 7"
 
@@ -10188,7 +10287,7 @@ msgstr "Tháng 7"
 msgid "Jun"
 msgstr "Tháng 6"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "Tháng 6"
 
@@ -10222,7 +10321,7 @@ msgstr "Key"
 msgid "Key passphrase"
 msgstr "Key passphrase"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "Từ khóa"
 
@@ -10292,7 +10391,7 @@ msgstr "Vị trí nhãn"
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10365,11 +10464,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Lần kiểm tra cuối cùng"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "Đồ thị giờ cuối cuối cùng"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "Đồ thị tháng cuối cùng"
 
@@ -10407,7 +10506,7 @@ msgstr ""
 msgid "Last value"
 msgstr "Giá trị cuối cùng"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "Đồ thị tuần cuối cùng"
 
@@ -10420,11 +10519,11 @@ msgstr "Đồ thị tuần cuối cùng"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "Dữ liệu gần đây nhất"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "Các giá trị gần đây nhất"
 
@@ -10535,7 +10634,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10613,12 +10712,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "Danh sách chia sẻ nhóm người dùng"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "Danh sách chia sẻ người dùng"
@@ -10746,7 +10845,7 @@ msgstr "Quy tắc phát hiện mức độ thấp ở trạng thái \"kh
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10906,7 +11005,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10935,7 +11034,7 @@ msgstr "Hướng dẫn bị đóng"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "Bản đồ"
 
@@ -10974,7 +11073,7 @@ msgstr "Vị trí nhãn phần tử sơ đồ "
 msgid "Map element label type"
 msgstr "Loại nhãn phần tử bản đồ"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11000,7 +11099,7 @@ msgstr "Chủ sở hữu sơ đồ không thể để trống."
 msgid "Map shape"
 msgstr "Hình sơ đồ"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "Cập nhật sơ đồ bị lỗi."
 
@@ -11036,7 +11135,7 @@ msgstr "Các bản đồ"
 msgid "Mar"
 msgstr "Tháng 3"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "Tháng 3"
 
@@ -11063,7 +11162,7 @@ msgstr "Mặt nạ"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11134,9 +11233,9 @@ msgstr "Số lượng tệp mở tối đa được hỗ trợ bởi HĐH. Trả
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "Số lượng tiến trình tối thiểu được hỗ trợ bởi HĐH. Trả về kiểu integer"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11148,12 +11247,12 @@ msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "Chu kỳ thời gian tối đa để hiển thị là %1$s ngày."
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Tổng chiều dài tối đa của địa chỉ email vượt quá đối với loại phương tiện có ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "Tháng 5"
 
@@ -11163,8 +11262,8 @@ msgid "May"
 msgstr "Tháng 5"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11222,7 +11321,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "Loại phương tiện đã được cập nhật"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "Kiểu phương tiện với ID \"%1$s\" là không sẵn sàng."
@@ -11295,8 +11394,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "Thời hạn tin nhắn"
 
@@ -11314,7 +11413,7 @@ msgstr "Tin nhắn/Lệnh"
 msgid "Messages"
 msgstr "Các tin nhắn"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "Viết tin nhắn"
 
@@ -11342,6 +11441,11 @@ msgstr "Tối thiểu"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11357,11 +11461,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11502,7 +11601,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Thứ 2"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "Thứ 2"
 
@@ -11542,11 +11641,11 @@ msgstr "Tháng"
 msgid "Monthly"
 msgstr "Hàng tháng"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "Tìm thấy nhiều kết quả phù hợp hơn..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11562,6 +11661,14 @@ msgstr "Nhiều hơn 10 phút"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Nhiều hơn một đồ thị với tên \"%1$s\" trong host."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11571,11 +11678,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "Nhiều"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "Nhiều sự kiện có vấn đề"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "Tắt tiếng"
 
@@ -11583,6 +11690,18 @@ msgstr "Tắt tiếng"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11677,25 +11796,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11838,6 +11958,10 @@ msgstr ""
 msgid "Never"
 msgstr "Không bao giờ"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11849,7 +11973,7 @@ msgstr "Điều kiện mới"
 msgid "New dashboard"
 msgstr "Bảng điều khiển mới"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "Phần tử mới"
 
@@ -11873,7 +11997,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Biểu thức chính quy mới"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11890,7 +12014,7 @@ msgid "New triggers"
 msgstr "Trigger mới"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -11908,20 +12032,20 @@ msgstr "Bước tiếp theo"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12054,7 +12178,7 @@ msgstr "Không có thông tin chi tiết"
 msgid "No discovery rule IDs given."
 msgstr "Không có quy tắc phát hiện các ID cho."
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12116,7 +12240,7 @@ msgstr "Không có hình ảnh"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "Không tìm thấy interface "
 
@@ -12156,7 +12280,7 @@ msgstr "Không tìm thấy macro nào."
 msgid "No maps added."
 msgstr "Bản đồ không được thêm vào."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "Không khớp với kết quả nào "
 
@@ -12169,8 +12293,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "Không có loại hoạt động nào được đưa ra cho liên kết \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "Không có quyền truy cập hệ thống."
 
@@ -12182,7 +12306,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12190,11 +12313,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12312,19 +12436,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12333,15 +12457,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12368,7 +12492,7 @@ msgstr "Không quy định được khóa tập tin công khai."
 msgid "No recipients for action operation message."
 msgstr "Không có người nhận khi gửi nhắn tin."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "Không làm mới"
 
@@ -12384,7 +12508,7 @@ msgstr "Không có mục tiêu nào được chọn"
 msgid "No target selected."
 msgstr "Không có mục tiêu nào được chọn."
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12431,7 +12555,7 @@ msgstr "Không có"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12463,15 +12587,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Không được phép đặt lại mật khẩu cho người dùng \"guest\"."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12503,8 +12627,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Không được hỗ trợ"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Ghi chú"
 
@@ -12534,7 +12658,7 @@ msgstr "Thống báo tất cả các vấn đề"
 msgid "Nov"
 msgstr "Tháng 11"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "Tháng 11"
 
@@ -12697,12 +12821,12 @@ msgstr "Hệ thống số"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "Số (float)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "Số lượng (integer)"
 
@@ -12717,18 +12841,17 @@ msgstr "Số (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "OK"
@@ -12755,7 +12878,7 @@ msgstr "Bộ định tuyến OOB"
 msgid "OOB subnet mask"
 msgstr "Mặt nạ subnet OOB"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "HOẶC"
 
@@ -12783,13 +12906,13 @@ msgstr "Tháng 10"
 msgid "Octal to decimal"
 msgstr "Bát phân đến thập phân"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "Tháng 10"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "Off"
 
@@ -12801,7 +12924,7 @@ msgstr "Off"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
@@ -12820,7 +12943,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "On"
 
@@ -12828,7 +12951,7 @@ msgstr "On"
 msgid "On status change triggers blink for"
 msgstr "Thay đổi trạng thái trigger trong nháy mắt"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "Một lần"
 
@@ -12845,7 +12968,7 @@ msgid "One time only"
 msgstr "Một lần duy nhất"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Một lần downtime"
 
@@ -12857,26 +12980,14 @@ msgstr "Chỉ các Super Admin mới có thể tạo các nhóm host."
 msgid "Only Super Admins can create media types."
 msgstr "Chỉ các Super Admin mới có thể tạo các media type."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "Chỉ Siêu Admin mới có thể tạo nhóm người dùng."
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "Chỉ các Super Admin mới có thể xóa các media type."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "Chỉ các Super Admin mới có thể xóa các nhóm người dùng."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "Chỉ các Super Admin mới có thể chỉnh sửa các media type."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "Chỉ Siêu Admin mới có thể cập nhật nhóm người dùng."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Chỉ có Zabbix agent, SNMPv1, SNMPv2 và SNMPv3 có thể được tạo thành duy nhất."
@@ -12916,11 +13027,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] "Chỉ có một vấn đề được chọn"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12953,7 +13064,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Thông tin hệ điều hành. Trả về kiểu string"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -12978,7 +13089,7 @@ msgstr "Thao tác không có nhóm để hoạt động."
 msgid "Operation has no template to operate."
 msgstr "Thao tác không có template để hoạt động."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13003,27 +13114,27 @@ msgstr "Các thao tác"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Người thao tác"
 
@@ -13048,7 +13159,7 @@ msgstr "Tùy chọn"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13065,8 +13176,8 @@ msgstr "Hoặc"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13113,9 +13224,9 @@ msgstr "Hoặc"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "Gốc"
 
@@ -13367,7 +13478,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "PROBLEM"
@@ -13414,7 +13525,7 @@ msgstr "Danh tính PSK"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK quá ngắn. Tối thiểu là %1$s hex-digits."
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13437,13 +13548,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "Tham số"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13474,9 +13587,7 @@ msgstr "Các item gốc"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13565,15 +13676,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "Dán"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "Dán mà không cần liên kết bên ngoài"
 
@@ -13647,19 +13762,20 @@ msgid "Periods"
 msgstr "Các chu kỳ"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "Quyền truy cập"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "Quyền truy cập có thể chỉ được gán cho nhóm người dùng."
 
@@ -13681,12 +13797,12 @@ msgstr "Đặt thuật toán"
 msgid "Plain text"
 msgstr "Văn bản gốc"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "Phát"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "Phát âm thanh"
 
@@ -13716,7 +13832,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Vui lòng nhập tên máy chủ hoặc địa chỉ IP máy chủ và số cổng của máy chủ Zabbix, cũng như tên cài đặt (tùy chọn)."
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "Xin vui lòng lựa chọn 2 phần tử"
 
@@ -13845,7 +13961,7 @@ msgid "Previous month"
 msgstr "quay lại tháng trước"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13903,7 +14019,7 @@ msgstr "Bảo mật mật khẩu"
 msgid "Privacy protocol"
 msgstr "Giao thức riêng"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Riêng"
@@ -13923,12 +14039,12 @@ msgid "Privilege level"
 msgstr "Cấp đặc quyền"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13958,7 +14074,7 @@ msgstr "Vấn đề được tạo"
 msgid "Problem display"
 msgstr "Hiển thị vấn đề"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "Biểu thức vấn đề"
@@ -13976,7 +14092,7 @@ msgstr "Vấn đề không được triệt tiêu"
 msgid "Problem is suppressed"
 msgstr "Vấn đề được triệt tiêu"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "Vấn đề"
 
@@ -13989,8 +14105,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Vấn đề được giải quyết"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14003,14 +14119,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "Problem, nếu tất cả các phần tử con đều có sự cố"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "Vấn đề, nếu ít nhất một phần tử con có vấn đề"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14027,7 +14135,7 @@ msgstr "Vấn đề, nếu ít nhất một phần tử con có vấn
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "Các vấn đề"
 
@@ -14061,12 +14169,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14088,7 +14196,7 @@ msgstr "Proxies"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14150,7 +14258,7 @@ msgstr "Tên proxy"
 msgid "Proxy updated"
 msgstr "Proxy đã được cập nhật"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "Công khai"
@@ -14244,8 +14352,8 @@ msgstr "Đọc"
 msgid "Read only"
 msgstr "Chỉ đọc"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14253,8 +14361,8 @@ msgstr "Chỉ đọc"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14307,7 +14415,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14315,7 +14423,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "Sự phục hồi"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14350,7 +14458,7 @@ msgstr "Hình chữ nhật"
 msgid "Refresh"
 msgstr "làm mới"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "Làm mới thời gian"
 
@@ -14410,7 +14518,7 @@ msgstr "Các biểu thức chính quy"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14442,6 +14550,7 @@ msgstr "Lệnh từ xa"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14451,7 +14560,7 @@ msgstr "Lệnh từ xa"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14459,13 +14568,13 @@ msgstr "Lệnh từ xa"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14475,8 +14584,8 @@ msgstr "Lệnh từ xa"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14553,8 +14662,8 @@ msgstr "Lệnh từ xa"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "Gỡ bỏ"
 
@@ -14594,7 +14703,7 @@ msgstr "Xóa, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14623,7 +14732,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14631,7 +14740,7 @@ msgstr ""
 msgid "Replace"
 msgstr "Thay thế"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "Thay thế quan hệ phụ thuộc"
 
@@ -14738,7 +14847,7 @@ msgstr "Các mã trạng thái được yêu cầu"
 msgid "Required string"
 msgstr "Chuỗi được yêu cầu"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Phục hồi"
@@ -14772,7 +14881,7 @@ msgstr "Phục hồi xác nhận"
 msgid "Reset defaults"
 msgstr "Phục hồi mặc định"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "Đã giải quyết"
 
@@ -14970,8 +15079,8 @@ msgstr "Trục phải Y"
 msgid "Right trim"
 msgstr "Cắt bên phải"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15029,12 +15138,12 @@ msgstr "Chạy lệnh được chỉ định trên máy chủ. Trả về kết
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15045,10 +15154,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15261,7 +15368,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Thứ bảy"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "Thứ bảy"
 
@@ -15430,7 +15537,7 @@ msgstr "Script đã được cập nhật"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "Các Script"
 
@@ -15500,8 +15607,8 @@ msgid "Security name"
 msgstr "Tên bảo mật"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15509,7 +15616,7 @@ msgstr "Tên bảo mật"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "Lựa chọn"
 
@@ -15545,19 +15652,19 @@ msgstr "Các phần tử đã chọn"
 msgid "Selected items only"
 msgstr "Chỉ item được chọn"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Đã chọn, %1$s ở vị trí %2$d của %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Đã chọn, %1$s, chỉ đọc, ở vị trí %2$d của %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "Gửi trở lại"
 
@@ -15582,7 +15689,7 @@ msgstr "Chỉ gửi đến"
 msgid "Send to"
 msgstr "Gửi tới"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "Gửi lại"
 
@@ -15615,7 +15722,7 @@ msgstr "Bị ngăn cách"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "Tháng 9"
 
@@ -15647,34 +15754,29 @@ msgid "Server time"
 msgstr "thời gian máy chủ"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "Dịch vụ"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15682,7 +15784,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "Dịch vụ được tạo"
 
@@ -15710,7 +15812,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "Thời gian bắt đầu dịch vụ phải ít hơn so với thời gian kết thúc."
 
@@ -15726,11 +15828,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "Thời gian dịch vụ"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Kiểu dịch vụ"
 
@@ -15739,7 +15841,7 @@ msgstr "Kiểu dịch vụ"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "Dịch vụ được cập nhật"
 
@@ -15748,16 +15850,16 @@ msgstr "Dịch vụ được cập nhật"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "Các dịch vụ"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "Các dịch vụ tạo thành một quan hệ phụ thuộc vòng tròn."
 
@@ -15769,9 +15871,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "Kết thúc phiên làm việc, hãy đăng nhập lại."
 
@@ -15795,10 +15897,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Đặt chế độ kiểm kê máy chủ"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15839,7 +15949,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15885,7 +15995,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "Chia sẻ"
 
@@ -15976,7 +16086,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16027,7 +16137,7 @@ msgstr "Hiển thị cảnh báo nếu máy chủ Zabbix không hoạt đô�
 msgid "Show working time"
 msgstr "Hiển thị thời gian làm việc"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "Đã hiển thị"
 
@@ -16136,7 +16246,7 @@ msgstr "Sao chép đồ thị \"%1$s\" đến host \"%2$s\" được bỏ qu
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Snooze"
 
@@ -16182,7 +16292,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Sắp xếp mục bởi"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "Sắp sếp theo thứ tự (0->999)"
 
@@ -16256,7 +16366,7 @@ msgstr "Bắt đầu"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16304,12 +16414,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16320,17 +16432,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16354,13 +16473,10 @@ msgstr ""
 msgid "Status"
 msgstr "Trạng thái"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "Tính toán trạng thái"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "Thuật toán tính toán trạng thái"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16391,6 +16507,10 @@ msgstr "Chỉ trạng thái"
 msgid "Status problem"
 msgstr "Trạng thái vấn đề"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16422,8 +16542,8 @@ msgstr "Bước có tên \"%1$s\" đã tồn tại."
 msgid "Steps"
 msgstr "Các bước"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "Dừng lại"
 
@@ -16435,7 +16555,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16467,7 +16587,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16500,7 +16620,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Chủ đề"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "Submap"
 
@@ -16516,7 +16636,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Kiểm nghiệm thành công"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "Tin chắn thành công"
 
@@ -16529,7 +16649,7 @@ msgstr "Tổng số thống kê lưu lượng đến và đi trên interface. Tr
 msgid "Sun"
 msgstr "Chủ nhật"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "Chủ nhật"
 
@@ -16621,12 +16741,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Thời gian chạy hệ thống tính bằng giây. Trả về kiểu integer"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16662,8 +16782,8 @@ msgstr "Bảng \"%1$s\" Không có trường đươc đặt tên \"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tag"
@@ -16703,14 +16823,13 @@ msgstr "Thẻ giá trị"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16718,10 +16837,10 @@ msgstr "Thẻ giá trị"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16885,7 +17004,7 @@ msgstr "Template với cùng tên hiển thị \"%1$s\" đã tồn tại. "
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17168,12 +17287,12 @@ msgstr ""
 msgid "Thu"
 msgstr "Thứ 5"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "Thứ năm"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "Cho tới"
 
@@ -17183,13 +17302,13 @@ msgstr "Cho tới"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17270,7 +17389,7 @@ msgstr "Nhãn thời gian"
 msgid "To"
 msgstr "To"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "Để thiết lập một host interface chọn một kiểu item duy nhất cho tất cả các item"
 
@@ -17392,13 +17511,13 @@ msgstr "Các khuynh hướng "
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17417,7 +17536,7 @@ msgstr "Trigger \"%1$s\" thuộc về các mẫu có các liên kết khác nhau
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Trigger \"%1$s\" phụ thuộc vào \"%2$s\", mà không tồn tại."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17498,7 +17617,7 @@ msgstr "Tổng quan các trigger"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17564,15 +17683,15 @@ msgstr "Các kiểu trigger đã bị xóa"
 msgid "Trigger prototypes updated"
 msgstr "Các kiểu trigger đã được cập nhật"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Mức độ quan trọng của trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "Trạng thái trigger \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "Trạng thái Trigger \"Problem\""
 
@@ -17624,7 +17743,7 @@ msgstr "Cắt"
 msgid "Tue"
 msgstr "Thứ ba"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "Thứ ba"
 
@@ -17637,7 +17756,7 @@ msgstr "Turkish (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Hai item (\"%1$s\" và \"%2$s\") không thể gắn vào một trường host còn lại \"%3$s\", điều này sẽ dẫn đến một cuộc xung đột."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "Hai phần tử sơ đồ nên được chọn"
 
@@ -17652,15 +17771,16 @@ msgstr "Hai phần tử sơ đồ nên được chọn"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17727,7 +17847,7 @@ msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17737,7 +17857,7 @@ msgstr "UNKNOWN"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17783,7 +17903,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL phải có cả trường \"tên\" và \"url\" cho sơ đồ \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17831,7 +17951,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "Không thể ghi đè lên tệp cấu hình hiện có."
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17878,7 +17998,8 @@ msgstr "Bỏ chặn các người dùng được lựa chọn?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17897,7 +18018,8 @@ msgstr "Đơn vị"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17908,9 +18030,9 @@ msgstr "Đơn vị"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Không rõ"
@@ -17929,12 +18051,12 @@ msgstr "Lỗi không rõ"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Host item không rõ, không có item trong host được lựa chọn"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "Host không rõ, không có như vậy trong hệ thống"
 
@@ -17981,7 +18103,7 @@ msgstr "Hủy liên kết từ template"
 msgid "Unlink from templates"
 msgstr "Hủy liên kết từ các template"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "Bật tiếng"
 
@@ -18061,27 +18183,28 @@ msgstr "Up"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18150,7 +18273,7 @@ msgid "Upper level maps"
 msgstr "Các bản đồ ở mức cao hơn"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "Thời gian chạy"
@@ -18199,37 +18322,37 @@ msgstr "Sử dùng trong các action"
 msgid "User"
 msgstr "Người dùng"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Người dùng \"%1$s\" không thể không có nhóm người dùng."
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "Người dùng \"%1$s\" là chủ sở hữu bảng điều khiển \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "Người dùng \"%1$s\" là sở hữu sơ đồ \"%2$s\""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "Người dùng \"%1$s\" được sử dụng trong hoạt động \"%2$s\"."
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18246,13 +18369,13 @@ msgstr "Người dùng được thêm vào"
 msgid "User agent string"
 msgstr "Chuỗi người dùng agent"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Người dùng không thể thêm chính mình vào một nhóm đã bị vô hiệu hóa hoặc một nhóm tiếp cận với giao diện người dùng."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18276,32 +18399,32 @@ msgstr[0] "Người dùng đã bị xóa"
 msgid "User group"
 msgstr "Nhóm người dùng"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Nhóm người dùng \"%1$s\" đã tồn tại."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Nhóm người dùng \"%1$s\" sử dùn trong hoạt động \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Nhóm người dùng \"%1$s\" được sử dụng trong cấu hình cho cơ sở dữ liệu tin nhắn không hoạt động."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Nhóm người dùng \"%1$s\" được sử dụng trong tập lệnh \"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18330,7 +18453,7 @@ msgstr[0] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "Nhóm người dùng với ID \"%1$s\" không sẵn sàng."
@@ -18338,14 +18461,14 @@ msgstr "Nhóm người dùng với ID \"%1$s\" không sẵn sàng."
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "Các nhóm người dùng"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "Người dùng không được phép xóa chính mình."
 
@@ -18393,7 +18516,7 @@ msgstr[0] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18427,7 +18550,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Chia sẻ của người dùng bị thiếu tham số: %1$s cho sơ đồ \"%2$s\"."
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18447,12 +18570,12 @@ msgstr "Người dùng được cập nhật"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Người dùng có ID \"%1$s\" không khả dụng."
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18497,7 +18620,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18764,23 +18887,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18987,8 +19110,8 @@ msgstr "Căn hàng thẳng đứng"
 msgid "Vietnamese (vi_VN)"
 msgstr "Vietnamese (vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19015,7 +19138,12 @@ msgstr "Tên hiển thị"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Tên hiển thị không thể bị trống nếu tên host bị lỗi."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19032,11 +19160,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Chúng tôi xin lỗi, số lượng tối đa có thể của các phần tử để ghi nhớ đã đạt tới giới hạn."
 
@@ -19052,7 +19180,7 @@ msgstr "Chúng tôi xin lỗi, số lượng tối đa có thể của ca
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19119,7 +19247,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Thứ 4"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "Thứ tư"
 
@@ -19130,6 +19258,10 @@ msgstr "Thứ tư"
 msgid "Weekly"
 msgstr "Hàng tuần"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "Chào mừng"
@@ -19147,7 +19279,7 @@ msgstr "Khi hoạt động"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19360,8 +19492,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19403,19 +19535,19 @@ msgstr "Hàng năm"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19483,19 +19615,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Bạn không có quyền để thực hiện các thao tác này."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "Bạn không có quyền để tạo các người dùng."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "Bạn không có quyền truy cập trang này."
@@ -19616,7 +19744,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "Một boolean được mong đợi "
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19735,7 +19863,6 @@ msgstr "agent"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20031,9 +20158,9 @@ msgstr "Không thể thay đổi"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20113,7 +20240,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "phụ thuộc item không được phép"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20160,7 +20287,7 @@ msgstr "Count () - Số lượng giá trị được truy xuất thành công V
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20359,13 +20486,13 @@ msgstr "Cài đặt global housekeeping"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20413,7 +20540,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "bao gồm các nhóm nhỏ"
 
@@ -20639,12 +20766,12 @@ msgstr "Quy tắc phát hiện low-level"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20748,8 +20875,8 @@ msgstr "min () - Giá trị tối thiểu cho giai đoạn T"
 msgid "minimum length is %1$s characters"
 msgstr "độ dài tối thiểu là ký tự %1$s"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20844,7 +20971,7 @@ msgstr ""
 msgid "name"
 msgstr "tên"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "new"
 
@@ -20911,7 +21038,7 @@ msgstr "now () - Số giây kể từ Epoch"
 msgid "number"
 msgstr "số"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "of"
@@ -20979,7 +21106,7 @@ msgstr "đầu ra"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21106,7 +21233,7 @@ msgstr "Chọn"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "Mô tả ngắn"
 
@@ -21191,7 +21318,7 @@ msgstr "tổng() - Tổng giá trị của một khoảng thời gian T"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "thông tin được cung cấp không phải là duy nhất"
 
@@ -21201,8 +21328,8 @@ msgstr "thông tin được cung cấp không phải là duy nhất"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21283,7 +21410,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "thay đổi thời gian"
 
@@ -21346,7 +21473,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "Kiểu cần tìm kiếm"
 
@@ -21373,7 +21500,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21467,7 +21594,7 @@ msgstr "Số phiên bản không được hỗ trợ"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21487,7 +21614,7 @@ msgstr "Số phiên bản không được hỗ trợ"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "Giá trị"
 
@@ -21634,7 +21761,7 @@ msgstr "phát hiện sai loại quy tắc"
 msgid "wrong item type"
 msgstr "Loại item sai"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/zh_CN/LC_MESSAGES/frontend.po b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
index 8e80a93f20e..5b934faffc1 100644
--- a/ui/locale/zh_CN/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2016-05-11 02:08+0300\n"
 "Last-Translator: 岂几 <tom3000@126.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -97,7 +97,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 天"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -175,7 +175,7 @@ msgstr[0] "%1$s 消息"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -187,7 +187,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "处于问题状态的 %2$s 元素的 %1$s"
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -214,16 +214,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "剩余%1$s 重试次数"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s 秒"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -242,13 +242,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, 严重性, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, 只读"
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -297,7 +297,7 @@ msgstr "(无agent代理程序)"
 msgid "0 - use default port"
 msgstr "0 - 使用默认端口"
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 或 1"
 
@@ -365,7 +365,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr "添加覆盖"
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "与"
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -444,40 +444,40 @@ msgstr ""
 msgid "Access denied"
 msgstr "访问拒绝"
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "访问拒绝!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "确认"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "确认"
 
@@ -485,7 +485,7 @@ msgstr "确认"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "已确认"
@@ -514,20 +514,22 @@ msgstr "确认已解决的事件"
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -630,7 +632,7 @@ msgstr "动作已更新"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -639,7 +641,7 @@ msgstr "动作已更新"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "动作"
@@ -698,8 +700,8 @@ msgstr "启用直到"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -710,7 +712,6 @@ msgstr "启用直到"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -718,11 +719,13 @@ msgstr "启用直到"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -734,15 +737,17 @@ msgstr "启用直到"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -809,7 +814,7 @@ msgstr "启用直到"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "添加"
 
@@ -817,19 +822,19 @@ msgstr "添加"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr "添加新构件"
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr "添加子节点元素"
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -846,7 +851,7 @@ msgstr "添加主机"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr "添加多个拓扑图"
 
@@ -863,7 +868,11 @@ msgstr ""
 msgid "Add new override"
 msgstr "添加新的覆盖"
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -871,7 +880,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -905,7 +914,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr "添加构件"
 
@@ -914,12 +923,20 @@ msgstr "添加构件"
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr "%1$s，已添加"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "管理者"
@@ -929,6 +946,10 @@ msgstr "管理者"
 msgid "Administration"
 msgstr "管理"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "高级标签"
@@ -1015,7 +1036,7 @@ msgstr "对齐拓扑元素"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "所有"
 
@@ -1024,8 +1045,8 @@ msgid "All dashboards"
 msgstr "添加仪表盘"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr "所有组"
 
@@ -1033,7 +1054,7 @@ msgstr "所有组"
 msgid "All hosts"
 msgstr "所有主机"
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "所有的链接应含 特定的名称和URL"
 
@@ -1067,7 +1088,7 @@ msgstr "所有模板"
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1080,7 +1101,7 @@ msgstr "允许手动关闭"
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1098,7 +1119,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1139,12 +1160,12 @@ msgstr "与/或（默认）"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1164,15 +1185,15 @@ msgstr "应用集 错误."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "应用"
 
@@ -1190,7 +1211,7 @@ msgstr "接近中"
 msgid "Apr"
 msgstr "四月"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "四月"
 
@@ -1218,6 +1239,10 @@ msgstr "区域类型"
 msgid "Arithmetic"
 msgstr "算法"
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "纯文字"
@@ -1266,8 +1291,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1345,7 +1370,7 @@ msgstr ""
 msgid "Aug"
 msgstr "八月"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "八月"
 
@@ -1375,7 +1400,7 @@ msgstr "认证"
 msgid "Authentication algorithm"
 msgstr "认证算法"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr "验证失败: %1$s"
@@ -1424,7 +1449,7 @@ msgstr "自动"
 msgid "Auto-login"
 msgstr "自动登录"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr "自动登录和自动注销功能不能同时使用。"
 
@@ -1434,7 +1459,7 @@ msgstr "自动注销"
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1619,11 +1644,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "底部"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr "向上一层"
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr "移到上一层"
 
@@ -1704,7 +1729,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "可计算的"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr "日历"
 
@@ -1724,8 +1749,8 @@ msgstr "回调"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1742,8 +1767,8 @@ msgstr "回调"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "取消"
 
@@ -1773,7 +1798,7 @@ msgstr "无法添加操作"
 msgid "Cannot add correlation"
 msgstr "无法添加关联"
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1784,7 +1809,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "无法添加自主机到模板的依赖"
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1902,7 +1927,7 @@ msgid "Cannot add user"
 msgstr "无法添加用户"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1910,11 +1935,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "不能添加web场景"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1992,7 +2017,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] "无法复制触发器"
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "无法复制触发器 \"%1$s:%2$s\", 因为在其表达式中有多个主机."
@@ -2046,7 +2071,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "无法删除Zabbix内部用户 \"%1$s\", 试试停用这个用户."
@@ -2425,7 +2450,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr "无法扩展宏."
 
@@ -2593,7 +2618,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2655,7 +2680,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "不能读取响应, 检查与Zabbix服务器 \"%1$s\" 的连接."
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "无法重新命名访客用户."
 
@@ -2714,7 +2739,12 @@ msgstr "无法设置审计字段为已经禁止的审计."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3130,6 +3160,7 @@ msgid "Change per second"
 msgstr "每秒更改"
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr "更改严重性"
 
@@ -3271,7 +3302,7 @@ msgstr "检查 UDP 服务的性能，当服务 down 时返回 0，否则返回�
 msgid "Checks should be unique."
 msgstr "检查必需是唯一的"
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3313,11 +3344,11 @@ msgstr "清除历史和趋势"
 msgid "Clear when unlinking"
 msgstr "清除当无链接时"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3347,7 +3378,7 @@ msgstr "时钟"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "克隆"
 
@@ -3358,8 +3389,8 @@ msgstr "克隆"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "关闭"
 
@@ -3389,8 +3420,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr "宕机"
 
@@ -3407,7 +3438,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3475,6 +3506,7 @@ msgstr "并发会话"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "条件"
 
@@ -3529,7 +3561,7 @@ msgstr "条件"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "配置"
 
@@ -3792,7 +3824,7 @@ msgstr "联系"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3829,8 +3861,8 @@ msgstr "包含"
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3891,8 +3923,8 @@ msgstr "座标"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "复制"
 
@@ -4020,11 +4052,11 @@ msgstr "创建关联项"
 msgid "Create dashboard"
 msgstr "创建仪表盘"
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr "创建仪表盘依赖项"
 
@@ -4141,7 +4173,7 @@ msgstr "创建拓扑图"
 msgid "Create media type"
 msgstr "创建媒体类型"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr "创建新的"
 
@@ -4157,7 +4189,7 @@ msgstr ""
 msgid "Create script"
 msgstr "创建脚本"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4165,7 +4197,7 @@ msgstr ""
 msgid "Create template"
 msgstr "创建模板"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "创建触发器"
 
@@ -4384,7 +4416,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr "仪表板属性"
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr "共享仪表盘"
 
@@ -4414,7 +4446,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr "仪表盘"
 
@@ -4584,7 +4616,7 @@ msgstr "星期几"
 msgid "Days"
 msgstr "天数"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "调试"
 
@@ -4598,7 +4630,7 @@ msgstr "调试模式"
 msgid "Dec"
 msgstr "十二"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "十二"
 
@@ -4607,13 +4639,17 @@ msgstr "十二"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "默认"
 
@@ -4683,8 +4719,8 @@ msgid "Delayed by"
 msgstr "被延迟由于"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4698,7 +4734,7 @@ msgstr "被延迟由于"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4730,8 +4766,8 @@ msgstr "被延迟由于"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "删除"
 
@@ -4760,7 +4796,7 @@ msgstr "删除目前的动作?"
 msgid "Delete current correlation?"
 msgstr "删除当前的关联项？"
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr "你确定要删除仪表盘？"
 
@@ -4804,7 +4840,7 @@ msgstr "删除监控项目模板?"
 msgid "Delete item?"
 msgstr "删除监控项?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "删除所选组件间的连接?"
 
@@ -4860,7 +4896,7 @@ msgstr "删除所有的仪表盘？（危险）"
 msgid "Delete selected discovery rules?"
 msgstr "删除所选的发现规则?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "删除所选的元素?"
 
@@ -4961,11 +4997,11 @@ msgstr "删除所选的脚本?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr "删除所选形状？"
 
@@ -4981,7 +5017,7 @@ msgstr "删除所选的触发器原型？"
 msgid "Delete selected triggers?"
 msgstr "删除所选的触发器?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "删除所选的用户?"
 
@@ -5032,7 +5068,7 @@ msgstr "已删除: 模板 \"%1$s\"."
 msgid "Delimiter"
 msgstr "分隔符"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5046,7 +5082,7 @@ msgstr "拒绝"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5054,7 +5090,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "依赖关系"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "依赖"
 
@@ -5062,7 +5098,7 @@ msgstr "依赖"
 msgid "Dependent item"
 msgstr "相关项目"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5090,7 +5126,7 @@ msgstr "部署状态"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5254,7 +5290,7 @@ msgstr "禁用所选定的web场景？"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5267,14 +5303,14 @@ msgstr "禁用所选定的web场景？"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5357,7 +5393,7 @@ msgid "Discovery by proxy"
 msgstr "由agent代理程序自动发现"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "自动发现检查"
 
@@ -5369,7 +5405,7 @@ msgstr "自动发现检查"
 msgid "Discovery list"
 msgstr "自动发现清单"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "自动发现物件"
 
@@ -5466,7 +5502,7 @@ msgstr "自动发现规则已更新"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5477,7 +5513,7 @@ msgstr "自动发现规则"
 msgid "Discovery rules deleted"
 msgstr "自动发现规则已删除"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "自动发现状态"
@@ -5517,7 +5553,7 @@ msgstr "显示堆叠数据图"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "显示 已自动发现的 %2$s中的%1$s"
@@ -5535,10 +5571,6 @@ msgstr "显示选项"
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "不要计算"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5553,7 +5585,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "您想要替换条件式表达式吗?"
 
@@ -5609,7 +5641,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "下"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5618,7 +5650,7 @@ msgid "Download the configuration file"
 msgstr "下载配置文件"
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "断线时间"
@@ -5694,7 +5726,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr "用户ID \"%1$s\" 与 \"%2$s\" 冲突"
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5716,7 +5748,7 @@ msgstr "动态监控项"
 msgid "Dynamic items"
 msgstr "动态监控项"
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每个URL必须是唯一的. 请确保只有一个被命名的 URL."
 
@@ -5724,13 +5756,14 @@ msgstr "每个URL必须是唯一的. 请确保只有一个被命名的 URL."
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5742,8 +5775,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "编辑"
 
@@ -5759,11 +5792,11 @@ msgstr "编辑拓扑图"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr "编辑树元素"
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "编辑触发器"
 
@@ -6038,7 +6071,7 @@ msgstr "启用trapping"
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6060,12 +6093,12 @@ msgstr "启用trapping"
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6124,7 +6157,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6148,7 +6181,7 @@ msgstr "错误"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "查找表请求出现 \"%1$s\"的错误."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr "错误信息"
 
@@ -6187,7 +6220,7 @@ msgstr "关联项事件规则"
 msgid "Event details"
 msgstr "事件细节"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "事件生成"
 
@@ -6217,7 +6250,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr "事件标签对"
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr "事件类型"
 
@@ -6250,7 +6283,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "除外"
 
@@ -6261,7 +6294,7 @@ msgstr "除外"
 msgid "Exclude host groups"
 msgstr "排除主机组"
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "执行"
 
@@ -6307,7 +6340,7 @@ msgstr "已执行"
 msgid "Executed script"
 msgstr "已执行的脚本"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "执行确认"
 
@@ -6323,8 +6356,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr "扩展"
 
@@ -6391,7 +6424,7 @@ msgstr "导出到CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6445,7 +6478,7 @@ msgstr "表达式"
 msgid "External check"
 msgstr "外部检查"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6469,7 +6502,7 @@ msgid "Failed"
 msgstr "已失败"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr "创建仪表盘失败"
 
@@ -6478,24 +6511,24 @@ msgstr "创建仪表盘失败"
 msgid "Failed to parse URL."
 msgstr "无法解析URL。"
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr "更新仪表盘失败"
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6503,7 +6536,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "更新模板失败"
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6527,7 +6560,7 @@ msgstr ""
 msgid "Feb"
 msgstr "二月"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "二月"
 
@@ -6673,8 +6706,8 @@ msgstr "填满的区域"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6752,6 +6785,10 @@ msgstr "调整至符合拓扑图"
 msgid "Fixed"
 msgstr "固定的"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6817,14 +6854,14 @@ msgstr "法语 (fr_FR)"
 msgid "Fri"
 msgstr "周五"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "周五"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6842,7 +6879,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "前端访问"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "前端信息中"
 
@@ -6925,7 +6962,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "此表达式不是宏"
 
@@ -6943,7 +6980,7 @@ msgstr "全局值"
 msgid "Go back to %1$s"
 msgstr "返回 %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "到"
 
@@ -6992,7 +7029,7 @@ msgstr "梯度线"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7152,7 +7189,7 @@ msgstr "图表名称 \"%1$s\" 已经存在在图表或者图表原型."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "图形"
 
@@ -7352,11 +7389,11 @@ msgstr "帮助"
 msgid "Hexadecimal to decimal"
 msgstr "十六进制到十进制"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr "隐藏调试"
 
@@ -7402,14 +7439,14 @@ msgstr "高亮整行"
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "历史记录"
 
@@ -7473,7 +7510,7 @@ msgstr "横向对齐"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7481,8 +7518,7 @@ msgstr "横向对齐"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7494,7 +7530,7 @@ msgstr "横向对齐"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7571,7 +7607,7 @@ msgstr[0] "主机已启用"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7579,7 +7615,7 @@ msgstr[0] "主机已启用"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "主机群组"
@@ -7610,7 +7646,7 @@ msgstr "主机群组标签类型"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 主机组不可用。"
@@ -7627,7 +7663,7 @@ msgstr "ID为 \"%1$s\" 主机组不可用。"
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7666,7 +7702,7 @@ msgstr "主机接口"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7813,7 +7849,7 @@ msgstr "显示名称为\"%1$s\" 的主机已经存在"
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8045,14 +8081,64 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr "识别系统。返回 字符串"
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "假如您认为这个信息是错的, 请咨询您的管理员关于如何取得需要的权限."
@@ -8061,12 +8147,16 @@ msgstr "假如您认为这个信息是错的, 请咨询您的管理员关于如�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "图片"
 
@@ -8196,7 +8286,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8209,11 +8299,11 @@ msgstr "无法访问的拓扑图"
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr "无法访问的模板"
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr "无法访问的触发器"
 
@@ -8239,7 +8329,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "包含"
 
@@ -8257,6 +8347,11 @@ msgstr "包括子组"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "网络接口上传流量统计。返回 整数"
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8647,7 +8742,7 @@ msgstr "动作\"%1$s\"的过滤器条件类型不正确"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "使用了错误的函数"
 
@@ -8704,7 +8799,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "提供错误的项目键值\"%1$s\"给\"%2$s\"上的触发器表达式."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr "项目的数据类型不正确"
 
@@ -8735,7 +8830,7 @@ msgstr "错误的 媒介类型ID"
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr "不正确的方法 \"%1$s.%2$s\"."
@@ -8875,10 +8970,10 @@ msgstr "拓扑图 \"%1$s\" 用户ID错误。"
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr "拓扑图 \"%1$s\" 用户组ID错误。"
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9185,9 +9280,9 @@ msgstr "\"%1$s\" 字段的值不正确。"
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9259,6 +9354,10 @@ msgstr "在PSK字段使用的值是不正确的。未配置为十六进制字符
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "错误的值用于代理服务器状态 \"%1$s\"."
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "印度尼西亚 (id_ID)"
@@ -9270,12 +9369,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9348,7 +9447,7 @@ msgid "Insert"
 msgstr "插入"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr "插入表达式"
 
@@ -9456,7 +9555,7 @@ msgstr "IE浏览器"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9504,7 +9603,7 @@ msgstr "无效数据."
 msgid "Invalid email address \"%1$s\"."
 msgstr "无效 email 地址 \"%1$s\"。"
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr "媒介类型 ID: \"%1$s\" 的 email 地址无效。"
@@ -9607,8 +9706,8 @@ msgstr "无效的方法参数."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9812,7 +9911,7 @@ msgstr "无效的时间段"
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "资产记录"
 
@@ -9998,7 +10097,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10159,7 +10258,7 @@ msgstr ""
 msgid "Jan"
 msgstr "一月"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "一月"
 
@@ -10181,7 +10280,7 @@ msgstr ""
 msgid "Jul"
 msgstr "七月"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "七月"
 
@@ -10189,7 +10288,7 @@ msgstr "七月"
 msgid "Jun"
 msgstr "六月"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "六月"
 
@@ -10223,7 +10322,7 @@ msgstr "键值"
 msgid "Key passphrase"
 msgstr "键值通行短语"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "关键字"
 
@@ -10293,7 +10392,7 @@ msgstr "标签位置"
 msgid "Language"
 msgstr "语言"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10366,11 +10465,11 @@ msgstr ""
 msgid "Last check"
 msgstr "最近检查记录"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "最近一小时"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "上月图形"
 
@@ -10408,7 +10507,7 @@ msgstr ""
 msgid "Last value"
 msgstr "最新数据"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "上周图形"
 
@@ -10421,11 +10520,11 @@ msgstr "上周图形"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "最新数据"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "最新值"
 
@@ -10537,7 +10636,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10615,12 +10714,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr "用户组共享列表"
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr "用户共享列表"
@@ -10748,7 +10847,7 @@ msgstr "低级发现规则在“不支持”状态"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10908,7 +11007,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10937,7 +11036,7 @@ msgstr "手动关闭"
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "拓扑图"
 
@@ -10976,7 +11075,7 @@ msgstr "拓扑元素标签位置"
 msgid "Map element label type"
 msgstr "拓扑元素标签类型"
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -11002,7 +11101,7 @@ msgstr "地图的所有者不能为空。"
 msgid "Map shape"
 msgstr "拓扑图形状"
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr "拓扑图更新失败."
 
@@ -11038,7 +11137,7 @@ msgstr "拓扑图"
 msgid "Mar"
 msgstr "三月"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "三月"
 
@@ -11065,7 +11164,7 @@ msgstr "掩码"
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11136,9 +11235,9 @@ msgstr "操作系统最大的文件打开数量。返回整数"
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr "操作系统最大的进程数。返回整数"
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11150,12 +11249,12 @@ 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天"
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "email 地址最大长度超出媒体类型 ID: \"%1$s\"。"
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "五月"
 
@@ -11165,8 +11264,8 @@ msgid "May"
 msgstr "五月"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "报警媒介"
 
@@ -11224,7 +11323,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "报警媒介类型已更新"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的媒体类型不可用。"
@@ -11297,8 +11396,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "消息超时"
 
@@ -11316,7 +11415,7 @@ msgstr "信息/命令"
 msgid "Messages"
 msgstr "消息"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "正在发送消息"
 
@@ -11344,6 +11443,11 @@ msgstr "最小"
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11359,11 +11463,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11504,7 +11603,7 @@ msgstr ""
 msgid "Mon"
 msgstr "一"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "周一"
 
@@ -11544,11 +11643,11 @@ msgstr "月"
 msgid "Monthly"
 msgstr "每月"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr "更多匹配发现..."
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11564,6 +11663,14 @@ msgstr "10分钟以上"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "于主机中多于一个名为\"%1$s\"的图形."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11573,11 +11680,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr "多重"
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "多重问题事件"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "静音"
 
@@ -11585,6 +11692,18 @@ msgstr "静音"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11679,25 +11798,26 @@ msgstr "NTLM"
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11840,6 +11960,10 @@ msgstr ""
 msgid "Never"
 msgstr "从未"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11851,7 +11975,7 @@ msgstr "新的触发条件"
 msgid "New dashboard"
 msgstr "新仪表盘"
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "新的组件"
 
@@ -11875,7 +11999,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "新的正则表达式"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11892,7 +12016,7 @@ msgid "New triggers"
 msgstr "新触发器"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -11910,20 +12034,20 @@ msgstr "下一步"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12056,7 +12180,7 @@ msgstr "没有细节"
 msgid "No discovery rule IDs given."
 msgstr "没有所称的自动发现规则ID"
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12118,7 +12242,7 @@ msgstr "没有图片"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "没有找到接口"
 
@@ -12158,7 +12282,7 @@ msgstr "未发现宏"
 msgid "No maps added."
 msgstr "未添加拓扑图."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr "没有找到匹配"
 
@@ -12171,8 +12295,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr "关联项 \"%1$s\" 没有操作类型"
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "没有系统访问权限。"
 
@@ -12184,7 +12308,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12192,11 +12315,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12314,19 +12438,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12335,15 +12459,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12370,7 +12494,7 @@ msgstr "没有指定的公钥文件"
 msgid "No recipients for action operation message."
 msgstr "没有动作操作信息的收受者。"
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr "没有刷新"
 
@@ -12386,7 +12510,7 @@ msgstr "没有选择目标"
 msgid "No target selected."
 msgstr "没有已选的目标"
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12433,7 +12557,7 @@ msgstr "无"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12465,15 +12589,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "不允许设定用户\"guest\"的密码."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12505,8 +12629,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "不支持的"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "备注"
 
@@ -12536,7 +12660,7 @@ msgstr "通知所有参与者"
 msgid "Nov"
 msgstr "十一"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "十一月"
 
@@ -12699,12 +12823,12 @@ msgstr "数字系统"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "浮点数"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr "数字（整数）"
 
@@ -12719,18 +12843,17 @@ msgstr "数字 (无正负)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "正常"
@@ -12757,7 +12880,7 @@ msgstr "带外路由器"
 msgid "OOB subnet mask"
 msgstr "带外子网掩码"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "OR"
 
@@ -12785,13 +12908,13 @@ msgstr "十月"
 msgid "Octal to decimal"
 msgstr "八进制转十进制"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "十月"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "关"
 
@@ -12803,7 +12926,7 @@ msgstr "关"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "正常"
@@ -12822,7 +12945,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "开"
 
@@ -12830,7 +12953,7 @@ msgstr "开"
 msgid "On status change triggers blink for"
 msgstr "于状态改变时, 触发器因此闪烁于"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "一次"
 
@@ -12847,7 +12970,7 @@ msgid "One time only"
 msgstr "一次性"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "单次停机"
 
@@ -12859,26 +12982,14 @@ msgstr "只有超级管理员可以创建主机群组."
 msgid "Only Super Admins can create media types."
 msgstr "只有超级管理员可以创建报警媒介类型."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr "只要超级用户才能创建用户组。"
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "只有超级管理员可以删除报警媒介类型."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "只有超级管理员可以删除用户群组."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "只有超级管理员可以编辑报警媒介类型."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr "只有超级用户才能更新用户组。"
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "只有Zabbix代理, SNMPv1,SNMPv2 和 SNMPv3检查才是独特的."
@@ -12918,11 +13029,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] "只选择问题"
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12955,7 +13066,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "操作系统信息。返回字符串"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -12980,7 +13091,7 @@ msgstr "操作并无群组来操作."
 msgid "Operation has no template to operate."
 msgstr "操作并无模板来操作."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13005,27 +13116,27 @@ msgstr "操作"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "操作者"
 
@@ -13050,7 +13161,7 @@ msgstr "选项"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13067,8 +13178,8 @@ msgstr "或"
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13115,9 +13226,9 @@ msgstr "或"
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "原始的"
 
@@ -13369,7 +13480,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "问题"
@@ -13416,7 +13527,7 @@ msgstr "共享密钥一致性"
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr "PSK太短。最小的值是 %1$s 的十六进制数字。"
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13439,13 +13550,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "参数"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13476,9 +13589,7 @@ msgstr "上层监控项"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13567,15 +13678,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr "粘贴"
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr "粘贴无外部链接"
 
@@ -13650,19 +13765,20 @@ msgid "Periods"
 msgstr "期间"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "权限"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "权限只能被指派给用户群组"
 
@@ -13684,12 +13800,12 @@ msgstr "置入演算法"
 msgid "Plain text"
 msgstr "文本"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "播放"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "播放声音"
 
@@ -13719,7 +13835,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "请输入主机名或主机IP地址和zabbix服务器的端口号，以及安装的名称（可选）。"
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "请选择两个组件"
 
@@ -13848,7 +13964,7 @@ msgid "Previous month"
 msgstr "上一个月"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13906,7 +14022,7 @@ msgstr "私钥"
 msgid "Privacy protocol"
 msgstr "隐私协议"
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr "Private（私人的）"
@@ -13926,12 +14042,12 @@ msgid "Privilege level"
 msgstr "优先权层级"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13961,7 +14077,7 @@ msgstr "问题已创建"
 msgid "Problem display"
 msgstr "问题显示"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr "问题表现形式"
@@ -13979,7 +14095,7 @@ msgstr "问题没有被制止"
 msgid "Problem is suppressed"
 msgstr "问题已被制止"
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "问题在"
 
@@ -13992,8 +14108,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "问题已解决"
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14006,14 +14122,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "问题, 如果所有的下层都有问题"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "问题, 如果至少一个下层有一个问题"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14030,7 +14138,7 @@ msgstr "问题, 如果至少一个下层有一个问题"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "问题"
 
@@ -14064,12 +14172,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr "属性"
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14091,7 +14199,7 @@ msgstr "agent代理程序"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14153,7 +14261,7 @@ msgstr "agent代理程序名称"
 msgid "Proxy updated"
 msgstr "agent代理程序已添加"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr "公开"
@@ -14247,8 +14355,8 @@ msgstr "读"
 msgid "Read only"
 msgstr "只读"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14256,8 +14364,8 @@ msgstr "只读"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14310,7 +14418,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14318,7 +14426,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "恢复"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14353,7 +14461,7 @@ msgstr "矩形"
 msgid "Refresh"
 msgstr "刷新"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr "刷新间隔"
 
@@ -14413,7 +14521,7 @@ msgstr "正则表达式"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14445,6 +14553,7 @@ msgstr "远程命令"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14454,7 +14563,7 @@ msgstr "远程命令"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14462,13 +14571,13 @@ msgstr "远程命令"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14478,8 +14587,8 @@ msgstr "远程命令"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14556,8 +14665,8 @@ msgstr "远程命令"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "移除"
 
@@ -14597,7 +14706,7 @@ msgstr "删除，%1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14626,7 +14735,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14634,7 +14743,7 @@ msgstr ""
 msgid "Replace"
 msgstr "替换"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "替换依赖关系"
 
@@ -14743,7 +14852,7 @@ msgstr "要求的状态码"
 msgid "Required string"
 msgstr "要求的字串"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "重设"
@@ -14777,7 +14886,7 @@ msgstr "重设确认"
 msgid "Reset defaults"
 msgstr "重设预设"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "已解决"
 
@@ -14976,8 +15085,8 @@ msgstr "Right Y"
 msgid "Right trim"
 msgstr "修整右边"
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15035,12 +15144,12 @@ msgstr "即在主机上指定的命令的执行。返回命令执行结果的文
 msgid "Russian (ru_RU)"
 msgstr "俄语 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15051,10 +15160,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15267,7 +15374,7 @@ msgstr "无衬线字体"
 msgid "Sat"
 msgstr "六"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "周六"
 
@@ -15436,7 +15543,7 @@ msgstr "脚本已更新"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "脚本"
 
@@ -15506,8 +15613,8 @@ msgid "Security name"
 msgstr "安全名称"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15515,7 +15622,7 @@ msgstr "安全名称"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "选择"
 
@@ -15551,19 +15658,19 @@ msgstr "所选的组件"
 msgid "Selected items only"
 msgstr "仅选择的监控项"
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "已选择，%1$s 在 %2$d 位置的 %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "已选择，%1$s，只读，位于 %3$d 的位置 %2$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr "往后发送"
 
@@ -15588,7 +15695,7 @@ msgstr "仅送到"
 msgid "Send to"
 msgstr "收件人"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr "发回"
 
@@ -15621,7 +15728,7 @@ msgstr "分开的"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "九月"
 
@@ -15653,34 +15760,29 @@ msgid "Server time"
 msgstr "服务器时间"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "服务"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15688,7 +15790,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr "服务被创建"
 
@@ -15716,7 +15818,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "服务的开始时间不能晚于截止时间."
 
@@ -15732,11 +15834,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "服务次数"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "服务类型"
 
@@ -15745,7 +15847,7 @@ msgstr "服务类型"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "服务已更新"
 
@@ -15754,16 +15856,16 @@ msgstr "服务已更新"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "服务"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "服务形成了一个环."
 
@@ -15775,9 +15877,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "会话已中断, 请重新登录."
 
@@ -15801,10 +15903,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "设置主机清单模式"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15845,7 +15955,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15891,7 +16001,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr "分享"
 
@@ -15982,7 +16092,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16033,7 +16143,7 @@ msgstr "当Zabbix服务器停机时显示警告"
 msgid "Show working time"
 msgstr "查看工作时间"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "已查看"
 
@@ -16142,7 +16252,7 @@ msgstr "略过复制图片\"%1$s\"到主机\"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "斯洛伐克(sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Snooze"
 
@@ -16188,7 +16298,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "排序对象以"
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "排序(0->999)"
 
@@ -16262,7 +16372,7 @@ msgstr "开始于"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16310,12 +16420,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16326,17 +16438,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16360,13 +16479,10 @@ msgstr ""
 msgid "Status"
 msgstr "状态"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "状态统计"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "状态计算算法"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16397,6 +16513,10 @@ msgstr "只有状态"
 msgid "Status problem"
 msgstr "状态 问题"
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16428,8 +16548,8 @@ msgstr "名字为\"%1$s\"的步骤已经存在."
 msgid "Steps"
 msgstr "步骤"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "停止"
 
@@ -16441,7 +16561,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16473,7 +16593,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16506,7 +16626,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "主体"
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "子拓扑图"
 
@@ -16522,7 +16642,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "成功审计"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr "成功消息"
 
@@ -16535,7 +16655,7 @@ msgstr "网络接口上传下载的流量总和。返回整数"
 msgid "Sun"
 msgstr "日"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "日"
 
@@ -16627,12 +16747,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "系统启动时间。返回整数"
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16668,8 +16788,8 @@ msgstr "表\"%1$s\"不能有栏位名为\"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "标签"
@@ -16709,14 +16829,13 @@ msgstr "标记值"
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16724,10 +16843,10 @@ msgstr "标记值"
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16891,7 +17010,7 @@ msgstr "拥有相同显示名称\"%1$s\"的模板已经存在."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17174,12 +17293,12 @@ msgstr ""
 msgid "Thu"
 msgstr "四"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "周四"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "直到"
 
@@ -17189,13 +17308,13 @@ msgstr "直到"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17277,7 +17396,7 @@ msgstr "时间戳"
 msgid "To"
 msgstr "到"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "要设定一个主机接口, 选择一个单一的监控项类型给所有的监控项"
 
@@ -17399,13 +17518,13 @@ msgstr "趋势"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "触发器"
 
@@ -17424,7 +17543,7 @@ msgstr "触发器\"%1$s\"属于不同的联系，以模板。"
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "触发器\"%1$s\"相依于一个不存在的触发器\"%2$s\"."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17505,7 +17624,7 @@ msgstr "触发器概览"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17571,15 +17690,15 @@ msgstr "触发器模板已删除"
 msgid "Trigger prototypes updated"
 msgstr "触发器模板已更新"
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "触发器示警度"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr "触发器状态 \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr "触发器状态\"Problem\""
 
@@ -17631,7 +17750,7 @@ msgstr "修整"
 msgid "Tue"
 msgstr "二"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "周二"
 
@@ -17644,7 +17763,7 @@ msgstr "土耳其语 (tr_TR)"
 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\", 这会造成冲突."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr "应选择两个拓扑元素"
 
@@ -17659,15 +17778,16 @@ msgstr "应选择两个拓扑元素"
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17734,7 +17854,7 @@ msgid "UNKNOWN"
 msgstr "未知的"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17744,7 +17864,7 @@ msgstr "未知的"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17790,7 +17910,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "拓扑图 \"%1$s\" URL、名称为必填项。"
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17838,7 +17958,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr "无法覆盖已经存在的配置文件。"
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17885,7 +18005,8 @@ msgstr "解除锁定所选的用户?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17904,7 +18025,8 @@ msgstr "单位"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17915,9 +18037,9 @@ msgstr "单位"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "未知的"
@@ -17936,12 +18058,12 @@ msgstr "未知错误"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "未知的主机监控项, 在所选的主机中没有这样的监控项"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "未知的主机, 在系统中没有出现这样的主机."
 
@@ -17988,7 +18110,7 @@ msgstr "自模板断开连接"
 msgid "Unlink from templates"
 msgstr "自模板断开链接"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "取消静音"
 
@@ -18068,27 +18190,28 @@ msgstr "上"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18157,7 +18280,7 @@ msgid "Upper level maps"
 msgstr "上层拓扑图"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "在线时间"
@@ -18206,37 +18329,37 @@ msgstr "用于动作中"
 msgid "User"
 msgstr "用户"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "用户 \"%1$s\" 不能没有用户组。"
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr "用户 \"%1$s\" 是仪表板 \"%2$s\" 所有者。"
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr "拓扑图\"%2$s\"的所有者为\"%1$s\"。"
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr "用户 \"%1$s\" 用于 \"%2$s\" 操作。"
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18253,13 +18376,13 @@ msgstr "添加用户"
 msgid "User agent string"
 msgstr "用户代理字符串"
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用户不能将自己加进一个取消的群组或已关闭图形接口访问权的群组."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18283,32 +18406,32 @@ msgstr[0] "用户已删除"
 msgid "User group"
 msgstr "用户群组"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "用户组\"%1$s\"已存在."
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "用户组 \"%1$s\" 用于 \"%2$s\" 操作。"
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "用户组\"%1$s\"为接收数据库宕机信息而使用."
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "用户群组\"%1$s\"被用于脚本\"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18337,7 +18460,7 @@ msgstr[0] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr "ID为\"%1$s\" 的用户组不可用。"
@@ -18345,14 +18468,14 @@ msgstr "ID为\"%1$s\" 的用户组不可用。"
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "用户群组"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "用户是不允许删除自己"
 
@@ -18400,7 +18523,7 @@ msgstr[0] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18434,7 +18557,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "拓扑图 \"%2$s\" 用户共享缺少参数 %1$s "
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18454,12 +18577,12 @@ msgstr "用户已更新"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的用户不可用。"
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18504,7 +18627,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18771,23 +18894,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18994,8 +19117,8 @@ msgstr "纵向对齐"
 msgid "Vietnamese (vi_VN)"
 msgstr "越南(vi_VN)"
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19022,7 +19145,12 @@ msgstr "可见的名称"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "如果缺少主机名称, 可见的名称不能为空."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19039,11 +19167,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "设置"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "很抱歉, 已经到了最大的组件数量."
 
@@ -19059,7 +19187,7 @@ msgstr "很抱歉, 已经到了最大的组件数量."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web监测"
 
@@ -19126,7 +19254,7 @@ msgstr ""
 msgid "Wed"
 msgstr "三"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "周三"
 
@@ -19137,6 +19265,10 @@ msgstr "周三"
 msgid "Weekly"
 msgstr "每周"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr "欢迎"
@@ -19154,7 +19286,7 @@ msgstr "当启用时"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19367,8 +19499,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19410,19 +19542,19 @@ msgstr "每年"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19490,19 +19622,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "您没有权限来完成此操作."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "您没有权限来创建用户."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "你没有权限来访问这个页面."
@@ -19623,7 +19751,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr "预先设定的布尔值"
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19742,7 +19870,6 @@ msgstr "agent代理程序"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20038,9 +20165,9 @@ msgstr "不能变更"
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20120,7 +20247,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "不允许循环项依赖"
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20167,7 +20294,7 @@ msgstr "count() - 对于周期 T，成功检索的值 V（其满足运算符 O�
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20366,13 +20493,13 @@ msgstr "全局管家设置"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20420,7 +20547,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr "包括子组"
 
@@ -20646,12 +20773,12 @@ msgstr "底层发现规则"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20755,8 +20882,8 @@ msgstr "min() - 周期 T 内的最小值"
 msgid "minimum length is %1$s characters"
 msgstr "最小长度为 %1$s 个字符"
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20851,7 +20978,7 @@ msgstr ""
 msgid "name"
 msgstr "名字"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "新"
 
@@ -20918,7 +21045,7 @@ msgstr "now() - UNIX 时间"
 msgid "number"
 msgstr "数字"
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "其"
@@ -20986,7 +21113,7 @@ msgstr "输出"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21113,7 +21240,7 @@ msgstr "选择"
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "简要描述"
 
@@ -21198,7 +21325,7 @@ msgstr "sum() - 周期 T 内的值之和"
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr "提供的凭据不是唯一的"
 
@@ -21208,8 +21335,8 @@ msgstr "提供的凭据不是唯一的"
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21290,7 +21417,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr "时间偏移"
 
@@ -21353,7 +21480,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "在此输入搜索"
 
@@ -21380,7 +21507,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21474,7 +21601,7 @@ msgstr "这个版本已经不被支持"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21494,7 +21621,7 @@ msgstr "这个版本已经不被支持"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "值"
 
@@ -21641,7 +21768,7 @@ msgstr "错误的发现规则类型"
 msgid "wrong item type"
 msgstr "错误的监控项类型"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/zh_TW/LC_MESSAGES/frontend.po b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
index b51b736314a..0c19a9bc0d9 100644
--- a/ui/locale/zh_TW/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-27 19:55+0300\n"
+"POT-Creation-Date: 2021-09-03 20:00+0300\n"
 "PO-Revision-Date: 2012-11-06 09:39+0300\n"
 "Last-Translator: Yaochiu <brian.huang@primillet.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -96,7 +96,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 天"
 
-#: jsLoader.php:323
+#: jsLoader.php:328
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -174,7 +174,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:173 jsLoader.php:174 jsLoader.php:175 jsLoader.php:176
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -186,7 +186,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:329
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -213,16 +213,16 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "尚有%1$s次重試"
 
-#: app/views/administration.user.edit.php:564
+#: app/views/administration.user.edit.php:567
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:171 jsLoader.php:172
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s 秒"
 
-#: jsLoader.php:305
+#: jsLoader.php:310
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -241,13 +241,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:323
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:366
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -294,7 +294,7 @@ msgstr "(無系統代理程式)"
 msgid "0 - use default port"
 msgstr ""
 
-#: include/triggers.inc.php:1775
+#: include/triggers.inc.php:1598
 msgid "0 or 1"
 msgstr "0 或 1"
 
@@ -362,7 +362,7 @@ msgstr ""
 msgid "ADD OVERRIDE"
 msgstr ""
 
-#: app/views/popup.triggerwizard.php:105
+#: app/views/popup.triggerwizard.php:102
 msgid "AND"
 msgstr "且"
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "API token"
 msgstr ""
 
-#: include/classes/api/services/CToken.php:288
+#: include/classes/api/services/CToken.php:299
 #, c-format
 msgid "API token \"%1$s\" already exists for userid \"%2$s\"."
 msgstr ""
@@ -441,40 +441,40 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: sysmap.php:80
+#: sysmap.php:81
 msgid "Access denied!"
 msgstr "存取被拒!"
 
-#: app/views/administration.user.edit.php:498
+#: app/views/administration.user.edit.php:501
 #: app/views/administration.userrole.edit.php:179
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:453
+#: app/views/administration.user.edit.php:456
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:525
+#: app/views/administration.user.edit.php:528
 #: app/views/administration.userrole.edit.php:231
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:472
+#: app/views/administration.user.edit.php:475
 #: app/views/administration.userrole.edit.php:131
 msgid "Access to modules"
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
-#: include/actions.inc.php:161 include/blocks.inc.php:717
+#: include/actions.inc.php:161 include/blocks.inc.php:721
 #: include/classes/screens/CScreenProblem.php:868
 #: include/classes/screens/CScreenProblem.php:893
 #: include/classes/screens/CScreenProblem.php:1162 include/events.inc.php:290
 msgid "Ack"
 msgstr "知悉"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:333
 msgid "Acknowledge"
 msgstr "知悉"
 
@@ -482,7 +482,7 @@ msgstr "知悉"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:687 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "已知悉"
@@ -511,20 +511,22 @@ msgstr ""
 #: app/views/administration.script.edit.php:66
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.correlation.edit.php:59
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
 #: app/views/monitoring.widget.actionlog.view.php:34
-#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:270
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
+#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
 #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:228
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133
-#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200
-#: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125
-#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
+#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
+#: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
@@ -627,7 +629,7 @@ msgstr "動作已更新"
 #: app/views/administration.mediatype.edit.php:282
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.dashboard.view.php:116
-#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:718
+#: app/views/monitoring.widget.problems.view.php:67 include/blocks.inc.php:722
 #: include/classes/helpers/CMenuHelper.php:177
 #: include/classes/helpers/CRoleHelper.php:435
 #: include/classes/screens/CScreenProblem.php:869
@@ -636,7 +638,7 @@ msgstr "動作已更新"
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
 #: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: jsLoader.php:177 jsLoader.php:192 jsLoader.php:206 jsLoader.php:332
 #: tr_events.php:182
 msgid "Actions"
 msgstr "動作"
@@ -695,8 +697,8 @@ msgstr "作用中直到"
 #: app/views/administration.script.edit.php:87
 #: app/views/administration.script.edit.php:275
 #: app/views/administration.token.edit.php:103
-#: app/views/administration.user.edit.php:369
-#: app/views/administration.user.edit.php:669
+#: app/views/administration.user.edit.php:372
+#: app/views/administration.user.edit.php:672
 #: app/views/administration.usergroup.edit.php:144
 #: app/views/administration.usergroup.edit.php:195
 #: app/views/administration.usergroup.edit.php:234
@@ -707,7 +709,6 @@ msgstr "作用中直到"
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
-#: app/views/dashboard.share.edit.php:33 app/views/dashboard.share.edit.php:54
 #: app/views/js/administration.mediatype.edit.js.php:134
 #: app/views/js/administration.mediatype.edit.js.php:234
 #: app/views/js/administration.script.edit.js.php:263
@@ -715,11 +716,13 @@ msgstr "作用中直到"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:702
+#: app/views/popup.condition.common.php:700
+#: app/views/popup.dashboard.share.edit.php:36
+#: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123
 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:292
+#: app/views/popup.lldoperation.php:160 app/views/popup.lldoperation.php:290
 #: app/views/popup.lldoverride.php:176 app/views/popup.lldoverride.php:201
 #: app/views/popup.lldoverride.php:220
 #: app/views/popup.maintenance.period.php:189
@@ -731,15 +734,17 @@ msgstr "作用中直到"
 #: app/views/popup.massupdate.service.php:44
 #: app/views/popup.massupdate.template.php:52
 #: app/views/popup.massupdate.template.php:134
-#: app/views/popup.massupdate.trigger.php:81
-#: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52
+#: app/views/popup.massupdate.trigger.php:78
+#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144
-#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150
+#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
+#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
 #: include/classes/widgets/CWidgetHelper.php:530 include/forms.inc.php:1481
@@ -806,7 +811,7 @@ msgstr "作用中直到"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:196
 msgid "Add"
 msgstr "新增"
 
@@ -814,19 +819,19 @@ msgstr "新增"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:166
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:197
 msgid "Add child element"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:122
+#: app/partials/monitoring.service.list.edit.php:121
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:227
+#: app/views/js/popup.service.edit.js.php:302
 msgid "Add child services"
 msgstr ""
 
@@ -843,7 +848,7 @@ msgstr "新增主機"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:198
 msgid "Add multiple maps"
 msgstr ""
 
@@ -860,7 +865,11 @@ msgstr ""
 msgid "Add new override"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392
+#: jsLoader.php:145
+msgid "Add page"
+msgstr ""
+
+#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:397
 msgid "Add parent services"
 msgstr ""
 
@@ -868,7 +877,7 @@ msgstr ""
 msgid "Add problem comments"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:105
+#: app/views/popup.massupdate.trigger.php:102
 #: include/views/configuration.graph.edit.php:429
 #: include/views/configuration.trigger.prototype.edit.php:624
 msgid "Add prototype"
@@ -902,7 +911,7 @@ msgstr ""
 msgid "Add user group"
 msgstr ""
 
-#: app/views/monitoring.dashboard.widget.edit.php:34
+#: app/views/monitoring.dashboard.widget.edit.php:34 jsLoader.php:146
 msgid "Add widget"
 msgstr ""
 
@@ -911,12 +920,20 @@ msgstr ""
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:321
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "Additional rule"
+msgstr ""
+
+#: app/views/popup.service.edit.php:154
+msgid "Additional rules"
+msgstr ""
+
 #: include/hosts.inc.php:63 include/users.inc.php:53
 msgid "Admin"
 msgstr "管理者"
@@ -926,6 +943,10 @@ msgstr "管理者"
 msgid "Administration"
 msgstr "管理"
 
+#: app/views/popup.service.edit.php:126
+msgid "Advanced configuration"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
 msgstr "進階標示"
@@ -1012,7 +1033,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:389
 msgid "All"
 msgstr "所有"
 
@@ -1021,8 +1042,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
-#: app/views/administration.user.edit.php:428
-#: app/views/administration.user.edit.php:434
+#: app/views/administration.user.edit.php:431
+#: app/views/administration.user.edit.php:437
 msgid "All groups"
 msgstr ""
 
@@ -1030,7 +1051,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:277
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "所有的連結應含 特定的名稱和URL"
 
@@ -1064,7 +1085,7 @@ msgstr ""
 msgid "Allow list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:64 include/triggers.inc.php:1171
+#: app/views/popup.massupdate.trigger.php:61 include/triggers.inc.php:994
 #: include/views/configuration.trigger.prototype.edit.php:515
 #: include/views/configuration.triggers.edit.php:542
 msgid "Allow manual close"
@@ -1077,7 +1098,7 @@ msgstr ""
 msgid "Allowed hosts"
 msgstr "容許的主機"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Allowed methods"
 msgstr ""
 
@@ -1095,7 +1116,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:240
 #: app/views/configuration.correlation.edit.php:116
-#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1241
+#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:123
 #: include/views/configuration.host.discovery.edit.php:668
 #: include/views/configuration.trigger.prototype.edit.php:155
@@ -1136,12 +1157,12 @@ msgstr "且/或"
 #: app/views/administration.user.token.list.php:59
 #: app/views/configuration.correlation.list.php:55
 #: app/views/configuration.discovery.list.php:55
-#: app/views/monitoring.service.list.edit.php:145
-#: app/views/monitoring.service.list.edit.php:173
-#: app/views/monitoring.service.list.php:136
+#: app/views/monitoring.service.list.edit.php:86
+#: app/views/monitoring.service.list.edit.php:114
+#: app/views/monitoring.service.list.php:82
 #: app/views/reports.scheduledreport.list.php:62
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36
-#: include/triggers.inc.php:1774
+#: include/triggers.inc.php:1597
 #: include/views/configuration.action.list.php:75
 #: include/views/configuration.host.list.php:112
 #: include/views/configuration.maintenance.list.php:65
@@ -1161,15 +1182,15 @@ msgstr "應用集 錯誤."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45
+#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:44
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:199
+#: jsLoader.php:312
 msgid "Apply"
 msgstr "適用"
 
@@ -1187,7 +1208,7 @@ msgstr "接近中"
 msgid "Apr"
 msgstr "四月"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:229
 msgid "April"
 msgstr "四月"
 
@@ -1215,6 +1236,10 @@ msgstr "區域類型"
 msgid "Arithmetic"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:146
+msgid "As is"
+msgstr ""
+
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
 msgstr "純文字"
@@ -1263,8 +1288,8 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:611
-#: include/classes/api/services/CUser.php:1275
+#: include/classes/api/services/CUser.php:607
+#: include/classes/api/services/CUser.php:1285
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
 msgstr ""
@@ -1342,7 +1367,7 @@ msgstr ""
 msgid "Aug"
 msgstr "八月"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:233
 msgid "August"
 msgstr "八月"
 
@@ -1372,7 +1397,7 @@ msgstr "認證"
 msgid "Authentication algorithm"
 msgstr "認證法則"
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 #, c-format
 msgid "Authentication failed: %1$s."
 msgstr ""
@@ -1421,7 +1446,7 @@ msgstr ""
 msgid "Auto-login"
 msgstr "自動登入"
 
-#: include/classes/api/services/CUser.php:1015
+#: include/classes/api/services/CUser.php:1011
 msgid "Auto-login and auto-logout options cannot be enabled together."
 msgstr ""
 
@@ -1431,7 +1456,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
-#: app/views/popup.lldoperation.php:284
+#: app/views/popup.lldoperation.php:282
 #: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
@@ -1616,11 +1641,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "底部"
 
-#: jsLoader.php:264
+#: jsLoader.php:269
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:268
 msgid "Bring to front"
 msgstr ""
 
@@ -1701,7 +1726,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "計算的"
 
-#: jsLoader.php:220
+#: jsLoader.php:225
 msgid "Calendar"
 msgstr ""
 
@@ -1721,8 +1746,8 @@ msgstr "回呼"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:268
 #: app/views/administration.token.edit.php:97
-#: app/views/administration.user.edit.php:648
-#: app/views/administration.user.edit.php:679
+#: app/views/administration.user.edit.php:651
+#: app/views/administration.user.edit.php:682
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:266
 #: app/views/administration.user.token.edit.php:78
@@ -1739,8 +1764,8 @@ msgstr "回呼"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:200
+#: jsLoader.php:210 jsLoader.php:313 jsLoader.php:385
 msgid "Cancel"
 msgstr "取消"
 
@@ -1770,7 +1795,7 @@ msgstr "無法新增操作"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:147
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1781,7 +1806,7 @@ msgid "Cannot add dependency from a host to a template."
 msgstr "無法新增自主機到模板的相依關係"
 
 #: include/classes/api/services/CDiscoveryRule.php:889
-#: include/triggers.inc.php:548
+#: include/triggers.inc.php:371
 #, 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\"."
@@ -1899,7 +1924,7 @@ msgid "Cannot add user"
 msgstr "無法新增用户"
 
 #: app/controllers/CControllerUsergroupCreate.php:51
-#: app/controllers/CControllerUsergroupCreate.php:100
+#: app/controllers/CControllerUsergroupCreate.php:101
 msgid "Cannot add user group"
 msgstr ""
 
@@ -1907,11 +1932,11 @@ msgstr ""
 msgid "Cannot add web scenario"
 msgstr "無法新增網頁檢測"
 
-#: jsLoader.php:146
+#: jsLoader.php:148
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:324
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1989,7 +2014,7 @@ msgid "Cannot copy trigger"
 msgid_plural "Cannot copy triggers"
 msgstr[0] ""
 
-#: include/triggers.inc.php:403
+#: include/triggers.inc.php:226
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "無法複製觸發器 \"%1$s:%2$s\", 因為在其表示式中有多重主機."
@@ -2043,7 +2068,7 @@ msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1246
+#: include/classes/api/services/CUser.php:1256
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "無法刪除Zabbix內部用戶 \"%1$s\", 試試停用那用戶."
@@ -2424,7 +2449,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:280
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2592,7 +2617,7 @@ msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:1438
+#: include/classes/api/services/CUser.php:1448
 msgid "Cannot log out."
 msgstr ""
 
@@ -2654,7 +2679,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "無法讀取回應，請檢查跟Zabbix主機 \"%1$s\" 的連線"
 
-#: include/classes/api/services/CUser.php:553
+#: include/classes/api/services/CUser.php:549
 msgid "Cannot rename guest user."
 msgstr "無法重新命名訪客用戶."
 
@@ -2713,7 +2738,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: jsLoader.php:283
+#: include/classes/api/services/CService.php:650
+#, c-format
+msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
+msgstr ""
+
+#: jsLoader.php:288
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -3129,6 +3159,7 @@ msgid "Change per second"
 msgstr ""
 
 #: app/views/popup.acknowledge.edit.php:71
+#: include/classes/helpers/CRoleHelper.php:493
 msgid "Change severity"
 msgstr ""
 
@@ -3270,7 +3301,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "檢查必需是唯一的"
 
-#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230
+#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
 msgid "Child services"
 msgstr ""
 
@@ -3312,11 +3343,11 @@ msgstr "清除歷史和趨勢"
 msgid "Clear when unlinking"
 msgstr "清除當無連結時"
 
-#: jsLoader.php:162
+#: jsLoader.php:167
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:311
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3346,7 +3377,7 @@ msgstr "Clock"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:335
 msgid "Clone"
 msgstr "克隆"
 
@@ -3357,8 +3388,8 @@ msgstr "克隆"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:211
+#: jsLoader.php:290 jsLoader.php:307 jsLoader.php:378
 msgid "Close"
 msgstr "關閉"
 
@@ -3388,8 +3419,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:301
+#: jsLoader.php:306
 msgid "Collapse"
 msgstr ""
 
@@ -3406,7 +3437,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:282
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3474,6 +3505,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:1495
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
+#: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
 msgstr "條件"
 
@@ -3528,7 +3560,7 @@ msgstr "條件"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:355
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:334
 msgid "Configuration"
 msgstr "組態"
 
@@ -3791,7 +3823,7 @@ msgstr "聯絡"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:103
+#: app/views/popup.service.edit.php:89
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3828,8 +3860,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:40
 #: app/views/monitoring.map.view.php:71
 #: app/views/monitoring.problem.view.php:103
-#: app/views/monitoring.service.list.edit.php:208
-#: app/views/monitoring.service.list.php:174
+#: app/views/monitoring.service.list.edit.php:149
+#: app/views/monitoring.service.list.php:120
 #: app/views/monitoring.web.view.php:42
 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192
 #: include/classes/html/widget/CWidget.php:128
@@ -3890,8 +3922,8 @@ msgstr "座標"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:149
+#: jsLoader.php:178 jsLoader.php:274
 msgid "Copy"
 msgstr "複製"
 
@@ -4018,11 +4050,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:339
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:338
 msgid "Create dependent item"
 msgstr ""
 
@@ -4139,7 +4171,7 @@ msgstr "創建拓墣圖"
 msgid "Create media type"
 msgstr "創建示警媒介類型"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:336
 msgid "Create new"
 msgstr ""
 
@@ -4155,7 +4187,7 @@ msgstr ""
 msgid "Create script"
 msgstr "創建脚本"
 
-#: app/views/monitoring.service.list.edit.php:194
+#: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
 msgstr ""
 
@@ -4163,7 +4195,7 @@ msgstr ""
 msgid "Create template"
 msgstr "創建模板"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:337
 msgid "Create trigger"
 msgstr "創建觸發器"
 
@@ -4382,7 +4414,7 @@ msgstr ""
 msgid "Dashboard properties"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:97
+#: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
 msgstr ""
 
@@ -4412,7 +4444,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:340
 msgid "Dashboards"
 msgstr ""
 
@@ -4582,7 +4614,7 @@ msgstr "週中第幾日"
 msgid "Days"
 msgstr "日數"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:369
 msgid "Debug"
 msgstr "調試"
 
@@ -4596,7 +4628,7 @@ msgstr "調試模式"
 msgid "Dec"
 msgstr "十二"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:237
 msgid "December"
 msgstr "十二"
 
@@ -4605,13 +4637,17 @@ msgstr "十二"
 msgid "Decimal places"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:148
+msgid "Decrease by"
+msgstr ""
+
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
 #: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:263
 msgid "Default"
 msgstr "預設"
 
@@ -4681,8 +4717,8 @@ msgid "Delayed by"
 msgstr "延遲因"
 
 #: app/controllers/CControllerAuditLogList.php:195
-#: app/partials/monitoring.service.list.edit.php:132
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:131
+#: app/partials/monitoring.service.list.edit.php:142
 #: app/partials/scheduledreport.formgrid.html.php:233
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
@@ -4696,7 +4732,7 @@ msgstr "延遲因"
 #: app/views/administration.script.list.php:198
 #: app/views/administration.token.edit.php:111
 #: app/views/administration.token.list.php:202
-#: app/views/administration.user.edit.php:657
+#: app/views/administration.user.edit.php:660
 #: app/views/administration.usergroup.edit.php:223
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:251
@@ -4728,8 +4764,8 @@ msgstr "延遲因"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:150
+#: jsLoader.php:179 jsLoader.php:341
 msgid "Delete"
 msgstr "删除"
 
@@ -4758,7 +4794,7 @@ msgstr "刪除目前的動作?"
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:342
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4802,7 +4838,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr "刪除項目?"
 
-#: jsLoader.php:274
+#: jsLoader.php:279
 msgid "Delete links between selected elements?"
 msgstr "刪除所選組件間的連結?"
 
@@ -4858,7 +4894,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "删除所選的探索規則?"
 
-#: jsLoader.php:261
+#: jsLoader.php:266
 msgid "Delete selected elements?"
 msgstr "刪除所選的組件?"
 
@@ -4959,11 +4995,11 @@ msgstr "删除所選的脚本?"
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:143
+#: app/partials/monitoring.service.list.edit.php:142
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:267
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -4979,7 +5015,7 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "删除所選的觸發器?"
 
-#: app/views/administration.user.edit.php:659
+#: app/views/administration.user.edit.php:662
 msgid "Delete selected user?"
 msgstr "删除所選的用戶?"
 
@@ -5030,7 +5066,7 @@ msgstr "已刪除: 模板 \"%1$s\"."
 msgid "Delimiter"
 msgstr "分隔符"
 
-#: app/views/administration.user.edit.php:518
+#: app/views/administration.user.edit.php:521
 msgid "Denied methods"
 msgstr ""
 
@@ -5044,7 +5080,7 @@ msgstr "禁止"
 msgid "Deny list"
 msgstr ""
 
-#: app/views/popup.massupdate.trigger.php:154
+#: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
 #: include/views/configuration.trigger.prototype.edit.php:640
 #: include/views/configuration.triggers.edit.php:619
@@ -5052,7 +5088,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "相依關係"
 
-#: include/triggers.inc.php:2572
+#: include/triggers.inc.php:2395
 msgid "Dependent"
 msgstr "相依"
 
@@ -5060,7 +5096,7 @@ msgstr "相依"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2572
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5088,7 +5124,7 @@ msgstr "佈署狀態"
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.item.php:466
 #: app/views/popup.massupdate.template.php:75
-#: app/views/popup.triggerwizard.php:137 include/events.inc.php:264
+#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:647
 #: include/views/configuration.host.edit.php:184
 #: include/views/configuration.item.edit.php:890
@@ -5252,7 +5288,7 @@ msgstr "停用選取的網頁檢測？"
 #: app/views/administration.token.list.php:96
 #: app/views/administration.token.list.php:184
 #: app/views/administration.user.edit.php:306
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5265,14 +5301,14 @@ msgstr "停用選取的網頁檢測？"
 #: app/views/configuration.correlation.list.php:57
 #: app/views/configuration.correlation.list.php:108
 #: app/views/configuration.discovery.list.php:57
-#: app/views/popup.lldoperation.php:282
+#: app/views/popup.lldoperation.php:280
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
 #: include/hosts.inc.php:1205 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:2045
+#: include/maps.inc.php:325 include/triggers.inc.php:1868
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5355,7 +5391,7 @@ msgid "Discovery by proxy"
 msgstr "由系統代理程式探索"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:423 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "探索檢查"
 
@@ -5367,7 +5403,7 @@ msgstr "探索檢查"
 msgid "Discovery list"
 msgstr "探索清單"
 
-#: app/views/popup.condition.common.php:441 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "探索物件"
 
@@ -5464,7 +5500,7 @@ msgstr "探索規則已更新"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5475,7 +5511,7 @@ msgstr "探索規則"
 msgid "Discovery rules deleted"
 msgstr "探索規則已删除"
 
-#: app/views/popup.condition.common.php:491 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "探索狀態"
@@ -5515,7 +5551,7 @@ msgstr "顯示重疊圖表"
 #: app/views/administration.queue.details.php:85 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:381
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "顯示 已探索的 %2$s中的%1$s"
@@ -5533,10 +5569,6 @@ msgstr ""
 msgid "Division denominator"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:28
-msgid "Do not calculate"
-msgstr "不要計算"
-
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:294
 #: include/views/configuration.item.edit.php:760
@@ -5551,7 +5583,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:219 jsLoader.php:343
 msgid "Do you wish to replace the conditional expression?"
 msgstr "您想要替換條件式表示式嗎?"
 
@@ -5607,7 +5639,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "下"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:193 jsLoader.php:207
 msgid "Download image"
 msgstr ""
 
@@ -5616,7 +5648,7 @@ msgid "Download the configuration file"
 msgstr ""
 
 #: app/partials/service.time.row.php:34
-#: app/views/popup.service.time.edit.php:46
+#: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
 msgstr "斷線時間"
@@ -5692,7 +5724,7 @@ msgid "Duplicate userid \"%1$s\" in users for map \"%2$s\"."
 msgstr ""
 
 #: app/views/hintbox.eventlist.php:75
-#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:716
+#: app/views/monitoring.widget.problems.view.php:65 include/blocks.inc.php:720
 #: include/classes/screens/CScreenProblem.php:867
 #: include/classes/screens/CScreenProblem.php:892
 #: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
@@ -5714,7 +5746,7 @@ msgstr "動態監控項"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:278
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每個URL必須是唯一的. 請確保僅有一個URL為名."
 
@@ -5722,13 +5754,14 @@ msgstr "每個URL必須是唯一的. 請確保僅有一個URL為名."
 msgid "Each item"
 msgstr ""
 
-#: app/partials/monitoring.service.list.edit.php:127
+#: app/partials/monitoring.service.list.edit.php:126
+#: app/partials/service.statusrule.row.php:38
 #: app/partials/service.time.row.php:59
-#: app/views/administration.user.edit.php:354
+#: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/monitoring.service.list.edit.php:204
-#: app/views/monitoring.service.list.php:168
+#: app/views/monitoring.service.list.edit.php:145
+#: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
 #: include/views/configuration.action.edit.php:277
 #: include/views/configuration.action.edit.php:361
@@ -5740,8 +5773,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:180
+#: jsLoader.php:201
 msgid "Edit"
 msgstr "編輯"
 
@@ -5757,11 +5790,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:202
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:344
 msgid "Edit trigger"
 msgstr "編輯觸發器"
 
@@ -6036,7 +6069,7 @@ msgstr ""
 #: app/views/administration.token.list.php:175
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:300
-#: app/views/administration.user.edit.php:499
+#: app/views/administration.user.edit.php:502
 #: app/views/administration.usergroup.edit.php:80
 #: app/views/administration.usergroup.edit.php:92
 #: app/views/administration.usergroup.edit.php:93
@@ -6058,12 +6091,12 @@ msgstr ""
 #: app/views/configuration.discovery.edit.php:131
 #: app/views/configuration.discovery.list.php:56
 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
-#: app/views/popup.triggerwizard.php:140
+#: app/views/popup.triggerwizard.php:137
 #: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
-#: include/items.inc.php:182 include/triggers.inc.php:1176
-#: include/triggers.inc.php:2042
+#: include/items.inc.php:182 include/triggers.inc.php:999
+#: include/triggers.inc.php:1865
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6122,7 +6155,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:102
+#: app/views/popup.service.edit.php:88
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6146,7 +6179,7 @@ msgstr "錯誤"
 msgid "Error in search request for table \"%1$s\"."
 msgstr "資料表搜尋請求 \"%1$s\"的錯誤."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:221
 msgid "Error message"
 msgstr ""
 
@@ -6185,7 +6218,7 @@ msgstr ""
 msgid "Event details"
 msgstr "事件細節"
 
-#: include/triggers.inc.php:1166
+#: include/triggers.inc.php:989
 msgid "Event generation"
 msgstr "事件產出"
 
@@ -6215,7 +6248,7 @@ msgstr ""
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:617 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6248,7 +6281,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:170
 #: app/partials/js/scheduledreport.subscription.js.php:185
 #: app/views/popup.scheduledreport.subscription.php:119
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:109
 msgid "Exclude"
 msgstr "除外"
 
@@ -6259,7 +6292,7 @@ msgstr "除外"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:196 jsLoader.php:212
 msgid "Execute"
 msgstr "執行"
 
@@ -6305,7 +6338,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "已執行的腳本"
 
-#: jsLoader.php:208
+#: jsLoader.php:213
 msgid "Execution confirmation"
 msgstr "執行確認"
 
@@ -6321,8 +6354,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:302
+#: jsLoader.php:305
 msgid "Expand"
 msgstr ""
 
@@ -6389,7 +6422,7 @@ msgstr "匯出到CSV"
 #: app/views/administration.regex.edit.php:49
 #: app/views/administration.regex.edit.php:128
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:97
+#: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:187
 #: include/views/configuration.trigger.prototype.edit.php:198
@@ -6443,7 +6476,7 @@ msgstr "表示式"
 msgid "External check"
 msgstr "外在檢查"
 
-#: jsLoader.php:244
+#: jsLoader.php:249
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6467,7 +6500,7 @@ msgid "Failed"
 msgstr "已失敗"
 
 #: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerTemplateDashboardUpdate.php:136 jsLoader.php:151
 msgid "Failed to create dashboard"
 msgstr ""
 
@@ -6476,24 +6509,24 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:152
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:153
 msgid "Failed to paste widget."
 msgstr ""
 
 #: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerTemplateDashboardUpdate.php:131 jsLoader.php:154
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:155
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:156
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6501,7 +6534,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:157
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6525,7 +6558,7 @@ msgstr ""
 msgid "Feb"
 msgstr "二月"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:227
 msgid "February"
 msgstr "二月"
 
@@ -6671,8 +6704,8 @@ msgstr "填滿的區域"
 #: app/views/monitoring.dashboard.list.php:59
 #: app/views/monitoring.discovery.view.php:47
 #: app/views/monitoring.latest.view.php:54
-#: app/views/monitoring.service.list.edit.php:131
-#: app/views/monitoring.service.list.php:122
+#: app/views/monitoring.service.list.edit.php:72
+#: app/views/monitoring.service.list.php:68
 #: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
@@ -6750,6 +6783,10 @@ msgstr "調整至符合拓墣圖"
 msgid "Fixed"
 msgstr "固定的"
 
+#: include/classes/helpers/CServiceHelper.php:150
+msgid "Fixed status"
+msgstr ""
+
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:234
@@ -6815,14 +6852,14 @@ msgstr "法語 (fr_FR)"
 msgid "Fri"
 msgstr "週五"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:242
 msgid "Friday"
 msgstr "週五"
 
 #: app/partials/massupdate.valuemaps.tab.php:45
 #: app/partials/timeselector.filter.php:88
-#: app/views/popup.service.time.edit.php:61
-#: app/views/popup.service.time.edit.php:124
+#: app/views/popup.service.time.edit.php:63
+#: app/views/popup.service.time.edit.php:132
 #: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
@@ -6840,7 +6877,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "前端存取"
 
-#: app/views/administration.user.edit.php:548
+#: app/views/administration.user.edit.php:551
 msgid "Frontend messaging"
 msgstr "前端訊息中"
 
@@ -6922,7 +6959,7 @@ msgid "Get value from host"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:48
-#: include/triggers.inc.php:1324
+#: include/triggers.inc.php:1147
 msgid "Given expression is not a macro"
 msgstr "此表示式不是巨集"
 
@@ -6940,7 +6977,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:349
 msgid "Go to"
 msgstr "到"
 
@@ -6989,7 +7026,7 @@ msgstr "漸層線"
 #: app/controllers/CControllerAuditLogList.php:214
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
-#: include/classes/macros/CMacrosResolverGeneral.php:905
+#: include/classes/macros/CMacrosResolverGeneral.php:1044
 #: include/classes/screens/CScreenProblem.php:1305
 #: include/classes/screens/CScreenProblem.php:1310
 #: include/classes/widgets/CWidgetConfig.php:60
@@ -7149,7 +7186,7 @@ msgstr "名為\"%1$s\"的圖形已經存在於圖形或圖形原型中."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:350
 msgid "Graphs"
 msgstr "圖形"
 
@@ -7349,11 +7386,11 @@ msgstr "說明"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:256
 msgid "Hidden"
 msgstr "隱藏的"
 
-#: jsLoader.php:365
+#: jsLoader.php:370
 msgid "Hide debug"
 msgstr ""
 
@@ -7398,14 +7435,14 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:31
 #: app/views/administration.housekeeping.edit.php:121
 #: app/views/popup.acknowledge.edit.php:43 history.php:27
-#: include/classes/macros/CMacrosResolverGeneral.php:910
+#: include/classes/macros/CMacrosResolverGeneral.php:1049
 #: include/classes/screens/CScreenProblem.php:1312
 #: include/classes/screens/CScreenProblem.php:1317
 #: include/classes/widgets/forms/CWidgetFormProblems.php:36
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:351
 msgid "History"
 msgstr "歷史記錄"
 
@@ -7469,7 +7506,7 @@ msgstr "横向對齊"
 #: app/views/monitoring.widget.problems.view.php:58
 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290
 #: app/views/search.php:30 include/actions.inc.php:50
-#: include/blocks.inc.php:713 include/classes/screens/CScreenHttpTest.php:112
+#: include/blocks.inc.php:717 include/classes/screens/CScreenHttpTest.php:112
 #: include/classes/screens/CScreenProblem.php:863
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1158
@@ -7477,8 +7514,7 @@ msgstr "横向對齊"
 #: include/classes/widgets/forms/CWidgetFormProblems.php:206
 #: include/classes/widgets/forms/CWidgetFormProblems.php:207
 #: include/hostgroups.inc.php:248 include/maps.inc.php:24
-#: include/triggers.inc.php:1133
-#: include/views/configuration.graph.list.php:149
+#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
 #: include/views/configuration.host.discovery.list.php:192
 #: include/views/configuration.host.edit.php:203
 #: include/views/configuration.host.prototype.edit.php:149
@@ -7490,7 +7526,7 @@ msgstr "横向對齊"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:258 jsLoader.php:352
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7568,7 +7604,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:224
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:425
+#: app/views/administration.user.edit.php:428
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7576,7 +7612,7 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:261
 #: report2.php:398
 msgid "Host group"
 msgstr "主機群組"
@@ -7607,7 +7643,7 @@ msgstr "主機群組標示類型"
 #: include/classes/api/services/CDashboardGeneral.php:515
 #: include/classes/api/services/CScript.php:937
 #: include/classes/api/services/CSettings.php:277
-#: include/classes/api/services/CUserGroup.php:452
+#: include/classes/api/services/CUserGroup.php:455
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7624,7 +7660,7 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
 #: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:285
+#: app/views/popup.condition.common.php:283
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7663,7 +7699,7 @@ msgstr "主機介面"
 
 #: app/partials/common.filter.trigger.php:154
 #: app/partials/monitoring.problem.filter.php:230
-#: app/views/popup.lldoperation.php:278 hostinventories.php:26
+#: app/views/popup.lldoperation.php:276 hostinventories.php:26
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:265
 msgid "Host inventory"
@@ -7810,7 +7846,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8042,14 +8078,64 @@ msgstr ""
 msgid "Identification of the system. Returns string"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:83
+#, c-format
+msgid "If at least %2$s child service has %1$s status or above"
+msgid_plural "If at least %2$s child services have %1$s status or above"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:35
+#, c-format
+msgid "If at least %2$s child services have %1$s status or above"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:40
+#: include/classes/helpers/CServiceHelper.php:89
+#, c-format
+msgid "If at least %2$s of child services have %1$s status or above"
+msgstr ""
+
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:95
+#, c-format
+msgid "If less than %2$s child service has %1$s status or below"
+msgid_plural "If less than %2$s child services have %1$s status or below"
+msgstr[0] ""
+
+#: include/classes/helpers/CServiceHelper.php:45
+#, c-format
+msgid "If less than %2$s child services have %1$s status or below"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:50
+#: include/classes/helpers/CServiceHelper.php:101
+#, c-format
+msgid "If less than %2$s of child services have %1$s status or below"
+msgstr ""
+
 #: include/classes/api/services/CReport.php:356
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:55
+#: include/classes/helpers/CServiceHelper.php:60
+#: include/classes/helpers/CServiceHelper.php:106
+#: include/classes/helpers/CServiceHelper.php:110
+#, c-format
+msgid "If weight of child services with %1$s status or above is at least %2$s"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:65
+#: include/classes/helpers/CServiceHelper.php:70
+#: include/classes/helpers/CServiceHelper.php:114
+#: include/classes/helpers/CServiceHelper.php:118
+#, c-format
+msgid "If weight of child services with %1$s status or below is less than %2$s"
+msgstr ""
+
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "假如您認為這個訊息是錯的, 請諮詢您的管理者關於如何取得需要的許可權."
@@ -8058,12 +8144,16 @@ msgstr "假如您認為這個訊息是錯的, 請諮詢您的管理者關於如�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:149
+msgid "Ignore this service"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:262
 msgid "Image"
 msgstr "圖片"
 
@@ -8193,7 +8283,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2197
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8206,11 +8296,11 @@ msgstr ""
 
 #: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
 #: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2336
+#: include/triggers.inc.php:2159
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2542 include/triggers.inc.php:2550
+#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8236,7 +8326,7 @@ msgstr ""
 #: app/partials/js/scheduledreport.subscription.js.php:165
 #: app/partials/js/scheduledreport.subscription.js.php:181
 #: app/views/popup.scheduledreport.subscription.php:118
-#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111
+#: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:108
 msgid "Include"
 msgstr "包含"
 
@@ -8254,6 +8344,11 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
+#: include/classes/api/services/CService.php:688
+#, c-format
+msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
 #, c-format
@@ -8644,7 +8739,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:49
 #: include/classes/triggers/CTextTriggerConstructor.php:115
-#: include/triggers.inc.php:1325
+#: include/triggers.inc.php:1148
 msgid "Incorrect function is used"
 msgstr "使用了不正確的方程式"
 
@@ -8701,7 +8796,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "提供不正確的項目鍵值\"%1$s\"給\"%2$s\"上的觸發器表示式."
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:50
-#: include/triggers.inc.php:1326
+#: include/triggers.inc.php:1149
 msgid "Incorrect item value type"
 msgstr ""
 
@@ -8732,7 +8827,7 @@ msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:102
-#: include/classes/api/services/CUser.php:1606
+#: include/classes/api/services/CUser.php:1616
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
@@ -8872,10 +8967,10 @@ msgstr ""
 msgid "Incorrect user group ID specified for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1504
-#: include/classes/api/services/CUser.php:1518
-#: include/classes/api/services/CUser.php:1549
-#: include/classes/api/services/CUser.php:1943
+#: include/classes/api/services/CUser.php:1514
+#: include/classes/api/services/CUser.php:1528
+#: include/classes/api/services/CUser.php:1559
+#: include/classes/api/services/CUser.php:1953
 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83
 msgid "Incorrect user name or password or account is temporarily blocked."
 msgstr ""
@@ -9182,9 +9277,9 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:2002
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:2012
 #: include/classes/graphdraw/CLineGraphDraw.php:115
 #: include/classes/graphdraw/CLineGraphDraw.php:240
 #: include/classes/graphdraw/CLineGraphDraw.php:250
@@ -9256,6 +9351,10 @@ msgstr ""
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:147
+msgid "Increase by"
+msgstr ""
+
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
 msgstr "印尼語 (id_ID)"
@@ -9267,12 +9366,12 @@ msgstr ""
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
 #: app/partials/scheduledreport.table.html.php:45
-#: app/views/monitoring.service.list.edit.php:90
-#: app/views/monitoring.service.list.php:86
+#: app/views/monitoring.service.list.edit.php:64
+#: app/views/monitoring.service.list.php:60
 #: app/views/monitoring.widget.actionlog.view.php:39
 #: app/views/monitoring.widget.problems.view.php:57
 #: include/actions.inc.php:1827 include/actions.inc.php:1921
-#: include/blocks.inc.php:712 include/classes/screens/CScreenProblem.php:862
+#: include/blocks.inc.php:716 include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:886
 #: include/views/administration.auditacts.list.php:69
 #: include/views/configuration.graph.list.php:141
@@ -9345,7 +9444,7 @@ msgid "Insert"
 msgstr "插入"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:345
 msgid "Insert expression"
 msgstr ""
 
@@ -9453,7 +9552,7 @@ msgstr "IE瀏覽器"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:133 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9501,7 +9600,7 @@ msgstr ""
 msgid "Invalid email address \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:937
+#: include/classes/api/services/CUser.php:933
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
 msgstr ""
@@ -9604,8 +9703,8 @@ msgstr "無效的方法參數."
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1792
-#: include/classes/api/services/CUser.php:911
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUser.php:907
+#: include/classes/api/services/CUser.php:918
 #: include/classes/api/services/CValueMap.php:432
 #: include/classes/api/services/CValueMap.php:581
 #: include/classes/api/services/CValueMap.php:591
@@ -9809,7 +9908,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:350
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:353
 msgid "Inventory"
 msgstr "資產記錄"
 
@@ -9995,7 +10094,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:375
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10156,7 +10255,7 @@ msgstr ""
 msgid "Jan"
 msgstr "一月"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:226
 msgid "January"
 msgstr "一月"
 
@@ -10178,7 +10277,7 @@ msgstr ""
 msgid "Jul"
 msgstr "七月"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:232
 msgid "July"
 msgstr "七月"
 
@@ -10186,7 +10285,7 @@ msgstr "七月"
 msgid "Jun"
 msgstr "六月"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:231
 msgid "June"
 msgstr "六月"
 
@@ -10220,7 +10319,7 @@ msgstr "鍵值"
 msgid "Key passphrase"
 msgstr "鍵值通行短語"
 
-#: app/views/popup.triggerwizard.php:123
+#: app/views/popup.triggerwizard.php:120
 msgid "Keyword"
 msgstr "關鍵字"
 
@@ -10290,7 +10389,7 @@ msgstr "標示位置"
 msgid "Language"
 msgstr "語言"
 
-#: include/classes/api/services/CUser.php:778
+#: include/classes/api/services/CUser.php:774
 #, c-format
 msgid "Language \"%1$s\" is not supported."
 msgstr ""
@@ -10363,11 +10462,11 @@ msgstr ""
 msgid "Last check"
 msgstr "最近檢查記錄"
 
-#: jsLoader.php:351
+#: jsLoader.php:356
 msgid "Last hour graph"
 msgstr "最近一小時"
 
-#: jsLoader.php:352
+#: jsLoader.php:357
 msgid "Last month graph"
 msgstr "上月圖形"
 
@@ -10405,7 +10504,7 @@ msgstr ""
 msgid "Last value"
 msgstr "最新數據"
 
-#: jsLoader.php:353
+#: jsLoader.php:358
 msgid "Last week graph"
 msgstr "仩週圖形"
 
@@ -10418,11 +10517,11 @@ msgstr "仩週圖形"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:383
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:354
 msgid "Latest data"
 msgstr "最新數據"
 
-#: jsLoader.php:350
+#: jsLoader.php:355
 msgid "Latest values"
 msgstr "最新數據"
 
@@ -10533,7 +10632,7 @@ msgid "Link new templates"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:240
+#: app/views/popup.lldoperation.php:238
 #: app/views/popup.massupdate.host.php:140
 #: app/views/popup.massupdate.template.php:120
 msgid "Link templates"
@@ -10611,12 +10710,12 @@ msgstr ""
 msgid "List of object instances of Windows performance counters. Returns JSON"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:84
+#: app/views/popup.dashboard.share.edit.php:129
 #: include/views/monitoring.sysmap.edit.php:402
 msgid "List of user group shares"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:89
+#: app/views/popup.dashboard.share.edit.php:134
 #: include/views/monitoring.sysmap.edit.php:407
 msgid "List of user shares"
 msgstr ""
@@ -10744,7 +10843,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:245
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10904,7 +11003,7 @@ msgstr ""
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
-#: app/views/popup.lldoperation.php:283
+#: app/views/popup.lldoperation.php:281
 #: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
@@ -10933,7 +11032,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:259 map.php:25
 msgid "Map"
 msgstr "拓墣圖"
 
@@ -10972,7 +11071,7 @@ msgstr ""
 msgid "Map element label type"
 msgstr ""
 
-#: sysmap.php:130
+#: sysmap.php:131
 msgid "Map is updated! Return to map list?"
 msgstr ""
 
@@ -10998,7 +11097,7 @@ msgstr ""
 msgid "Map shape"
 msgstr ""
 
-#: sysmap.php:135
+#: sysmap.php:136
 msgid "Map update failed."
 msgstr ""
 
@@ -11034,7 +11133,7 @@ msgstr "拓墣圖"
 msgid "Mar"
 msgstr "三月"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:228
 msgid "March"
 msgstr "三月"
 
@@ -11061,7 +11160,7 @@ msgstr ""
 #: app/controllers/CControllerPopupMassupdateService.php:170
 #: app/controllers/CControllerPopupMassupdateTemplate.php:364
 #: app/controllers/CControllerPopupMassupdateTrigger.php:235
-#: app/partials/monitoring.service.list.edit.php:139
+#: app/partials/monitoring.service.list.edit.php:138
 #: include/classes/screens/CScreenProblem.php:1135
 #: include/views/configuration.host.list.php:444
 #: include/views/configuration.item.list.php:309
@@ -11132,9 +11231,9 @@ msgstr ""
 msgid "Maximum number of processes supported by OS. Returns integer"
 msgstr ""
 
-#: include/blocks.inc.php:630
+#: include/blocks.inc.php:632
 #, c-format
-msgid "Maximum required database version is %1$s."
+msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
@@ -11146,12 +11245,12 @@ msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: include/classes/api/services/CUser.php:944
+#: include/classes/api/services/CUser.php:940
 #, c-format
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:230
 msgid "May"
 msgstr "五月"
 
@@ -11161,8 +11260,8 @@ msgid "May"
 msgstr "五月"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:366
-#: app/views/administration.user.edit.php:381 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:369
+#: app/views/administration.user.edit.php:384 app/views/popup.media.php:69
 msgid "Media"
 msgstr "示警媒介"
 
@@ -11222,7 +11321,7 @@ msgstr ""
 msgid "Media type updated"
 msgstr "示警媒介類型已更新"
 
-#: include/classes/api/services/CUser.php:868
+#: include/classes/api/services/CUser.php:864
 #, c-format
 msgid "Media type with ID \"%1$s\" is not available."
 msgstr ""
@@ -11295,8 +11394,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:553
-#: app/views/administration.user.edit.php:565
+#: app/views/administration.user.edit.php:556
+#: app/views/administration.user.edit.php:568
 msgid "Message timeout"
 msgstr "訊息逾時"
 
@@ -11314,7 +11413,7 @@ msgstr ""
 msgid "Messages"
 msgstr "訊息"
 
-#: app/views/administration.user.edit.php:643
+#: app/views/administration.user.edit.php:646
 msgid "Messaging"
 msgstr "訊息中"
 
@@ -11342,6 +11441,11 @@ msgstr ""
 msgid "Minimum password length"
 msgstr ""
 
+#: include/blocks.inc.php:626
+#, c-format
+msgid "Minimum required %1$s database version is %2$s."
+msgstr ""
+
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
@@ -11357,11 +11461,6 @@ msgstr ""
 msgid "Minimum required PHP version is %1$s."
 msgstr ""
 
-#: include/blocks.inc.php:626
-#, c-format
-msgid "Minimum required database version is %1$s."
-msgstr ""
-
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
@@ -11502,7 +11601,7 @@ msgstr ""
 msgid "Mon"
 msgstr "一"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:238
 msgid "Monday"
 msgstr "週一"
 
@@ -11542,11 +11641,11 @@ msgstr "月"
 msgid "Monthly"
 msgstr "每月"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:317
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:327
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11562,6 +11661,14 @@ msgstr "10分鐘以上"
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "於主機中多於一個名為\"%1$s\"的圖形."
 
+#: include/classes/helpers/CServiceHelper.php:27
+msgid "Most critical if all children have problems"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:26
+msgid "Most critical of child services"
+msgstr ""
+
 #: include/httptest.inc.php:405
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
@@ -11571,11 +11678,11 @@ msgstr "Mozilla Firefox"
 msgid "Multiple"
 msgstr ""
 
-#: include/triggers.inc.php:1167
+#: include/triggers.inc.php:990
 msgid "Multiple PROBLEM events"
 msgstr "多重問題(PROBLEM)事件"
 
-#: jsLoader.php:282
+#: jsLoader.php:287
 msgid "Mute"
 msgstr "靜音"
 
@@ -11583,6 +11690,18 @@ msgstr "靜音"
 msgid "My"
 msgstr ""
 
+#: include/classes/helpers/CServiceHelper.php:37
+#: include/classes/helpers/CServiceHelper.php:47
+msgid "N"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:42
+#: include/classes/helpers/CServiceHelper.php:52
+#: include/classes/helpers/CServiceHelper.php:62
+#: include/classes/helpers/CServiceHelper.php:72
+msgid "N%"
+msgstr ""
+
 #: include/discovery.inc.php:53
 msgid "NNTP"
 msgstr "NNTP"
@@ -11677,25 +11796,26 @@ msgstr ""
 #: app/views/monitoring.dashboard.list.php:60
 #: app/views/monitoring.dashboard.list.php:84
 #: app/views/monitoring.latest.view.php:91
-#: app/views/monitoring.service.list.edit.php:135
-#: app/views/monitoring.service.list.php:126
+#: app/views/monitoring.service.list.edit.php:76
+#: app/views/monitoring.service.list.php:72
 #: app/views/monitoring.widget.navtreeitem.edit.php:34
 #: app/views/monitoring.widget.plaintext.view.php:48
 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325
-#: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47
+#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.massupdate.trigger.php:101
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82
-#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37
-#: app/views/popup.services.php:56 app/views/popup.tabfilter.edit.php:31
-#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.massupdate.trigger.php:98
+#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
+#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
+#: app/views/popup.services.php:37 app/views/popup.services.php:55
+#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
+#: app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -11838,6 +11958,10 @@ msgstr ""
 msgid "Never"
 msgstr "從未"
 
+#: app/views/popup.service.statusrule.edit.php:94
+msgid "New additional rule"
+msgstr ""
+
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
 #: app/controllers/CControllerPopupConditionOperations.php:68
@@ -11849,7 +11973,7 @@ msgstr "新的觸發條件"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:273
 msgid "New element"
 msgstr "新的組件"
 
@@ -11873,7 +11997,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "新的正規表示式"
 
-#: app/controllers/CControllerPopupServiceEdit.php:134
+#: app/controllers/CControllerPopupServiceEdit.php:178
 msgid "New service"
 msgstr ""
 
@@ -11890,7 +12014,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:186
 msgid "Next page"
 msgstr ""
 
@@ -11908,20 +12032,20 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:682
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
 #: app/views/popup.massupdate.item.php:379
-#: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33
+#: app/views/popup.massupdate.trigger.php:64 include/actions.inc.php:33
 #: include/blocks.inc.php:532 include/blocks.inc.php:610
-#: include/blocks.inc.php:839 include/blocks.inc.php:843
+#: include/blocks.inc.php:843 include/blocks.inc.php:847
 #: include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1173
-#: include/triggers.inc.php:1178
+#: include/events.inc.php:396 include/triggers.inc.php:996
+#: include/triggers.inc.php:1001
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -12054,7 +12178,7 @@ msgstr "沒有細節"
 msgid "No discovery rule IDs given."
 msgstr "沒有所稱的探索規則ID"
 
-#: app/views/administration.user.edit.php:475
+#: app/views/administration.user.edit.php:478
 #: app/views/administration.userrole.edit.php:162
 msgid "No enabled modules found."
 msgstr ""
@@ -12116,7 +12240,7 @@ msgstr "沒有圖片"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:374
 msgid "No interface found"
 msgstr "沒有找到介面"
 
@@ -12156,7 +12280,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:316
 msgid "No matches found"
 msgstr ""
 
@@ -12169,8 +12293,8 @@ msgstr ""
 msgid "No operation type given for correlation \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1524
-#: include/classes/api/services/CUser.php:1958
+#: include/classes/api/services/CUser.php:1534
+#: include/classes/api/services/CUser.php:1968
 msgid "No permissions for system access."
 msgstr "沒有系統存取的許可權"
 
@@ -12182,7 +12306,6 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareEdit.php:80
 #: app/controllers/CControllerDashboardShareUpdate.php:93
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
@@ -12190,11 +12313,12 @@ msgstr ""
 #: app/controllers/CControllerHintboxEventlist.php:53
 #: app/controllers/CControllerHostDashboardView.php:115
 #: app/controllers/CControllerMenuPopup.php:74
-#: app/controllers/CControllerMenuPopup.php:217
-#: app/controllers/CControllerMenuPopup.php:284
-#: app/controllers/CControllerMenuPopup.php:315
-#: app/controllers/CControllerMenuPopup.php:498
-#: app/controllers/CControllerMenuPopup.php:713
+#: app/controllers/CControllerMenuPopup.php:220
+#: app/controllers/CControllerMenuPopup.php:287
+#: app/controllers/CControllerMenuPopup.php:318
+#: app/controllers/CControllerMenuPopup.php:507
+#: app/controllers/CControllerMenuPopup.php:722
+#: app/controllers/CControllerPopupDashboardShareEdit.php:80
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:56
 #: app/controllers/CControllerPopupMediatypeTestSend.php:73
 #: app/controllers/CControllerPopupScriptExec.php:120
@@ -12312,19 +12436,19 @@ msgstr ""
 #: include/classes/api/services/CScript.php:1043
 #: include/classes/api/services/CScript.php:1060
 #: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:314
-#: include/classes/api/services/CService.php:346
-#: include/classes/api/services/CService.php:675
-#: include/classes/api/services/CService.php:714
+#: include/classes/api/services/CService.php:344
+#: include/classes/api/services/CService.php:377
+#: include/classes/api/services/CService.php:798
+#: include/classes/api/services/CService.php:837
 #: include/classes/api/services/CSettings.php:265
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
 #: include/classes/api/services/CTemplateDashboard.php:376
 #: include/classes/api/services/CTemplate.php:912
-#: include/classes/api/services/CToken.php:355
-#: include/classes/api/services/CToken.php:422
-#: include/classes/api/services/CToken.php:459
+#: include/classes/api/services/CToken.php:366
+#: include/classes/api/services/CToken.php:429
+#: include/classes/api/services/CToken.php:463
 #: include/classes/api/services/CTriggerGeneral.php:1062
 #: include/classes/api/services/CTrigger.php:649
 #: include/classes/api/services/CTrigger.php:696
@@ -12333,15 +12457,15 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:336
-#: include/classes/api/services/CUserGroup.php:884
+#: include/classes/api/services/CUserGroup.php:326
+#: include/classes/api/services/CUserGroup.php:893
 #: include/classes/api/services/CUserMacro.php:353
 #: include/classes/api/services/CUserMacro.php:463
 #: include/classes/api/services/CUserMacro.php:550
 #: include/classes/api/services/CUserMacro.php:742
 #: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:545
-#: include/classes/api/services/CUser.php:1234
+#: include/classes/api/services/CUser.php:541
+#: include/classes/api/services/CUser.php:1244
 #: include/classes/api/services/CValueMap.php:299
 #: include/classes/api/services/CValueMap.php:408
 #: include/classes/api/services/CValueMap.php:514
@@ -12368,7 +12492,7 @@ msgstr "沒有指定的公開金鑰檔"
 msgid "No recipients for action operation message."
 msgstr "沒有動作操作訊息的收受者."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:181
 msgid "No refresh"
 msgstr ""
 
@@ -12384,7 +12508,7 @@ msgstr "沒有選擇目標"
 msgid "No target selected."
 msgstr "沒有已選的目標"
 
-#: include/triggers.inc.php:268
+#: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
 msgstr ""
@@ -12431,7 +12555,7 @@ msgstr "無"
 
 #: app/partials/configuration.filter.items.php:177
 #: app/views/popup.generic.php:520 include/graphs.inc.php:24
-#: include/items.inc.php:156 include/triggers.inc.php:1166
+#: include/items.inc.php:156 include/triggers.inc.php:989
 #: include/views/configuration.host.discovery.list.php:157
 #: include/views/configuration.triggers.list.php:76
 #: include/views/monitoring.history.php:256
@@ -12463,15 +12587,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:570
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:566
+#: include/classes/api/services/CUser.php:562
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "不允許設定用戶\"guest\"的密碼."
 
-#: include/classes/api/services/CUser.php:577
+#: include/classes/api/services/CUser.php:573
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12503,8 +12627,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "不支持的"
 
-#: app/views/popup.service.edit.php:133
-#: app/views/popup.service.time.edit.php:117
+#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "備註"
 
@@ -12534,7 +12658,7 @@ msgstr ""
 msgid "Nov"
 msgstr "十一"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:236
 msgid "November"
 msgstr "十一月"
 
@@ -12697,12 +12821,12 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:125
-#: include/triggers.inc.php:1771 include/views/configuration.item.edit.php:654
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:654
 #: include/views/configuration.item.prototype.edit.php:631
 msgid "Numeric (float)"
 msgstr "數字的 (浮點)"
 
-#: include/triggers.inc.php:1772
+#: include/triggers.inc.php:1595
 msgid "Numeric (integer)"
 msgstr ""
 
@@ -12717,18 +12841,17 @@ msgstr "數字的 (無正負)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/partials/monitoring.service.list.edit.php:112
-#: app/partials/monitoring.service.list.php:108
 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
 #: app/views/js/reports.scheduledreport.edit.js.php:77
-#: app/views/monitoring.service.list.edit.php:80
-#: app/views/monitoring.service.list.edit.php:146
-#: app/views/monitoring.service.list.php:76
-#: app/views/monitoring.service.list.php:137 chart4.php:164
+#: app/views/monitoring.service.list.edit.php:87
+#: app/views/monitoring.service.list.php:83
+#: app/views/popup.service.edit.php:192 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:131
+#: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
 #: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422
-#: include/triggers.inc.php:249
+#: include/triggers.inc.php:72
 #: include/views/monitoring.overview.triggers.php:36
 msgid "OK"
 msgstr "正常"
@@ -12755,7 +12878,7 @@ msgstr "OOP路由器"
 msgid "OOB subnet mask"
 msgstr "OOB子網遮罩"
 
-#: app/views/popup.triggerwizard.php:107
+#: app/views/popup.triggerwizard.php:104
 msgid "OR"
 msgstr "OR"
 
@@ -12783,13 +12906,13 @@ msgstr "十月"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:235
 msgid "October"
 msgstr "十月"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:255
 msgid "Off"
 msgstr "關"
 
@@ -12801,7 +12924,7 @@ msgstr "關"
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:386
 #: report2.php:507
 msgid "Ok"
 msgstr "正常"
@@ -12820,7 +12943,7 @@ msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:254
 msgid "On"
 msgstr "開"
 
@@ -12828,7 +12951,7 @@ msgstr "開"
 msgid "On status change triggers blink for"
 msgstr "於狀態改變時, 觸發器因此閃爍於"
 
-#: app/views/administration.user.edit.php:563
+#: app/views/administration.user.edit.php:566
 msgid "Once"
 msgstr "一次"
 
@@ -12845,7 +12968,7 @@ msgid "One time only"
 msgstr "一次性"
 
 #: app/partials/service.time.row.php:40
-#: app/views/popup.service.time.edit.php:47
+#: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr " 單次停機"
 
@@ -12857,26 +12980,14 @@ msgstr "只有超級管理員可以創建主機群組."
 msgid "Only Super Admins can create media types."
 msgstr "只有超級管理員可以創建示警媒介類型."
 
-#: include/classes/api/services/CUserGroup.php:212
-msgid "Only Super Admins can create user groups."
-msgstr ""
-
 #: include/classes/api/services/CMediatype.php:1139
 msgid "Only Super Admins can delete media types."
 msgstr "只有超級管理員可以刪除示警媒介類型."
 
-#: include/classes/api/services/CUserGroup.php:864
-msgid "Only Super Admins can delete user groups."
-msgstr "只有超級管理員可以刪除用戶群組."
-
 #: include/classes/api/services/CMediatype.php:444
 msgid "Only Super Admins can edit media types."
 msgstr "只有超級管理員可以編輯示警媒介類型."
 
-#: include/classes/api/services/CUserGroup.php:299
-msgid "Only Super Admins can update user groups."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -12916,11 +13027,11 @@ msgid "Only selected problem"
 msgid_plural "Only selected problems"
 msgstr[0] ""
 
-#: app/views/monitoring.service.list.edit.php:152
+#: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:160
+#: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr ""
 
@@ -12953,7 +13064,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
 msgid "Operation"
 msgstr ""
 
@@ -12978,7 +13089,7 @@ msgstr "操作並無群組來操作."
 msgid "Operation has no template to operate."
 msgstr "操作並無模板來操作."
 
-#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:715
+#: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:719
 #: include/classes/screens/CScreenProblem.php:890
 #: include/classes/screens/CScreenProblem.php:1160 include/events.inc.php:184
 #: include/views/configuration.trigger.prototype.edit.php:84
@@ -13003,27 +13114,27 @@ msgstr "操作"
 #: app/views/popup.condition.common.php:140
 #: app/views/popup.condition.common.php:208
 #: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:253
-#: app/views/popup.condition.common.php:284
-#: app/views/popup.condition.common.php:295
-#: app/views/popup.condition.common.php:309
-#: app/views/popup.condition.common.php:327
-#: app/views/popup.condition.common.php:359
-#: app/views/popup.condition.common.php:374
-#: app/views/popup.condition.common.php:389
-#: app/views/popup.condition.common.php:422
-#: app/views/popup.condition.common.php:440
-#: app/views/popup.condition.common.php:470
-#: app/views/popup.condition.common.php:490
-#: app/views/popup.condition.common.php:522
-#: app/views/popup.condition.common.php:533
-#: app/views/popup.condition.common.php:551
-#: app/views/popup.condition.common.php:566
-#: app/views/popup.condition.common.php:582
-#: app/views/popup.condition.common.php:603
-#: app/views/popup.condition.common.php:616
-#: app/views/popup.condition.common.php:644
-#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:251
+#: app/views/popup.condition.common.php:282
+#: app/views/popup.condition.common.php:293
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:357
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:420
+#: app/views/popup.condition.common.php:438
+#: app/views/popup.condition.common.php:468
+#: app/views/popup.condition.common.php:488
+#: app/views/popup.condition.common.php:520
+#: app/views/popup.condition.common.php:531
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:564
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601
+#: app/views/popup.condition.common.php:614
+#: app/views/popup.condition.common.php:642
+#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "操作者"
 
@@ -13048,7 +13159,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:371
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69
 #: include/classes/widgets/forms/CWidgetFormWeb.php:63
-#: include/triggers.inc.php:1241
+#: include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:669
 #: include/views/configuration.maintenance.edit.php:142
@@ -13065,8 +13176,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:79 app/views/popup.lldoperation.php:91
 #: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
 #: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
-#: app/views/popup.lldoperation.php:239 app/views/popup.lldoperation.php:263
-#: app/views/popup.lldoperation.php:277 app/views/popup.massupdate.host.php:45
+#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
 #: app/views/popup.massupdate.host.php:75
 #: app/views/popup.massupdate.host.php:90
 #: app/views/popup.massupdate.host.php:96
@@ -13113,9 +13224,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:119
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.trigger.php:52
-#: app/views/popup.massupdate.trigger.php:63
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:123
+#: app/views/popup.massupdate.trigger.php:60
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:120
 msgid "Original"
 msgstr "原始的"
 
@@ -13367,7 +13478,7 @@ msgstr "POP"
 #: include/classes/graph/CSvgGraph.php:1075
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
-#: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36
+#: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
 #: include/views/monitoring.overview.triggers.php:45
 msgid "PROBLEM"
 msgstr "問題"
@@ -13414,7 +13525,7 @@ msgstr ""
 msgid "PSK is too short. Minimum is %1$s hex-digits."
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:158
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13437,13 +13548,15 @@ msgstr ""
 msgid "Parameter"
 msgstr "参數"
 
+#: include/classes/api/services/CUserGroup.php:230
+#: include/classes/api/services/CUserGroup.php:332
 #: include/classes/api/services/CUser.php:181
 #: include/classes/api/services/CUser.php:188
-#: include/classes/api/services/CUser.php:334
-#: include/classes/api/services/CUser.php:352
-#: include/classes/api/services/CUser.php:489
-#: include/classes/api/services/CUser.php:536
-#: include/classes/api/services/CUser.php:1472
+#: include/classes/api/services/CUser.php:330
+#: include/classes/api/services/CUser.php:348
+#: include/classes/api/services/CUser.php:485
+#: include/classes/api/services/CUser.php:532
+#: include/classes/api/services/CUser.php:1482
 #: include/classes/validators/CApiInputValidator.php:1031
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
@@ -13474,9 +13587,7 @@ msgstr "上層項目"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/views/monitoring.service.list.edit.php:108
-#: app/views/monitoring.service.list.php:99
-#: app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:61 app/views/popup.service.edit.php:57
 msgid "Parent services"
 msgstr ""
 
@@ -13565,15 +13676,19 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:182 jsLoader.php:275
 msgid "Paste"
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:159
+msgid "Paste page"
+msgstr ""
+
+#: jsLoader.php:160
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:276
 msgid "Paste without external links"
 msgstr ""
 
@@ -13647,19 +13762,20 @@ msgid "Periods"
 msgstr "期間"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:425
-#: app/views/administration.user.edit.php:445
-#: app/views/administration.user.edit.php:542
+#: app/views/administration.user.edit.php:428
+#: app/views/administration.user.edit.php:448
+#: app/views/administration.user.edit.php:545
 #: app/views/administration.usergroup.edit.php:106
 #: app/views/administration.usergroup.edit.php:157
 #: app/views/administration.usergroup.edit.php:208
-#: app/views/dashboard.share.edit.php:29 app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:32
+#: app/views/popup.dashboard.share.edit.php:53
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
 msgid "Permissions"
 msgstr "許可權"
 
-#: app/views/administration.user.edit.php:450
+#: app/views/administration.user.edit.php:453
 msgid "Permissions can be assigned for user groups only."
 msgstr "許可權只能被指派予用戶群組"
 
@@ -13681,12 +13797,12 @@ msgstr "置入演算法"
 msgid "Plain text"
 msgstr "文本"
 
-#: app/views/administration.user.edit.php:584
-#: app/views/administration.user.edit.php:619
+#: app/views/administration.user.edit.php:587
+#: app/views/administration.user.edit.php:622
 msgid "Play"
 msgstr "播放"
 
-#: app/views/administration.user.edit.php:557
+#: app/views/administration.user.edit.php:560
 msgid "Play sound"
 msgstr "播放聲音"
 
@@ -13716,7 +13832,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:264
 msgid "Please select two elements"
 msgstr "請選擇兩組件"
 
@@ -13845,7 +13961,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:187
 msgid "Previous page"
 msgstr ""
 
@@ -13903,7 +14019,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: app/views/dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
 msgid "Private"
 msgstr ""
@@ -13923,12 +14039,12 @@ msgid "Privilege level"
 msgstr "優先權層級"
 
 #: app/partials/monitoring.problem.filter.php:97
-#: app/views/monitoring.service.list.edit.php:147
-#: app/views/monitoring.service.list.edit.php:175
-#: app/views/monitoring.service.list.php:138
+#: app/views/monitoring.service.list.edit.php:88
+#: app/views/monitoring.service.list.edit.php:116
+#: app/views/monitoring.service.list.php:84
 #: app/views/monitoring.widget.problems.view.php:60
 #: app/views/popup.acknowledge.edit.php:33
-#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:714
+#: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:718
 #: include/classes/helpers/CMediatypeHelper.php:48
 #: include/classes/screens/CScreenProblem.php:865
 #: include/classes/screens/CScreenProblem.php:888
@@ -13958,7 +14074,7 @@ msgstr ""
 msgid "Problem display"
 msgstr "問題顯示"
 
-#: include/triggers.inc.php:1159
+#: include/triggers.inc.php:982
 #: include/views/js/configuration.triggers.edit.js.php:52
 msgid "Problem expression"
 msgstr ""
@@ -13976,7 +14092,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:285
 msgid "Problem on"
 msgstr "問題在"
 
@@ -13989,8 +14105,8 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199
-#: app/views/popup.services.php:58
+#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
+#: app/views/popup.services.php:57
 msgid "Problem tags"
 msgstr ""
 
@@ -14003,14 +14119,6 @@ msgstr ""
 msgid "Problem update"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:27
-msgid "Problem, if all children have problems"
-msgstr "問題, 如果所有的下層都有問題"
-
-#: include/classes/helpers/CServiceHelper.php:26
-msgid "Problem, if at least one child has a problem"
-msgstr "問題, 如果至少一個下層有一個問題"
-
 #: app/controllers/CControllerProblemView.php:155
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
@@ -14027,7 +14135,7 @@ msgstr "問題, 如果至少一個下層有一個問題"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
 #: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:359 report2.php:507
 msgid "Problems"
 msgstr "問題"
 
@@ -14061,12 +14169,12 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:161
 msgid "Properties"
 msgstr ""
 
-#: app/controllers/CControllerMenuPopup.php:351
-#: app/controllers/CControllerMenuPopup.php:634
+#: app/controllers/CControllerMenuPopup.php:354
+#: app/controllers/CControllerMenuPopup.php:643
 #: app/controllers/CControllerWidgetUrlView.php:64
 #: app/views/hintbox.eventlist.php:44
 #: include/classes/helpers/CVaultHelper.php:107
@@ -14088,7 +14196,7 @@ msgstr "系統代理程式"
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:523
+#: app/views/popup.condition.common.php:521
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14150,7 +14258,7 @@ msgstr "系統代理程式名稱"
 msgid "Proxy updated"
 msgstr "系統代理程式已新增"
 
-#: app/views/dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:126
 #: include/views/monitoring.sysmap.edit.php:399
 msgid "Public"
 msgstr ""
@@ -14244,8 +14352,8 @@ msgstr "讀"
 msgid "Read only"
 msgstr "唯讀"
 
-#: app/views/js/monitoring.dashboard.view.js.php:35
-#: app/views/js/monitoring.dashboard.view.js.php:59
+#: app/views/popup.dashboard.share.edit.php:80
+#: app/views/popup.dashboard.share.edit.php:101
 #: include/views/js/monitoring.sysmap.edit.js.php:53
 #: include/views/js/monitoring.sysmap.edit.js.php:87
 msgid "Read-only"
@@ -14253,8 +14361,8 @@ msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
-#: app/views/js/monitoring.dashboard.view.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:60 include/perm.inc.php:31
+#: app/views/popup.dashboard.share.edit.php:81
+#: app/views/popup.dashboard.share.edit.php:102 include/perm.inc.php:31
 #: include/users.inc.php:434 include/views/js/monitoring.sysmap.edit.js.php:59
 #: include/views/js/monitoring.sysmap.edit.js.php:93
 msgid "Read-write"
@@ -14307,7 +14415,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:575
+#: app/views/administration.user.edit.php:578
 #: include/classes/screens/CScreenProblem.php:1067
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14315,7 +14423,7 @@ msgstr ""
 msgid "Recovery"
 msgstr "恢復"
 
-#: include/triggers.inc.php:1163
+#: include/triggers.inc.php:986
 #: include/views/configuration.trigger.prototype.edit.php:298
 #: include/views/configuration.trigger.prototype.edit.php:381
 #: include/views/configuration.triggers.edit.php:323
@@ -14350,7 +14458,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:183
 msgid "Refresh interval"
 msgstr ""
 
@@ -14410,7 +14518,7 @@ msgstr "正規表示式"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:168
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14442,6 +14550,7 @@ msgstr "遠端命令"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
+#: app/partials/service.statusrule.row.php:41
 #: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
@@ -14451,7 +14560,7 @@ msgstr "遠端命令"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:44
 #: app/views/administration.script.edit.php:78
-#: app/views/administration.user.edit.php:357
+#: app/views/administration.user.edit.php:360
 #: app/views/configuration.correlation.edit.php:86
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14459,13 +14568,13 @@ msgstr "遠端命令"
 #: app/views/js/administration.mediatype.edit.js.php:53
 #: app/views/js/administration.regex.edit.js.php:43
 #: app/views/js/configuration.discovery.edit.js.php:36
-#: app/views/js/monitoring.dashboard.view.js.php:40
-#: app/views/js/monitoring.dashboard.view.js.php:64
 #: app/views/js/popup.massupdate.tmpl.js.php:33
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:208
+#: app/views/js/popup.service.edit.js.php:46
+#: app/views/popup.dashboard.share.edit.php:85
+#: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
 #: app/views/popup.massupdate.host.php:52
 #: app/views/popup.massupdate.host.php:203
@@ -14475,8 +14584,8 @@ msgstr "遠端命令"
 #: app/views/popup.massupdate.service.php:46
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
-#: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111
+#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14553,8 +14662,8 @@ msgstr "遠端命令"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:203
+#: jsLoader.php:272
 msgid "Remove"
 msgstr "移除"
 
@@ -14594,7 +14703,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:322
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14623,7 +14732,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:53
 #: app/views/popup.massupdate.template.php:90
 #: app/views/popup.massupdate.template.php:135
-#: app/views/popup.massupdate.trigger.php:82 include/items.inc.php:1807
+#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
 #: include/views/configuration.trigger.prototype.edit.php:169
 #: include/views/configuration.trigger.prototype.edit.php:362
 #: include/views/configuration.triggers.edit.php:191
@@ -14631,7 +14740,7 @@ msgstr ""
 msgid "Replace"
 msgstr "取代"
 
-#: app/views/popup.massupdate.trigger.php:124
+#: app/views/popup.massupdate.trigger.php:121
 msgid "Replace dependencies"
 msgstr "替換相依關係"
 
@@ -14738,7 +14847,7 @@ msgstr "要求的狀態碼"
 msgid "Required string"
 msgstr "要求的字串"
 
-#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215
+#: app/views/popup.services.php:46 include/classes/html/CFilter.php:215
 #: include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "重設"
@@ -14772,7 +14881,7 @@ msgstr "重設確認"
 msgid "Reset defaults"
 msgstr "重設預設"
 
-#: jsLoader.php:281
+#: jsLoader.php:286
 msgid "Resolved"
 msgstr "已解決"
 
@@ -14970,8 +15079,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:405
-#: app/views/administration.user.edit.php:415
+#: app/views/administration.user.edit.php:408
+#: app/views/administration.user.edit.php:418
 msgid "Role"
 msgstr ""
 
@@ -15029,12 +15138,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "俄語 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:250
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:251
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15045,10 +15154,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/views/monitoring.service.list.edit.php:117
-#: app/views/monitoring.service.list.php:108
-#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228
-#: srv_status.php:149
+#: app/partials/service.info.php:71 app/views/popup.service.edit.php:240
+#: app/views/popup.service.edit.php:315 srv_status.php:149
 msgid "SLA"
 msgstr "SLA"
 
@@ -15261,7 +15368,7 @@ msgstr ""
 msgid "Sat"
 msgstr "六"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:243
 msgid "Saturday"
 msgstr "週六"
 
@@ -15430,7 +15537,7 @@ msgstr "脚本已更新"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:360
 msgid "Scripts"
 msgstr "脚本"
 
@@ -15500,8 +15607,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91
+#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:90
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15509,7 +15616,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:320
 msgid "Select"
 msgstr "選擇"
 
@@ -15545,19 +15652,19 @@ msgstr "所選的組件"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:325
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:326
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:270
 msgid "Send backward"
 msgstr ""
 
@@ -15582,7 +15689,7 @@ msgstr "僅送到"
 msgid "Send to"
 msgstr "收件人"
 
-#: jsLoader.php:266
+#: jsLoader.php:271
 msgid "Send to back"
 msgstr ""
 
@@ -15615,7 +15722,7 @@ msgstr "分開的"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:234
 msgid "September"
 msgstr "九月"
 
@@ -15647,34 +15754,29 @@ msgid "Server time"
 msgstr "伺服器時間"
 
 #: app/controllers/CControllerAuditLogList.php:222
-#: app/controllers/CControllerPopupServiceEdit.php:134
-#: app/views/monitoring.service.list.edit.php:174
+#: app/controllers/CControllerPopupServiceEdit.php:141
+#: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227
+#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
 #: include/actions.inc.php:67 include/actions.inc.php:77
 #: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
 msgid "Service"
 msgstr "服務"
 
-#: include/classes/api/services/CService.php:642
-#: include/classes/api/services/CService.php:681
+#: include/classes/api/services/CService.php:709
 #, c-format
-msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
-msgstr ""
-
-#: include/classes/api/services/CService.php:623
-#, c-format
-msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm."
+msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:617
+#: include/classes/api/services/CService.php:765
+#: include/classes/api/services/CService.php:804
 #, c-format
-msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm."
+msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:578
+#: include/classes/api/services/CService.php:738
 #, c-format
-msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point."
+msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
 
 #: include/classes/helpers/CMenuHelper.php:184
@@ -15682,7 +15784,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:97
+#: app/controllers/CControllerServiceCreate.php:167
 msgid "Service created"
 msgstr ""
 
@@ -15710,7 +15812,7 @@ msgid "Service recovery"
 msgstr ""
 
 #: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:835
+#: include/classes/api/services/CService.php:958
 msgid "Service start time must be less than end time."
 msgstr "服務的開始時間不能晚於截止時間."
 
@@ -15726,11 +15828,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:162
+#: app/views/popup.service.edit.php:249
 msgid "Service times"
 msgstr "服務次數"
 
-#: app/views/popup.condition.common.php:567 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
 msgid "Service type"
 msgstr "服務類型"
 
@@ -15739,7 +15841,7 @@ msgstr "服務類型"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:105
+#: app/controllers/CControllerServiceUpdate.php:180
 msgid "Service updated"
 msgstr "服務已更新"
 
@@ -15748,16 +15850,16 @@ msgstr "服務已更新"
 #: app/controllers/CControllerServiceList.php:139
 #: app/controllers/CControllerServiceListRefresh.php:127
 #: app/views/administration.housekeeping.edit.php:95
-#: app/views/monitoring.service.list.edit.php:189
-#: app/views/monitoring.service.list.php:159
-#: app/views/popup.condition.common.php:645
+#: app/views/monitoring.service.list.edit.php:130
+#: app/views/monitoring.service.list.php:105
+#: app/views/popup.condition.common.php:643
 #: include/classes/helpers/CMenuHelper.php:74
 #: include/classes/helpers/CRoleHelper.php:391 srv_status.php:26
 #: srv_status.php:155
 msgid "Services"
 msgstr "服務"
 
-#: include/classes/api/services/CService.php:760
+#: include/classes/api/services/CService.php:883
 msgid "Services form a circular dependency."
 msgstr "服務形成了一個循環式迴圈."
 
@@ -15769,9 +15871,9 @@ msgstr ""
 msgid "Session initialization error."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1655
-#: include/classes/api/services/CUser.php:1669
-#: include/classes/api/services/CUser.php:1706
+#: include/classes/api/services/CUser.php:1665
+#: include/classes/api/services/CUser.php:1679
+#: include/classes/api/services/CUser.php:1716
 msgid "Session terminated, re-login, please."
 msgstr "連線期已中斷, 請重連."
 
@@ -15795,10 +15897,18 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:392
 msgid "Set new value"
 msgstr ""
 
+#: app/views/popup.service.statusrule.edit.php:39
+msgid "Set status to"
+msgstr ""
+
+#: include/classes/helpers/CServiceHelper.php:28
+msgid "Set status to OK"
+msgstr ""
+
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
 msgid "Set value to"
@@ -15839,7 +15949,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblems.php:202
 #: include/classes/widgets/forms/CWidgetFormProblems.php:203
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:344
-#: include/events.inc.php:188 include/triggers.inc.php:1144
+#: include/events.inc.php:188 include/triggers.inc.php:967
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.trigger.prototype.edit.php:88
 #: include/views/configuration.trigger.prototype.list.php:57
@@ -15885,7 +15995,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:346
 msgid "Sharing"
 msgstr ""
 
@@ -15976,7 +16086,7 @@ msgstr ""
 #: app/partials/common.filter.trigger.php:166
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:637
+#: app/views/administration.user.edit.php:640
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16027,7 +16137,7 @@ msgstr "當Zabbix伺服器停機時展示警告"
 msgid "Show working time"
 msgstr "展示工作時間"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:257
 msgid "Shown"
 msgstr "已展示"
 
@@ -16136,7 +16246,7 @@ msgstr "略過複製圖片\"%1$s\"到主機\"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "斯洛伐克(sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:291
 msgid "Snooze"
 msgstr "Snooze"
 
@@ -16182,7 +16292,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:120
+#: app/views/popup.service.edit.php:106
 msgid "Sort order (0->999)"
 msgstr "排序次(0->999)"
 
@@ -16256,7 +16366,7 @@ msgstr "開始於"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:162
 msgid "Start slideshow"
 msgstr ""
 
@@ -16304,12 +16414,14 @@ msgstr ""
 #: app/partials/monitoring.service.list.php:51
 #: app/partials/scheduledreport.subscription.php:35
 #: app/partials/scheduledreport.table.html.php:44
+#: app/partials/service.info.php:65
 #: app/views/administration.mediatype.list.php:53
 #: app/views/administration.mediatype.list.php:80
 #: app/views/administration.module.list.php:50
 #: app/views/administration.module.list.php:78
 #: app/views/administration.token.list.php:92
 #: app/views/administration.token.list.php:149
+#: app/views/administration.user.edit.php:296
 #: app/views/administration.usergroup.list.php:50
 #: app/views/administration.usergroup.list.php:78
 #: app/views/administration.user.list.php:117
@@ -16320,17 +16432,24 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:53
 #: app/views/configuration.discovery.list.php:81
 #: app/views/hintbox.eventlist.php:74
-#: app/views/monitoring.service.list.edit.php:112
-#: app/views/monitoring.service.list.edit.php:142
-#: app/views/monitoring.service.list.php:103
-#: app/views/monitoring.service.list.php:133
+#: app/views/monitoring.service.list.edit.php:83
+#: app/views/monitoring.service.list.php:79
 #: app/views/monitoring.widget.actionlog.view.php:38
 #: app/views/monitoring.widget.problems.view.php:56
 #: app/views/popup.massupdate.host.php:96
 #: app/views/popup.massupdate.item.php:325
 #: app/views/popup.scheduledreport.subscription.php:115
+#: app/views/popup.service.statusrule.edit.php:75
 #: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1827
-#: include/actions.inc.php:1921 include/classes/html/CHostAvailability.php:76
+#: include/actions.inc.php:1921 include/classes/helpers/CServiceHelper.php:36
+#: include/classes/helpers/CServiceHelper.php:41
+#: include/classes/helpers/CServiceHelper.php:46
+#: include/classes/helpers/CServiceHelper.php:51
+#: include/classes/helpers/CServiceHelper.php:56
+#: include/classes/helpers/CServiceHelper.php:61
+#: include/classes/helpers/CServiceHelper.php:66
+#: include/classes/helpers/CServiceHelper.php:71
+#: include/classes/html/CHostAvailability.php:76
 #: include/classes/screens/CScreenHttpTestDetails.php:85
 #: include/classes/screens/CScreenHttpTest.php:116
 #: include/classes/screens/CScreenProblem.php:861
@@ -16354,13 +16473,10 @@ msgstr ""
 msgid "Status"
 msgstr "狀態"
 
-#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57
-msgid "Status calculation"
-msgstr "狀態統計"
-
-#: app/views/popup.service.edit.php:61
-msgid "Status calculation algorithm"
-msgstr "狀態計算演算法"
+#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
+#: app/views/popup.services.php:56
+msgid "Status calculation rule"
+msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16391,6 +16507,10 @@ msgstr "只有狀態"
 msgid "Status problem"
 msgstr ""
 
+#: app/views/popup.service.edit.php:166
+msgid "Status propagation rule"
+msgstr ""
+
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
 msgid "Step"
@@ -16422,8 +16542,8 @@ msgstr ""
 msgid "Steps"
 msgstr "步驟"
 
-#: app/views/administration.user.edit.php:589
-#: app/views/administration.user.edit.php:624
+#: app/views/administration.user.edit.php:592
+#: app/views/administration.user.edit.php:627
 msgid "Stop"
 msgstr "停止"
 
@@ -16435,7 +16555,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:163
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16467,7 +16587,7 @@ msgid "Strict"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:490
-#: include/triggers.inc.php:1773
+#: include/triggers.inc.php:1596
 msgid "String"
 msgstr ""
 
@@ -16500,7 +16620,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:361
 msgid "Submap"
 msgstr "子拓墣圖"
 
@@ -16516,7 +16636,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "成功審計"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:220
 msgid "Success message"
 msgstr ""
 
@@ -16529,7 +16649,7 @@ msgstr ""
 msgid "Sun"
 msgstr "日"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:244
 msgid "Sunday"
 msgstr "日"
 
@@ -16621,12 +16741,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:248
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:246
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16662,8 +16782,8 @@ msgstr "資料表\"%1$s\"不能有欄位名為\"%2$s\"."
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/views/popup.condition.common.php:74
 #: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:310
-#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:308
+#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "標簽"
@@ -16703,14 +16823,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:231
 #: app/partials/monitoring.service.list.edit.php:57
 #: app/partials/monitoring.service.list.php:54
-#: app/views/hintbox.eventlist.php:77 app/views/monitoring.latest.view.php:96
-#: app/views/monitoring.service.list.edit.php:124
-#: app/views/monitoring.service.list.edit.php:170
-#: app/views/monitoring.service.list.php:115
-#: app/views/monitoring.service.list.php:145
+#: app/partials/service.info.php:79 app/views/hintbox.eventlist.php:77
+#: app/views/monitoring.latest.view.php:96
+#: app/views/monitoring.service.list.edit.php:111
+#: app/views/monitoring.service.list.php:91
 #: app/views/monitoring.web.view.php:88
 #: app/views/monitoring.widget.problems.view.php:68
-#: app/views/popup.lldoperation.php:264
+#: app/views/popup.lldoperation.php:262
 #: app/views/popup.massupdate.host.php:198
 #: app/views/popup.massupdate.host.php:293
 #: app/views/popup.massupdate.item.php:477
@@ -16718,10 +16837,10 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:40
 #: app/views/popup.massupdate.template.php:131
 #: app/views/popup.massupdate.template.php:149
-#: app/views/popup.massupdate.trigger.php:78
-#: app/views/popup.massupdate.trigger.php:153
-#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229
-#: include/blocks.inc.php:719 include/classes/screens/CScreenHttpTest.php:117
+#: app/views/popup.massupdate.trigger.php:75
+#: app/views/popup.massupdate.trigger.php:150
+#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: include/blocks.inc.php:723 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
 #: include/classes/screens/CScreenProblem.php:1164
@@ -16885,7 +17004,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17168,12 +17287,12 @@ msgstr ""
 msgid "Thu"
 msgstr "四"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:241
 msgid "Thursday"
 msgstr "週四"
 
-#: app/views/popup.service.time.edit.php:87
-#: app/views/popup.service.time.edit.php:132 report4.php:191
+#: app/views/popup.service.time.edit.php:91
+#: app/views/popup.service.time.edit.php:142 report4.php:191
 msgid "Till"
 msgstr "直到"
 
@@ -17183,13 +17302,13 @@ msgstr "直到"
 #: app/views/monitoring.widget.actionlog.view.php:33
 #: app/views/monitoring.widget.problems.view.php:38
 #: app/views/popup.itemtestedit.view.php:271
-#: app/views/popup.service.time.edit.php:68
-#: app/views/popup.service.time.edit.php:94
+#: app/views/popup.service.time.edit.php:71
+#: app/views/popup.service.time.edit.php:99
 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
-#: include/blocks.inc.php:694 include/classes/screens/CScreenProblem.php:816
+#: include/blocks.inc.php:698 include/classes/screens/CScreenProblem.php:816
 #: include/classes/screens/CScreenProblem.php:1155
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32
@@ -17270,7 +17389,7 @@ msgstr "時間戳"
 msgid "To"
 msgstr "到"
 
-#: jsLoader.php:368
+#: jsLoader.php:373
 msgid "To set a host interface select a single item type for all items"
 msgstr "要設定一個主機介面, 選擇一個單一的項目類型給所有的項目"
 
@@ -17392,13 +17511,13 @@ msgstr "趨勢"
 
 #: app/controllers/CControllerAuditLogList.php:238
 #: app/controllers/CControllerPopupTriggerWizard.php:282
-#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46
+#: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
-#: include/maps.inc.php:26 include/triggers.inc.php:1137
+#: include/maps.inc.php:26 include/triggers.inc.php:960
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:260 jsLoader.php:362
 msgid "Trigger"
 msgstr "觸發器"
 
@@ -17417,7 +17536,7 @@ msgstr ""
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "觸發器\"%1$s\"相依於一個不存在的觸發器\"%2$s\"."
 
-#: app/controllers/CControllerMenuPopup.php:585
+#: app/controllers/CControllerMenuPopup.php:594
 msgid "Trigger URL"
 msgstr ""
 
@@ -17498,7 +17617,7 @@ msgstr "觸發器概覽"
 
 #: app/controllers/CControllerAuditLogList.php:239
 #: app/views/popup.lldoperation.php:52
-#: app/views/popup.massupdate.trigger.php:152
+#: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
@@ -17564,15 +17683,15 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:636 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:639 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "觸發器示警度"
 
-#: jsLoader.php:342
+#: jsLoader.php:347
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:348
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17624,7 +17743,7 @@ msgstr ""
 msgid "Tue"
 msgstr "二"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:239
 msgid "Tuesday"
 msgstr "週二"
 
@@ -17637,7 +17756,7 @@ msgstr ""
 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\", 這會造成衝突."
 
-#: jsLoader.php:260
+#: jsLoader.php:265
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17652,15 +17771,16 @@ msgstr ""
 #: app/views/administration.script.list.php:77
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
-#: app/views/dashboard.share.edit.php:78
 #: app/views/monitoring.widget.actionlog.view.php:35
 #: app/views/popup.condition.common.php:49
 #: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:660 app/views/popup.generic.php:133
-#: app/views/popup.lldoperation.php:114 app/views/popup.massupdate.item.php:48
+#: app/views/popup.condition.common.php:658
+#: app/views/popup.dashboard.share.edit.php:123
+#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
+#: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47
-#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51
+#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
@@ -17727,7 +17847,7 @@ msgid "UNKNOWN"
 msgstr "未知的"
 
 #: app/views/popup.httpstep.php:52 app/views/popup.massupdate.item.php:84
-#: app/views/popup.triggerwizard.php:136 disc_prototypes.php:154
+#: app/views/popup.triggerwizard.php:133 disc_prototypes.php:154
 #: host_discovery.php:129 include/classes/widgets/CWidgetConfig.php:63
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:80
@@ -17737,7 +17857,7 @@ msgstr "未知的"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:363
 msgid "URL"
 msgstr "URL"
 
@@ -17783,7 +17903,7 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:364
 msgid "URLs"
 msgstr "URLs"
 
@@ -17831,7 +17951,7 @@ msgstr ""
 msgid "Unable to overwrite the existing configuration file."
 msgstr ""
 
-#: include/blocks.inc.php:634
+#: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
 msgstr ""
 
@@ -17878,7 +17998,8 @@ msgstr "解除封鎖所選的用戶?"
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:308
+#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
 msgstr ""
@@ -17897,7 +18018,8 @@ msgstr "單位"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79
+#: include/actions.inc.php:1049 include/classes/helpers/CSeverityHelper.php:48
+#: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
 #: include/correlation.inc.php:146 include/discovery.inc.php:115
 #: include/discovery.inc.php:151 include/events.inc.php:45
@@ -17908,9 +18030,9 @@ msgstr "單位"
 #: include/items.inc.php:110 include/items.inc.php:133
 #: include/items.inc.php:167 include/maintenances.inc.php:33
 #: include/maps.inc.php:39 include/regexp.inc.php:236
-#: include/triggers.inc.php:119 include/triggers.inc.php:260
-#: include/triggers.inc.php:2042 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/triggers.inc.php:83 include/triggers.inc.php:1865
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "未知的"
@@ -17929,12 +18051,12 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
 #: app/controllers/CControllerPopupTriggerExpr.php:1244
-#: include/triggers.inc.php:1323
+#: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "未知的主機項目, 在所選的主機中沒有這樣的項目"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:46
-#: include/triggers.inc.php:1322
+#: include/triggers.inc.php:1145
 msgid "Unknown host, no such host present in system"
 msgstr "未知的主機, 在系統中沒有出現這樣的主機."
 
@@ -17981,7 +18103,7 @@ msgstr "自模板斷連"
 msgid "Unlink from templates"
 msgstr "自模板斷連"
 
-#: jsLoader.php:284
+#: jsLoader.php:289
 msgid "Unmute"
 msgstr "開聲音"
 
@@ -18061,27 +18183,28 @@ msgstr "上"
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.token.edit.php:107
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:655
-#: app/views/administration.user.edit.php:678
+#: app/views/administration.user.edit.php:658
+#: app/views/administration.user.edit.php:681
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:292
 #: app/views/administration.user.token.edit.php:88
 #: app/views/configuration.correlation.edit.php:177
 #: app/views/configuration.discovery.edit.php:154
-#: app/views/dashboard.share.edit.php:102
 #: app/views/popup.acknowledge.edit.php:115
+#: app/views/popup.dashboard.share.edit.php:155
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:181
-#: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220
+#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:220
 #: app/views/popup.massupdate.host.php:323
 #: app/views/popup.massupdate.item.php:511
 #: app/views/popup.massupdate.service.php:67
 #: app/views/popup.massupdate.template.php:178
-#: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127
+#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:252
-#: app/views/popup.service.time.edit.php:155
-#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126
+#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.statusrule.edit.php:98
+#: app/views/popup.service.time.edit.php:167
+#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
 #: include/views/configuration.action.edit.php:492
 #: include/views/configuration.graph.edit.php:494
@@ -18150,7 +18273,7 @@ msgid "Upper level maps"
 msgstr "上層拓墣圖"
 
 #: app/partials/service.time.row.php:28
-#: app/views/popup.service.time.edit.php:45
+#: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
 msgstr "在線時間"
@@ -18199,37 +18322,37 @@ msgstr "用於動作中"
 msgid "User"
 msgstr "用户"
 
-#: include/classes/api/services/CUserGroup.php:618
+#: include/classes/api/services/CUserGroup.php:623
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1320
+#: include/classes/api/services/CUser.php:1330
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1305
+#: include/classes/api/services/CUser.php:1315
 #, c-format
 msgid "User \"%1$s\" is map \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1343
+#: include/classes/api/services/CUser.php:1353
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" owner."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1351
+#: include/classes/api/services/CUser.php:1361
 #, c-format
 msgid "User \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1291
+#: include/classes/api/services/CUser.php:1301
 #, c-format
 msgid "User \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1364
+#: include/classes/api/services/CUser.php:1374
 #, c-format
 msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created."
 msgstr ""
@@ -18246,13 +18369,13 @@ msgstr "新增用户"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:543
-#: include/classes/api/services/CUser.php:982
+#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUser.php:978
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用戶不能將自己加進一個取消的群組或已取消圖形介面存取權的群組."
 
-#: app/views/administration.user.edit.php:408
-#: include/classes/api/services/CUser.php:969
+#: app/views/administration.user.edit.php:411
+#: include/classes/api/services/CUser.php:965
 msgid "User cannot change own role."
 msgstr ""
 
@@ -18276,32 +18399,32 @@ msgstr[0] "用户已删除"
 msgid "User group"
 msgstr "用户群組"
 
-#: include/classes/api/services/CUserGroup.php:372
+#: include/classes/api/services/CUserGroup.php:374
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:940
+#: include/classes/api/services/CUserGroup.php:949
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:905
+#: include/classes/api/services/CUserGroup.php:914
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:926
+#: include/classes/api/services/CUserGroup.php:935
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:918
+#: include/classes/api/services/CUserGroup.php:927
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "用戶群組\"%1$s\"被用於腳本\"%2$s\"."
 
-#: app/controllers/CControllerUsergroupCreate.php:94
+#: app/controllers/CControllerUsergroupCreate.php:95
 msgid "User group added"
 msgstr ""
 
@@ -18330,7 +18453,7 @@ msgstr[0] ""
 #: include/classes/api/services/CReport.php:471
 #: include/classes/api/services/CScript.php:901
 #: include/classes/api/services/CSettings.php:289
-#: include/classes/api/services/CUser.php:744
+#: include/classes/api/services/CUser.php:740
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
 msgstr ""
@@ -18338,14 +18461,14 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:211
 #: app/views/administration.usergroup.edit.php:29
 #: app/views/administration.usergroup.list.php:31
-#: app/views/dashboard.share.edit.php:29
+#: app/views/popup.dashboard.share.edit.php:32
 #: include/classes/helpers/CMenuHelper.php:275
 #: include/classes/helpers/CRoleHelper.php:456
 #: include/views/monitoring.sysmap.edit.php:322
 msgid "User groups"
 msgstr "用户群組"
 
-#: include/classes/api/services/CUser.php:1241
+#: include/classes/api/services/CUser.php:1251
 msgid "User is not allowed to delete himself."
 msgstr "用戶是不允許刪除自己"
 
@@ -18393,7 +18516,7 @@ msgstr[0] ""
 msgid "User role updated"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:799
+#: include/classes/api/services/CUser.php:795
 #, c-format
 msgid "User role with ID \"%1$s\" is not available."
 msgstr ""
@@ -18427,7 +18550,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:419
+#: app/views/administration.user.edit.php:422
 #: app/views/administration.userrole.edit.php:54
 #: app/views/administration.userrole.edit.php:69
 msgid "User type"
@@ -18447,12 +18570,12 @@ msgstr "用户已更新"
 #: include/classes/api/services/CReport.php:413
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:412
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:703
+#: include/classes/api/services/CUser.php:699
 #, c-format
 msgid "User with username \"%1$s\" already exists."
 msgstr ""
@@ -18497,7 +18620,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:68
 #: app/views/administration.userrole.list.php:110
 #: app/views/administration.userrole.list.php:116
-#: app/views/dashboard.share.edit.php:50
+#: app/views/popup.dashboard.share.edit.php:53
 #: app/views/reports.auditlog.list.php:48
 #: include/classes/helpers/CMenuHelper.php:285
 #: include/classes/helpers/CRoleHelper.php:458
@@ -18764,23 +18887,23 @@ msgstr ""
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
 #: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:328
-#: app/views/popup.condition.common.php:375
-#: app/views/popup.condition.common.php:390
-#: app/views/popup.condition.common.php:538
-#: app/views/popup.condition.common.php:552
-#: app/views/popup.condition.common.php:583
-#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:326
+#: app/views/popup.condition.common.php:373
+#: app/views/popup.condition.common.php:388
+#: app/views/popup.condition.common.php:536
+#: app/views/popup.condition.common.php:550
+#: app/views/popup.condition.common.php:581
+#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
-#: app/views/popup.lldoperation.php:270
+#: app/views/popup.lldoperation.php:268
 #: app/views/popup.massupdate.host.php:207
 #: app/views/popup.massupdate.item.php:120
 #: app/views/popup.massupdate.item.php:486
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
-#: app/views/popup.massupdate.trigger.php:87
-#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183
+#: app/views/popup.massupdate.trigger.php:84
+#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18987,8 +19110,8 @@ msgstr "縱向對齊"
 msgid "Vietnamese (vi_VN)"
 msgstr ""
 
-#: app/views/monitoring.service.list.edit.php:203
-#: app/views/monitoring.service.list.php:167
+#: app/views/monitoring.service.list.edit.php:144
+#: app/views/monitoring.service.list.php:113
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106
 msgid "View"
 msgstr ""
@@ -19015,7 +19138,12 @@ msgstr "可見的名稱"
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "如果缺少主機名稱, 可見的名稱不能是空白."
 
-#: jsLoader.php:242
+#: include/classes/helpers/CServiceHelper.php:57
+#: include/classes/helpers/CServiceHelper.php:67
+msgid "W"
+msgstr ""
+
+#: jsLoader.php:247
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19032,11 +19160,11 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "警示"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:222
 msgid "Warning message"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:294
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "我們很抱歉, 已經到了可記住的最大可能的組件數量."
 
@@ -19052,7 +19180,7 @@ msgstr "我們很抱歉, 已經到了可記住的最大可能的組件數量."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:365
 msgid "Web"
 msgstr "Web"
 
@@ -19119,7 +19247,7 @@ msgstr ""
 msgid "Wed"
 msgstr "三"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:240
 msgid "Wednesday"
 msgstr "週三"
 
@@ -19130,6 +19258,10 @@ msgstr "週三"
 msgid "Weekly"
 msgstr "每週"
 
+#: app/views/popup.service.edit.php:204
+msgid "Weight"
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
 msgstr ""
@@ -19147,7 +19279,7 @@ msgstr "當作用中時"
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:189
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19360,8 +19492,8 @@ msgid "YYYY-MM-DD"
 msgstr ""
 
 #: app/views/popup.maintenance.period.php:150
-#: app/views/popup.service.time.edit.php:128
-#: app/views/popup.service.time.edit.php:136
+#: app/views/popup.service.time.edit.php:137
+#: app/views/popup.service.time.edit.php:147
 #: include/views/configuration.maintenance.edit.php:113
 #: include/views/configuration.maintenance.edit.php:120
 msgid "YYYY-MM-DD hh:mm"
@@ -19403,19 +19535,19 @@ msgstr "每年"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:683
+#: app/views/popup.condition.common.php:681
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
 #: app/views/popup.massupdate.item.php:378
-#: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32
-#: include/blocks.inc.php:532 include/blocks.inc.php:839
-#: include/blocks.inc.php:843 include/classes/screens/CScreenProblem.php:1099
+#: app/views/popup.massupdate.trigger.php:65 include/actions.inc.php:32
+#: include/blocks.inc.php:532 include/blocks.inc.php:843
+#: include/blocks.inc.php:847 include/classes/screens/CScreenProblem.php:1099
 #: include/classes/screens/CScreenProblem.php:1103
 #: include/classes/screens/CScreenProblem.php:1245 include/events.inc.php:198
 #: include/events.inc.php:202 include/events.inc.php:392
-#: include/events.inc.php:396 include/triggers.inc.php:1172
-#: include/triggers.inc.php:1177
+#: include/events.inc.php:396 include/triggers.inc.php:995
+#: include/triggers.inc.php:1000
 #: include/views/configuration.graph.list.php:206
 #: include/views/configuration.host.prototype.list.php:142
 #: include/views/configuration.host.prototype.list.php:158
@@ -19483,19 +19615,15 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1146
 #: include/classes/api/services/CTemplate.php:1252
 #: include/classes/api/services/CToken.php:186
-#: include/classes/api/services/CToken.php:302
-#: include/classes/api/services/CToken.php:401
-#: include/classes/api/services/CToken.php:443
+#: include/classes/api/services/CToken.php:313
+#: include/classes/api/services/CToken.php:414
+#: include/classes/api/services/CToken.php:448
 #: include/classes/api/services/CUserMacro.php:271
 #: include/classes/api/services/CUserMacro.php:331
 #: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "您沒有許可權來完成此操作."
 
-#: include/classes/api/services/CUser.php:285
-msgid "You do not have permissions to create users."
-msgstr "您沒有許可權來創建用戶."
-
 #: include/func.inc.php:1514
 msgid "You have no permissions to access this page."
 msgstr "您沒有許可權來操作本頁。"
@@ -19616,7 +19744,7 @@ msgstr ""
 msgid "a boolean is expected"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:911
+#: include/classes/api/services/CUser.php:907
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
 #: include/classes/validators/CApiInputValidator.php:314
@@ -19735,7 +19863,6 @@ msgstr "端點代理程式"
 #: app/partials/configuration.filter.items.php:200
 #: app/partials/configuration.filter.items.php:209
 #: include/classes/graphdraw/CLineGraphDraw.php:1397
-#: include/classes/html/CSeverity.php:73
 #: include/views/configuration.host.discovery.list.php:112
 #: include/views/configuration.host.discovery.list.php:156
 #: include/views/configuration.host.discovery.list.php:165
@@ -20031,9 +20158,9 @@ msgstr ""
 #: include/classes/api/services/CProxy.php:625
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:470
-#: include/classes/api/services/CUser.php:762
-#: include/classes/api/services/CUser.php:922
+#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUser.php:758
+#: include/classes/api/services/CUser.php:918
 #: include/classes/import/CConfigurationImport.php:744
 #: include/classes/import/CConfigurationImport.php:977
 #: include/classes/import/CConfigurationImport.php:1131
@@ -20113,7 +20240,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:297
 msgid "color"
 msgstr ""
 
@@ -20160,7 +20287,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:216
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20359,13 +20486,13 @@ msgstr "清除數據之全域設定"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:217
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: app/views/popup.service.time.edit.php:73
-#: app/views/popup.service.time.edit.php:99
+#: app/views/popup.service.time.edit.php:76
+#: app/views/popup.service.time.edit.php:104
 msgid "hh"
 msgstr "hh"
 
@@ -20413,7 +20540,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:435
+#: app/views/administration.user.edit.php:438
 msgid "including subgroups"
 msgstr ""
 
@@ -20639,12 +20766,12 @@ msgstr "低階探索規則"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:218 jsLoader.php:382
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:215
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20748,8 +20875,8 @@ msgstr ""
 msgid "minimum length is %1$s characters"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:81
-#: app/views/popup.service.time.edit.php:107
+#: app/views/popup.service.time.edit.php:84
+#: app/views/popup.service.time.edit.php:112
 msgid "mm"
 msgstr "mm"
 
@@ -20844,7 +20971,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:319
 msgid "new"
 msgstr "新的"
 
@@ -20911,7 +21038,7 @@ msgstr ""
 msgid "number"
 msgstr ""
 
-#: app/views/monitoring.widget.problemhosts.view.php:126
+#: app/views/monitoring.widget.problemhosts.view.php:127
 #: include/blocks.inc.php:504
 msgid "of"
 msgstr "其"
@@ -20979,7 +21106,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:393
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21106,7 +21233,7 @@ msgstr ""
 msgid "service"
 msgstr ""
 
-#: app/views/popup.service.time.edit.php:121
+#: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "簡述"
 
@@ -21191,7 +21318,7 @@ msgstr ""
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
-#: include/classes/api/services/CUser.php:1948
+#: include/classes/api/services/CUser.php:1958
 msgid "supplied credentials are not unique"
 msgstr ""
 
@@ -21201,8 +21328,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:172
 #: app/partials/monitoring.problem.filter.php:353
 #: app/views/administration.usergroup.edit.php:182
-#: app/views/popup.service.edit.php:98
-#: include/classes/api/services/CUserGroup.php:470
+#: app/views/popup.service.edit.php:84
+#: include/classes/api/services/CUserGroup.php:473
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21283,7 +21410,7 @@ msgstr ""
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:298
 msgid "time shift"
 msgstr ""
 
@@ -21346,7 +21473,7 @@ msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:318
 msgid "type here to search"
 msgstr "於此輸入搜尋條件"
 
@@ -21373,7 +21500,7 @@ msgstr ""
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
 
-#: include/classes/parsers/CExpressionMacroParser.php:83
+#: include/classes/parsers/CExpressionMacroParser.php:108
 msgid "unexpected end of expression macro"
 msgstr ""
 
@@ -21467,7 +21594,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:109
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21487,7 +21614,7 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:394
 msgid "value"
 msgstr "值"
 
@@ -21634,7 +21761,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:214
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/sysmap.php b/ui/sysmap.php
index fc4a353fc75..955ae62e9cf 100644
--- a/ui/sysmap.php
+++ b/ui/sysmap.php
@@ -52,6 +52,7 @@ $fields = [
 	// ajax
 	'favobj' =>		[T_ZBX_STR, O_OPT, P_ACT,	null,		null],
 	'favid' =>		[T_ZBX_STR, O_OPT, P_ACT,	null,		null],
+	'name' =>		[T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({action}) && {action} == "expand"'],
 	'source' =>		[T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({action}) && {action} == "expand"']
 ];
 check_fields($fields);
@@ -155,8 +156,9 @@ if (isset($_REQUEST['favobj'])) {
 			exit();
 		}
 		elseif (getRequest('action') === 'expand') {
-			$values = [];
+			$values = ['selements' => [], 'links' => [], 'shapes' => []];
 			$return = [];
+			$name = getRequest('name');
 			$sources = json_decode(getRequest('source'), true);
 
 			foreach ($sources as $num => $source) {
@@ -167,25 +169,33 @@ if (isset($_REQUEST['favobj'])) {
 
 					if (array_key_exists('elementtype', $source) && array_key_exists('elements', $source)
 							&& is_array($source['elements']) && CMapHelper::checkSelementPermissions([$source])) {
-						$values[$num] = $source;
+						$element_type = 'selements';
 					}
 					else {
-						$label = array_key_exists('label', $source) ? $source['label'] : $source['text'];
-						$return[$num] = CMacrosResolverHelper::resolveMapLabelMacros($label);
+						$element_type = array_key_exists('label', $source) ? 'links' : 'shapes';
 					}
+
+					$values[$element_type][$num] = $source;
 				}
 				else {
 					$return[$num] = null;
 				}
 			}
 
-			if ($values) {
+			$values['links'] = CMacrosResolverHelper::resolveMapLinkLabelMacros($values['links'], ['label' => 'label']);
+			$values['shapes'] = CMacrosResolverHelper::resolveMapShapeLabelMacros($name, $values['shapes'],
+				['text' => 'label']
+			);
+
+			if ($values['selements']) {
 				// Resolve macros in map element labels.
-				$values = CMacrosResolverHelper::resolveMacrosInMapElements($values, ['resolve_element_label' => true]);
+				$values['selements'] = CMacrosResolverHelper::resolveMacrosInMapElements($values['selements'],
+					['resolve_element_label' => true]
+				);
+			}
 
-				foreach ($values as $num => $value) {
-					$return[$num] = $value['label'];
-				}
+			foreach ($values['selements'] + $values['links'] + $values['shapes'] as $num => $value) {
+				$return[$num] = $value['label'];
 			}
 
 			ksort($return);
@@ -233,6 +243,11 @@ if (isset($_REQUEST['sysmapid'])) {
 /*
  * Display
  */
+$sysmap['links'] = CMacrosResolverHelper::resolveMapLinkLabelMacros($sysmap['links'], ['label' => 'expanded']);
+$sysmap['shapes'] = CMacrosResolverHelper::resolveMapShapeLabelMacros($sysmap['name'], $sysmap['shapes'],
+	['text' => 'expanded']
+);
+
 $data = [
 	'sysmap' => $sysmap,
 	'iconList' => [],
@@ -247,11 +262,6 @@ $data['sysmap'] = CMapHelper::applyMapElementLabelProperties($data['sysmap']);
 // get selements
 addElementNames($data['sysmap']['selements']);
 
-foreach ($data['sysmap']['shapes'] as &$shape) {
-	$shape['expanded'] = CMacrosResolverHelper::resolveMapLabelMacros($shape['text']);
-}
-unset($shape);
-
 foreach ($data['sysmap']['lines'] as $line) {
 	$data['sysmap']['shapes'][] = CMapHelper::convertLineToShape($line);
 }
@@ -287,7 +297,6 @@ foreach ($data['sysmap']['links'] as &$link) {
 		$link['linktriggers'][$lnum]['desc_exp'] = $host['name'].NAME_DELIMITER.$dbTrigger['description'];
 	}
 
-	$link['expanded'] = CMacrosResolverHelper::resolveMapLabelMacros($link['label']);
 	order_result($link['linktriggers'], 'desc_exp');
 }
 unset($link);
diff --git a/ui/tests/api_json/testUserGroup.php b/ui/tests/api_json/testUserGroup.php
index 5f5de0dc3fd..d2e3073f139 100644
--- a/ui/tests/api_json/testUserGroup.php
+++ b/ui/tests/api_json/testUserGroup.php
@@ -81,7 +81,7 @@ class testUserGroup extends CAPITest {
 				'group' => [
 					'name' => 'Admin in group with disabled GUI access',
 					'gui_access' => GROUP_GUI_ACCESS_DISABLED,
-					'userids' => 1
+					'users' => ['userid' => 1]
 				],
 				'expected_error' => 'User cannot add himself to a disabled group or a group with disabled GUI access.'
 			],
@@ -89,7 +89,7 @@ class testUserGroup extends CAPITest {
 				'group' => [
 					'name' => 'Admin in disabled group',
 					'users_status' => 1,
-					'userids' => 1
+					'users' => ['userid' => 1]
 				],
 				'expected_error' => 'User cannot add himself to a disabled group or a group with disabled GUI access.'
 			],
@@ -216,7 +216,7 @@ class testUserGroup extends CAPITest {
 					'usrgrpid' => '14',
 					'name' => 'Admin in group with disabled GUI access',
 					'gui_access' => GROUP_GUI_ACCESS_DISABLED,
-					'userids' => 1
+					'users' => ['userid' => 1]
 				]],
 				'expected_error' => 'User cannot add himself to a disabled group or a group with disabled GUI access.'
 			],
@@ -225,7 +225,7 @@ class testUserGroup extends CAPITest {
 					'usrgrpid' => '14',
 					'name' => 'Admin in disabled group',
 					'users_status' => 1,
-					'userids' => 1
+					'users' => ['userid' => 1]
 				]],
 				'expected_error' => 'User cannot add himself to a disabled group or a group with disabled GUI access.'
 			],
@@ -233,7 +233,7 @@ class testUserGroup extends CAPITest {
 				'group' => [[
 					'usrgrpid' => '15',
 					'name' => 'User without user group',
-					'userids' => 1
+					'users' => ['userid' => 1]
 				]],
 				'expected_error' => 'User "user-in-one-group" cannot be without user group.'
 			],
@@ -405,31 +405,26 @@ class testUserGroup extends CAPITest {
 			[
 				'group' => [
 					'name' => 'Empty user id',
-					'userids' => ''
+					'users' => ''
 				],
-				'expected_error' => 'Invalid parameter "/1/userids": an array is expected.'
+				'expected_error' => 'Invalid parameter "/1/users": an array is expected.'
 			],
 			[
 				'group' => [
 					'name' => 'Empty user id',
-					'userids' => ['']
+					'users' => ['']
 				],
-				'expected_error' => 'Invalid parameter "/1/userids/1": a number is expected.'
+				'expected_error' => 'Invalid parameter "/1/users/1": an array is expected.'
 			],
 			[
 				'group' => [
 					'name' => 'Non existent user',
-					'userids' => '123456'
+					'users' => [
+						'userid' => '123456'
+					]
 				],
 				'expected_error' => 'User with ID "123456" is not available.'
 			],
-			[
-				'group' => [
-					'name' => 'Non existent user, string',
-					'userids' => 'abc'
-				],
-				'expected_error' => 'Invalid parameter "/1/userids": an array is expected.'
-			],
 			// Check user group permissions, host group id.
 			[
 				'group' => [
@@ -552,7 +547,10 @@ class testUserGroup extends CAPITest {
 						'id' => '50012',
 						'permission' => '3'
 					],
-					'userids' => ['2', '8']
+					'users' => [
+						['userid' => 2],
+						['userid' => '8']
+					]
 				],
 				'expected_error' => null
 			]
@@ -562,41 +560,42 @@ class testUserGroup extends CAPITest {
 	/**
 	* @dataProvider usergroup_properties
 	*/
-	public function testUserGroups_Properties($groups, $expected_error) {
+	public function testUserGroups_Properties($group, $expected_error) {
 		$methods = ['usergroup.create', 'usergroup.update'];
 
 		foreach ($methods as $method) {
 			if ($method == 'usergroup.update') {
-				$groups['usrgrpid'] = '13';
-				$groups['name'] = 'Updated '.$groups['name'];
+				$group['usrgrpid'] = '13';
+				$group['name'] = 'Updated '.$group['name'];
 			}
-			$result = $this->call($method, $groups, $expected_error);
+			$result = $this->call($method, $group, $expected_error);
 
 			if ($expected_error === null) {
-				$dbResult = DBSelect('select * from usrgrp where usrgrpid='.
-						zbx_dbstr($result['result']['usrgrpids'][0])
+				$db_group = CDBHelper::getRow(
+					'SELECT * FROM usrgrp WHERE usrgrpid='.zbx_dbstr($result['result']['usrgrpids'][0])
 				);
-				$dbRow = DBFetch($dbResult);
-				$this->assertEquals($dbRow['name'], $groups['name']);
-				$this->assertEquals($dbRow['gui_access'], $groups['gui_access']);
-				$this->assertEquals($dbRow['users_status'], $groups['users_status']);
-				$this->assertEquals($dbRow['debug_mode'], $groups['debug_mode']);
+				$this->assertSame($group['name'], $db_group['name']);
+				$this->assertEquals($group['gui_access'], $db_group['gui_access']);
+				$this->assertEquals($group['users_status'], $db_group['users_status']);
+				$this->assertEquals($group['debug_mode'], $db_group['debug_mode']);
 
-				foreach ($groups['userids'] as $user) {
-					$this->assertEquals(1, CDBHelper::getCount('select * from users_groups where userid='.zbx_dbstr($user).
-							' and usrgrpid='.zbx_dbstr($result['result']['usrgrpids'][0])
-					));
-				}
+				$this->assertEquals(count($group['users']), CDBHelper::getCount(
+					'SELECT NULL'.
+					' FROM users_groups'.
+					' WHERE usrgrpid='.zbx_dbstr($result['result']['usrgrpids'][0])
+				));
 
-				$dbRight = DBSelect('select * from rights where groupid='.$result['result']['usrgrpids'][0]);
-				$dbRowRight = DBFetch($dbRight);
-				$this->assertEquals($dbRowRight['id'], $groups['rights']['id']);
-				$this->assertEquals($dbRowRight['permission'], $groups['rights']['permission']);
+				$db_right = CDBHelper::getRow('SELECT * FROM rights WHERE groupid='.$result['result']['usrgrpids'][0]);
+				$this->assertEquals($group['rights']['id'], $db_right['id']);
+				$this->assertEquals($group['rights']['permission'], $db_right['permission']);
 			}
 			else {
-				if (array_key_exists('name', $groups) && array_key_exists('usrgrpid', $groups)){
-					$this->assertEquals(0, CDBHelper::getCount('select * from usrgrp where usrgrpid='.
-							zbx_dbstr($groups['usrgrpid']).' and name='.zbx_dbstr($groups['name'])
+				if (array_key_exists('name', $group) && array_key_exists('usrgrpid', $group)) {
+					$this->assertEquals(0, CDBHelper::getCount(
+						'SELECT NULL'.
+						' FROM usrgrp'.
+						' WHERE usrgrpid='.zbx_dbstr($group['usrgrpid']).
+							' AND name='.zbx_dbstr($group['name'])
 					));
 				}
 			}
diff --git a/ui/tests/integration/testEscalations.php b/ui/tests/integration/testEscalations.php
index 74d4701ac60..d1880bb5d0a 100644
--- a/ui/tests/integration/testEscalations.php
+++ b/ui/tests/integration/testEscalations.php
@@ -270,7 +270,7 @@ class testEscalations extends CIntegrationTest {
 		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 0);
 
 		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 120);
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
 
 		$response = $this->callUntilDataIsPresent('alert.get', [
 			'actionids' => [self::$trigger_actionid],
@@ -326,7 +326,7 @@ class testEscalations extends CIntegrationTest {
 
 		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 4);
 		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 120);
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
 
 		$response = $this->callUntilDataIsPresent('alert.get', [
 			'actionids' => [self::$trigger_actionid]
@@ -413,7 +413,7 @@ class testEscalations extends CIntegrationTest {
 		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In zbx_dc_update_maintenances()', true, 120);
 		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of zbx_dc_update_maintenances()', true);
 		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 120);
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
 
 		$response = $this->callUntilDataIsPresent('alert.get', [
 			'actionids' => [self::$trigger_actionid]
@@ -572,11 +572,11 @@ class testEscalations extends CIntegrationTest {
 		$this->reloadConfigurationCache();
 
 		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 7);
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 200);
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 95, 3);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
 
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 200);
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 95, 3);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
 
 		$response = $this->callUntilDataIsPresent('alert.get', [
 				'output' => 'extend',
@@ -703,8 +703,8 @@ HEREDOC;
 		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 8);
 		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 0);
 
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 200);
-		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 95, 3);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
 
 		$response = $this->callUntilDataIsPresent('alert.get', [
 			'actionids' => $actionid
diff --git a/ui/tests/selenium/data/data_test.sql b/ui/tests/selenium/data/data_test.sql
index 76fb22ef561..4a3eaf9d3b4 100644
--- a/ui/tests/selenium/data/data_test.sql
+++ b/ui/tests/selenium/data/data_test.sql
@@ -274,7 +274,7 @@ INSERT INTO sysmaps_elements (selementid, sysmapid, elementid, elementtype, icon
 
 INSERT INTO sysmap_element_trigger (selement_triggerid, selementid, triggerid) VALUES (1,5,13487);
 
-INSERT INTO sysmaps_links (linkid, sysmapid, selementid1, selementid2, drawtype, color, label) VALUES (1,3,3,4,2,'00CC00','CPU load: {Zabbix Server:system.cpu.load[].last(0)}');
+INSERT INTO sysmaps_links (linkid, sysmapid, selementid1, selementid2, drawtype, color, label) VALUES (1,3,3,4,2,'00CC00','CPU load: {?last(/Zabbix Server/system.cpu.load[])}');
 INSERT INTO sysmaps_links (linkid, sysmapid, selementid1, selementid2, drawtype, color, label) VALUES (2,3,3,5,0,'00CC00','');
 INSERT INTO sysmaps_links (linkid, sysmapid, selementid1, selementid2, drawtype, color, label) VALUES (3,3,6,5,0,'00CC00','');
 INSERT INTO sysmaps_links (linkid, sysmapid, selementid1, selementid2, drawtype, color, label) VALUES (4,3,7,6,0,'00CC00','');
diff --git a/ui/tests/unit/include/classes/import/converters/C54ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C54ImportConverterTest.php
index c7050be2a03..326031873bb 100644
--- a/ui/tests/unit/include/classes/import/converters/C54ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C54ImportConverterTest.php
@@ -22,10 +22,143 @@
 class C54ImportConverterTest extends CImportConverterTest {
 
 	public function importConverterDataProvider(): array {
+		$simple_macros_source = '{Zabbix server:system.hostname.last()}'.
+			'{Zabbix server:system.hostname.last(0)}{{HOST.HOST}:system.hostname.min(1s)}'.
+			'{{HOST.HOST1}:system.hostname.max(1m)}{{HOST.HOST2}:system.hostname.avg(1h)}'.
+			'{{HOSTNAME}:system.hostname.min(1d)}{{HOSTNAME1}:system.hostname.max(24h)}'.
+			'{{HOSTNAME1}:system.hostname.max(24h,)}{{HOSTNAME2}:system.hostname.avg(3600)}';
+		$simple_macros_expected = '{?last(/Zabbix server/system.hostname)}'.
+			'{?last(/Zabbix server/system.hostname)}{?min(/'.'/system.hostname,1s)}'.
+			'{?max(/'.'/system.hostname,1m)}{?avg(/{HOST.HOST2}/system.hostname,1h)}'.
+			'{?min(/'.'/system.hostname,1d)}{?max(/'.'/system.hostname,24h)}'.
+			'{?max(/'.'/system.hostname,24h)}{?avg(/{HOST.HOST2}/system.hostname,3600s)}';
+
 		return [
 			[
 				[],
 				[]
+			],
+			[
+				[
+					'hosts' => [
+						[
+							'host' => 'Zabbix server',
+							'groups' => [
+								['name' => 'Zabbix servers']
+							],
+							'discovery_rules' => [
+								[
+									'name' => 'Mounted filesystem discovery',
+									'key' => 'vfs.fs.discovery',
+									'graph_prototypes' => [
+										[
+											'name' => $simple_macros_source
+										]
+									]
+								]
+							]
+						]
+					],
+					'graphs' => [
+						[
+							'name' => $simple_macros_source
+						]
+					],
+					'maps' => [
+						[
+							'label_string_host' => $simple_macros_source,
+							'label_string_hostgroup' => $simple_macros_source,
+							'label_string_trigger' => $simple_macros_source,
+							'label_string_map' => $simple_macros_source,
+							'label_string_image' => $simple_macros_source,
+							'selements' => [
+								[
+									'label' => $simple_macros_source
+								]
+							],
+							'shapes' => [
+								[
+									'text' => $simple_macros_source
+								]
+							],
+							'links' => [
+								[
+									'label' => $simple_macros_source
+								]
+							]
+						]
+					],
+					'media_types' => [
+						[
+							'message_templates' => [
+								[
+									'subject' => $simple_macros_source,
+									'message' => $simple_macros_source
+								]
+							]
+						]
+					]
+				],
+				[
+					'hosts' => [
+						[
+							'host' => 'Zabbix server',
+							'groups' => [
+								['name' => 'Zabbix servers']
+							],
+							'discovery_rules' => [
+								[
+									'name' => 'Mounted filesystem discovery',
+									'key' => 'vfs.fs.discovery',
+									'graph_prototypes' => [
+										[
+											'name' => $simple_macros_expected
+										]
+									]
+								]
+							]
+						]
+					],
+					'graphs' => [
+						[
+							'name' => $simple_macros_expected
+						]
+					],
+					'maps' => [
+						[
+							'label_string_host' => $simple_macros_expected,
+							'label_string_hostgroup' => $simple_macros_expected,
+							'label_string_trigger' => $simple_macros_expected,
+							'label_string_map' => $simple_macros_expected,
+							'label_string_image' => $simple_macros_expected,
+							'selements' => [
+								[
+									'label' => $simple_macros_expected
+								]
+							],
+							'shapes' => [
+								[
+									'text' => $simple_macros_expected
+								]
+							],
+							'links' => [
+								[
+									'label' => $simple_macros_expected
+								]
+							]
+						]
+					],
+					'media_types' => [
+						[
+							'message_templates' => [
+								[
+									'subject' => $simple_macros_expected,
+									'message' => $simple_macros_expected
+								]
+							]
+						]
+					]
+				]
 			]
 		];
 	}
diff --git a/ui/tests/unit/include/classes/parsers/CExpressionMacroParserTest.php b/ui/tests/unit/include/classes/parsers/CExpressionMacroParserTest.php
index 7bffc99d468..63d64cf735c 100644
--- a/ui/tests/unit/include/classes/parsers/CExpressionMacroParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CExpressionMacroParserTest.php
@@ -25,62 +25,102 @@ class CExpressionMacroParserTest extends TestCase {
 
 	public static function dataProvider() {
 		return [
-			['', 0, [
+			['', [], 0, [
 				'rc' => CParser::PARSE_FAIL,
 				'match' => '',
 				'length' => 0
 			]],
-			['{', 0, [
+			['{', [], 0, [
 				'rc' => CParser::PARSE_FAIL,
 				'match' => '',
 				'length' => 0
 			]],
-			['{?', 0, [
+			['{?', [], 0, [
 				'rc' => CParser::PARSE_FAIL,
 				'match' => '',
 				'length' => 0
 			]],
-			['text {?}', 5, [
+			['text {?}', [], 5, [
 				'rc' => CParser::PARSE_FAIL,
 				'match' => '',
 				'length' => 0
 			]],
-			['text {?1+1}', 5, [
+			['text {?1+1}', [], 5, [
 				'rc' => CParser::PARSE_SUCCESS,
 				'match' => '{?1+1}',
 				'length' => 6
 			]],
-			['text {?1+1} text', 5, [
+			['text {?1+1} text', [], 5, [
 				'rc' => CParser::PARSE_SUCCESS_CONT,
 				'match' => '{?1+1}',
 				'length' => 6
 			]],
-			['text {? 1 + 1   }', 5, [
+			['text {? 1 + 1   }', [], 5, [
 				'rc' => CParser::PARSE_SUCCESS,
 				'match' => '{? 1 + 1   }',
 				'length' => 12
 			]],
-			['text {?last(/'.'/system.cpu.load)}', 5, [
+			['text {?last(/'.'/system.cpu.load)}', [], 5, [
+				'rc' => CParser::PARSE_FAIL,
+				'match' => '',
+				'length' => 0
+			]],
+			['text {?last(/'.'/system.cpu.load)}', ['empty_host' => true], 5, [
 				'rc' => CParser::PARSE_SUCCESS,
 				'match' => '{?last(/'.'/system.cpu.load)}',
 				'length' => 26
 			]],
-			['text {? last(/{HOST.HOST}/key, #25) } text', 5, [
+			['text {? last(/{HOST.HOST}/key, #25) } text', [], 5, [
+				'rc' => CParser::PARSE_FAIL,
+				'match' => '',
+				'length' => 0
+			]],
+			['text {? last(/{HOST.HOST6}/key, #25) } text', ['host_macro' => true], 5, [
+				'rc' => CParser::PARSE_FAIL,
+				'match' => '',
+				'length' => 0
+			]],
+			['text {? last(/{HOST.HOST}/key, #25) } text', ['host_macro' => true], 5, [
+				'rc' => CParser::PARSE_SUCCESS_CONT,
+				'match' => '{? last(/{HOST.HOST}/key, #25) }',
+				'length' => 32
+			]],
+			['text {? last(/{HOST.HOST}/key, #25) } text', ['host_macro_n' => true], 5, [
 				'rc' => CParser::PARSE_SUCCESS_CONT,
 				'match' => '{? last(/{HOST.HOST}/key, #25) }',
 				'length' => 32
 			]],
-			['text {? last(/{HOST.HOST6}/key, #25) } text', 5, [
+			['text {? last(/{HOST.HOST6}/key, #25) } text', ['host_macro_n' => true], 5, [
 				'rc' => CParser::PARSE_SUCCESS_CONT,
 				'match' => '{? last(/{HOST.HOST6}/key, #25) }',
 				'length' => 33
 			]],
-			['text {? last(/host/key, #25) + max(sum(/host/key, 1d:now/d), sum(/host/key, 1d:now/d-1d)) } text', 5, [
+			['text {? last(/host/key, #25) + max(sum(/host/key, 1d:now/d), sum(/host/key, 1d:now/d-1d)) } text', [], 5, [
 				'rc' => CParser::PARSE_SUCCESS_CONT,
 				'match' => '{? last(/host/key, #25) + max(sum(/host/key, 1d:now/d), sum(/host/key, 1d:now/d-1d)) }',
 				'length' => 86
 			]],
-			['text {? 1 + 1   text', 5, [
+			['text {?last(/Zabbix server/system.cpu.load, {#LLD})}', [], 5, [
+				'rc' => CParser::PARSE_FAIL,
+				'match' => '',
+				'length' => 0
+			]],
+			['text {?last(/Zabbix server/system.cpu.load, {#LLD})}', ['lldmacros' => true], 5, [
+				'rc' => CParser::PARSE_SUCCESS,
+				'match' => '{?last(/Zabbix server/system.cpu.load, {#LLD})}',
+				'length' => 47
+			]],
+			['text {?last(/Zabbix server/system.cpu.load, {$MACRO})}', [], 5, [
+				'rc' => CParser::PARSE_FAIL,
+				'match' => '',
+				'length' => 0
+			]],
+			['text {?last(/Zabbix server/system.cpu.load, {$MACRO})}', ['usermacros' => true], 5, [
+				'rc' => CParser::PARSE_SUCCESS,
+				'match' => '{?last(/Zabbix server/system.cpu.load, {$MACRO})}',
+				'length' => 49
+			]],
+			['text {? 1 + 1   text', [], 5, [
 				'rc' => CParser::PARSE_FAIL,
 				'match' => '',
 				'length' => 0
@@ -95,13 +135,14 @@ class CExpressionMacroParserTest extends TestCase {
 	 * @param int     $pos
 	 * @param array   $result
 	 */
-	public function testExpressionMacroParser(string $source, int $pos, array $result) {
-		$expression_macro_parser = new CExpressionMacroParser();
+	public function testExpressionMacroParser(string $source, array $options, int $pos, array $result) {
+		$expression_macro_parser = new CExpressionMacroParser($options);
 
 		$this->assertSame($result, [
 			'rc' => $expression_macro_parser->parse($source, $pos),
 			'match' => $expression_macro_parser->getMatch(),
 			'length' => $expression_macro_parser->getLength()
 		]);
+		$this->assertTrue($expression_macro_parser->getExpressionParser() instanceof CExpressionParser);
 	}
 }