.......... [ZBX-10615] updated to the latest master (non-conflicting part)

1 files changed, 341 insertions, 0 deletions

diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po
index 2699053ab2e..2a07c224d1b 100644
--- a/ui/locale/ru/LC_MESSAGES/frontend.po
+++ b/ui/locale/ru/LC_MESSAGES/frontend.po
@@ -282,6 +282,11 @@ msgctxt "screen reader"
 msgid "%1$s, selected"
 msgstr "%1$s, выбрано"
 
+#: include/classes/graph/CSvgGraph.php:1262
+#, c-format
+msgid "%1$sth percentile: %2$s"
+msgstr ""
+
 #: include/func.inc.php:1947
 #, c-format
 msgid "%4$s failed login attempt logged. Last failed attempt was from %1$s on %2$s at %3$s."
@@ -316,6 +321,12 @@ msgstr "(0 - использовать умолчание действия)"
 msgid "(Only super admins can create groups)"
 msgstr "(Только супер администраторы могут создавать группы)"
 
+#: app/partials/configuration.tags.tab.php:84
+#: app/partials/hostmacros.inherited.list.html.php:190
+#: app/partials/hostmacros.list.html.php:87
+msgid "(created by host discovery)"
+msgstr ""
+
 #: app/partials/configuration.host.edit.html.php:131
 msgid "(linked by host discovery)"
 msgstr ""
@@ -910,6 +921,12 @@ msgstr "Добавить с"
 msgid "Add host"
 msgstr "Добавить узел сети"
 
+#: app/views/popup.massupdate.trigger.php:155
+#: include/views/configuration.trigger.prototype.edit.php:685
+#: include/views/configuration.triggers.edit.php:669
+msgid "Add host trigger"
+msgstr ""
+
 #: include/classes/widgets/views/widget.tophosts.form.view.php:75
 msgid "Add item column"
 msgstr "Добавить колонку элементов данных"
@@ -1302,12 +1319,20 @@ msgstr "Применить"
 msgid "Apply permissions and tag filters to all subgroups"
 msgstr "Применить права доступа и фильтры тегов ко всем подгруппам"
 
+#: app/partials/configuration.templategroup.edit.html.php:47
+msgid "Apply permissions to all subgroups"
+msgstr ""
+
 #: include/views/configuration.maintenance.list.php:71
 #: include/views/configuration.maintenance.list.php:105
 msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Близится"
 
+#: include/classes/widgets/CWidgetHelper.php:1443
+msgid "Approximation"
+msgstr ""
+
 #: include/func.inc.php:239
 msgid "Apr"
 msgstr "Апр."
@@ -1438,6 +1463,11 @@ msgstr "Должна быть выбрана по крайней мере одн
 msgid "At least one operation must exist."
 msgstr "Должна существовать по крайней мере одна операция."
 
+#: include/classes/api/services/CHostGroup.php:1594
+#, c-format
+msgid "At least one parameter \"%1$s\" or \"%2$s\" must be enabled."
+msgstr ""
+
 #: app/controllers/CControllerPopupAcknowledgeCreate.php:172
 msgid "At least one update operation or message is mandatory"
 msgstr "По крайней мере одна операция обновления или сообщение обязательно"
@@ -1984,6 +2014,11 @@ msgstr "Не удалось добавить группу"
 msgid "Cannot add host"
 msgstr "Не удалось добавить узел сети"
 
+#: app/controllers/CControllerHostGroupCreate.php:40
+#: app/controllers/CControllerHostGroupCreate.php:70
+msgid "Cannot add host group"
+msgstr ""
+
 #: host_prototypes.php:304
 msgid "Cannot add host prototype"
 msgstr "Не удалось добавить прототип узлов сети"
@@ -2065,6 +2100,11 @@ msgstr "Не удалось добавить подкарты. Достигну�
 msgid "Cannot add template"
 msgstr "Не удалось добавить шаблон"
 
+#: app/controllers/CControllerTemplateGroupCreate.php:40
+#: app/controllers/CControllerTemplateGroupCreate.php:70
+msgid "Cannot add template group"
+msgstr ""
+
 #: triggers.php:306
 msgid "Cannot add trigger"
 msgstr "Не удалось добавить триггер"
@@ -2343,6 +2383,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: app/controllers/CControllerHostGroupDelete.php:75
+msgid "Cannot delete host group"
+msgid_plural "Cannot delete host groups"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: include/classes/api/services/CHostGroup.php:849
 #, c-format
 msgid "Cannot delete host group %1$s because maintenance \"%2$s\" must contain at least one host or host group."
@@ -2351,6 +2398,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: app/controllers/CControllerHostGroupDelete.php:39
+#: app/controllers/CControllerTemplateGroupDelete.php:39
+msgid "Cannot delete host groups"
+msgstr ""
+
 #: host_prototypes.php:147 host_prototypes.php:356
 msgid "Cannot delete host prototypes"
 msgstr "Не удалось удалить прототипы узлов сети"
@@ -2474,6 +2526,13 @@ msgstr "Не удалось удалить услугу \"%1$s\": %2$s."
 msgid "Cannot delete template"
 msgstr "Не удалось удалить шаблон"
 
+#: app/controllers/CControllerTemplateGroupDelete.php:75
+msgid "Cannot delete template group"
+msgid_plural "Cannot delete template groups"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: include/classes/api/services/CGraphPrototype.php:374
 msgid "Cannot delete templated graph prototype."
 msgstr "Не удалось удалить прототип графиков унаследованный из шаблона."
@@ -3084,6 +3143,11 @@ msgstr "Не удалось прочитать YAML: %1$s."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Не удалось прочитать ответ, проверьте соединение с Zabbix сервером \"%1$s\"."
 
+#: app/controllers/CControllerPopupMassupdateHost.php:362
+#, c-format
+msgid "Cannot remove the tag with name \"%1$s\" and value \"%2$s\", defined in a host prototype, from host \"%3$s\"."
+msgstr ""
+
 #: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Невозможно переименовать гостевого пользователя."
@@ -3363,6 +3427,11 @@ msgstr "Не удалось обновить узел сети"
 msgid "Cannot update host encryption settings. Connection settings for both directions should be specified."
 msgstr "Не удалось обновить настройки шифрования узла сети. Необходимо указать настройки соединения в обе стороны."
 
+#: app/controllers/CControllerHostGroupUpdate.php:43
+#: app/controllers/CControllerHostGroupUpdate.php:105
+msgid "Cannot update host group"
+msgstr ""
+
 #: host_prototypes.php:286 host_prototypes.php:320 host_prototypes.php:341
 msgid "Cannot update host prototype"
 msgid_plural "Cannot update host prototypes"
@@ -3494,6 +3563,11 @@ msgstr "Не удалось обновить шаг унаследованног
 msgid "Cannot update template"
 msgstr "Не удалось обновить шаблон"
 
+#: app/controllers/CControllerTemplateGroupUpdate.php:41
+#: app/controllers/CControllerTemplateGroupUpdate.php:94
+msgid "Cannot update template group"
+msgstr ""
+
 #: app/controllers/CControllerPopupMassupdateTemplate.php:351
 msgid "Cannot update templates"
 msgstr "Не удалось обновить шаблоны"
@@ -4055,6 +4129,10 @@ msgstr "Настройка графиков"
 msgid "Configuration of host"
 msgstr "Настройка узла сети"
 
+#: app/controllers/CControllerHostGroupEdit.php:89
+msgid "Configuration of host group"
+msgstr ""
+
 #: hostgroups.php:25
 msgid "Configuration of host groups"
 msgstr "Настройка групп узлов сети"
@@ -4121,6 +4199,14 @@ msgstr "Настройка регулярных выражений"
 msgid "Configuration of scripts"
 msgstr "Настройка скриптов"
 
+#: app/controllers/CControllerTemplateGroupEdit.php:88
+msgid "Configuration of template group"
+msgstr ""
+
+#: app/controllers/CControllerTemplateGroupList.php:123
+msgid "Configuration of template groups"
+msgstr ""
+
 #: templates.php:27
 msgid "Configuration of templates"
 msgstr "Настройка шаблонов"
@@ -4179,6 +4265,10 @@ msgstr "Настройка подключения к БД"
 msgid "Confirmation text"
 msgstr "Текст подтверждения"
 
+#: app/views/popup.acknowledge.edit.php:114
+msgid "Confirms the problem is noticed (acknowledging user will be recorded). Status change triggers action update operation."
+msgstr ""
+
 #: include/classes/setup/CSetupWizard.php:907
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Поздравляем! Вы успешно установили Zabbix веб-интерфейс."
@@ -4655,6 +4745,11 @@ msgstr "Создать услугу"
 msgid "Create template"
 msgstr "Создать шаблон"
 
+#: app/views/configuration.templategroup.list.php:33
+#: app/views/configuration.templategroup.list.php:35
+msgid "Create template group"
+msgstr ""
+
 #: include/views/configuration.triggers.list.php:153 jsLoader.php:357
 msgid "Create trigger"
 msgstr "Создать триггер"
@@ -5112,6 +5207,10 @@ msgstr "День недели"
 msgid "Days"
 msgstr "Дни"
 
+#: app/views/popup.acknowledge.edit.php:102
+msgid "Deactivates manual suppression."
+msgstr ""
+
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:391
 msgid "Debug"
 msgstr "Отладка"
@@ -5419,6 +5518,12 @@ msgstr "Удалить выбранную группу?"
 msgid "Delete selected groups?"
 msgstr "Удалить выбранные группы?"
 
+#: app/views/configuration.hostgroup.edit.php:45
+#: app/views/js/configuration.hostgroup.list.js.php:104
+#: app/views/popup.hostgroup.edit.php:50
+msgid "Delete selected host group?"
+msgstr ""
+
 #: include/views/configuration.hostgroups.list.php:205
 msgid "Delete selected host groups?"
 msgstr "Удалить выбранные группы узлов сети?"
@@ -5511,6 +5616,16 @@ msgstr "Удалить выбранные услуги?"
 msgid "Delete selected shapes?"
 msgstr "Удалить выбранные фигуры?"
 
+#: app/views/configuration.templategroup.edit.php:45
+#: app/views/js/configuration.templategroup.list.js.php:70
+#: app/views/popup.templategroup.edit.php:50
+msgid "Delete selected template group?"
+msgstr ""
+
+#: app/views/js/configuration.templategroup.list.js.php:69
+msgid "Delete selected template groups?"
+msgstr ""
+
 #: include/views/configuration.template.list.php:292
 msgid "Delete selected templates?"
 msgstr "Удалить выбранные шаблоны?"
@@ -5613,6 +5728,11 @@ msgstr "Состояние развертывания"
 msgid "Deprecated"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:1302
+#, c-format
+msgid "Deprecated parameter \"%1$s\" cannot be used with \"%2$s\"."
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:287
 #: app/partials/configuration.host.edit.html.php:261
 #: app/partials/hostmacros.list.html.php:37
@@ -6085,6 +6205,10 @@ msgstr "Отображать триггеры в состоянии ОК в те
 msgid "Display graph"
 msgstr "Показать график"
 
+#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:436
+msgid "Display min/max/avg"
+msgstr ""
+
 #: include/views/monitoring.sysmap.edit.php:152
 msgid "Display problems"
 msgstr "Отображение проблем"
@@ -8229,11 +8353,27 @@ msgstr "Группа узлов сети \"%1$s\" уже существует."
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как используется в глобальном скрипте."
 
+#: include/classes/api/services/CHostGroup.php:631
+#, c-format
+msgid "Host group \"%1$s\" is group for discovered hosts and cannot be deleted."
+msgstr ""
+
 #: include/classes/api/services/CHostGroup.php:642
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr "Группа узлов сети \"%1$s\" - внутренняя и не может быть удалена."
 
+#: app/controllers/CControllerHostGroupCreate.php:62
+msgid "Host group added"
+msgstr ""
+
+#: app/controllers/CControllerHostGroupDelete.php:60
+msgid "Host group deleted"
+msgid_plural "Host groups deleted"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: include/views/js/monitoring.sysmaps.js.php:109
 msgid "Host group elements"
 msgstr "Элементы группы узлов сети"
@@ -8242,6 +8382,10 @@ msgstr "Элементы группы узлов сети"
 msgid "Host group label type"
 msgstr "Тип подписи к группе узлов сети"
 
+#: app/controllers/CControllerHostGroupUpdate.php:97
+msgid "Host group updated"
+msgstr ""
+
 #: include/classes/api/services/CDashboardGeneral.php:560
 #: include/classes/api/services/CScript.php:814
 #: include/classes/api/services/CSettings.php:247
@@ -8336,6 +8480,10 @@ msgstr "Имя узла сети"
 msgid "Host networks"
 msgstr "Сети узла сети"
 
+#: app/views/administration.usergroup.edit.php:274
+msgid "Host permissions"
+msgstr ""
+
 #: app/controllers/CControllerAuditLogList.php:221
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
@@ -9745,6 +9893,11 @@ msgstr "Некорректное значение для поля \"%1$s\": %2$s
 msgid "Increase by"
 msgstr "Увеличение на"
 
+#: app/views/popup.acknowledge.edit.php:90 include/actions.inc.php:1774
+#: include/actions.inc.php:2216 include/html.inc.php:978
+msgid "Indefinitely"
+msgstr ""
+
 #: app/views/popup.tophosts.column.edit.php:152
 msgid "Indicators"
 msgstr ""
@@ -10492,10 +10645,18 @@ msgstr[2] "Элементы данных активированы"
 msgid "Item in \"not supported\" state"
 msgstr "Элемент данных в \"неподдерживаемом\" состоянии"
 
+#: include/classes/widgets/views/js/widget.svggraph.form.view.js.php:268
+msgid "Item list"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:1564
 msgid "Item not selected"
 msgstr "Элемент данных не выбран"
 
+#: include/classes/widgets/views/js/widget.svggraph.form.view.js.php:262
+msgid "Item pattern"
+msgstr ""
+
 #: include/classes/api/services/CItemGeneral.php:1254
 #, c-format
 msgid "Item pre-processing is missing parameters: %1$s"
@@ -10954,6 +11115,13 @@ msgstr "Последняя проверка"
 msgid "Last hour graph"
 msgstr "График за последний час"
 
+#: include/classes/widgets/CWidgetHelper.php:943
+#: include/classes/widgets/CWidgetHelper.php:1019
+#: include/classes/widgets/CWidgetHelper.php:1373
+msgctxt "missing data function"
+msgid "Last known"
+msgstr ""
+
 #: jsLoader.php:378
 msgid "Last month graph"
 msgstr "График за последний месяц"
@@ -11493,6 +11661,15 @@ msgstr "Действие вручную над событиями"
 msgid "Manual host action"
 msgstr "Действие вручную над узлом сети"
 
+#: app/views/popup.acknowledge.edit.php:83
+msgid "Manual problem suppression. Date-time input accepts relative and absolute time format."
+msgstr ""
+
+#: include/html.inc.php:1009
+#, c-format
+msgid "Manually by: %1$s"
+msgstr ""
+
 #: include/actions.inc.php:2070
 msgid "Manually closed"
 msgstr "Закрыт вручную"
@@ -12527,6 +12704,11 @@ msgstr ""
 msgid "New host"
 msgstr "Новый узел сети"
 
+#: app/views/configuration.hostgroup.edit.php:52
+#: app/views/popup.hostgroup.edit.php:59
+msgid "New host group"
+msgstr ""
+
 #: app/controllers/CControllerPopupLldOperation.php:351
 msgid "New operation"
 msgstr "Новая операция"
@@ -12547,6 +12729,11 @@ msgstr "Новая услуга"
 msgid "New tag name"
 msgstr "Имя нового тега"
 
+#: app/views/configuration.templategroup.edit.php:52
+#: app/views/popup.templategroup.edit.php:59
+msgid "New template group"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:187
 msgid "New triggers"
 msgstr "Новые триггера"
@@ -12746,6 +12933,10 @@ msgstr "Интерфейсы не заданы."
 msgid "No inventory mode specified for action operation."
 msgstr "Не указан режим инвентарных данных для операции действия."
 
+#: include/classes/widgets/CWidgetHelper.php:1240
+msgid "No item selected."
+msgstr ""
+
 #: include/items.inc.php:742
 #, c-format
 msgid "No item with item ID \"%1$s\"."
@@ -13140,6 +13331,12 @@ msgstr "Отображены не все результаты. Пожалуйс�
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "Не все шаблоны присоединены к \"%1$s\"."
 
+#: include/classes/api/services/CHostBase.php:1639
+#: include/classes/api/services/CUserMacro.php:569
+#, c-format
+msgid "Not allowed to modify automatic user macro \"%1$s\"."
+msgstr ""
+
 #: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "Нет прав доступа, чтобы задать язык пользователю \"guest\"."
@@ -13222,6 +13419,10 @@ msgstr "Количество CPU. Возвращает целое число"
 msgid "Number of available DS paths, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - Datastore name, <partitionid> - internal id of physical device from vmware.hv.datastore.discovery"
 msgstr "Количество доступных путей к хранилищу данных, <url> - URL службы VMware, <uuid> - имя хоста гипервизора VMware, <хранилище данных> - имя хранилища данных, <id раздела> - внутренний id физического устройства с vmware.hv.datastore.discovery"
 
+#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:463
+msgid "Number of columns"
+msgstr ""
+
 #: include/classes/data/CItemData.php:882
 msgid "Number of currently open file descriptors. Returns integer"
 msgstr "Количество открытых файловых дескрипторов в данный момент. Возвращается целое число"
@@ -14075,6 +14276,11 @@ msgstr "Параметр"
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Параметр \"%1$s\" устарел."
 
+#: include/classes/api/services/CTemplateGroup.php:1226
+#, c-format
+msgid "Parameter \"%1$s\" must be enabled."
+msgstr ""
+
 #: app/views/administration.mediatype.edit.php:213
 #: app/views/administration.script.edit.php:181
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1261
@@ -14626,6 +14832,10 @@ msgstr "Восстановление проблемы"
 msgid "Problem resolved"
 msgstr "Проблема решена"
 
+#: app/views/administration.usergroup.edit.php:275
+msgid "Problem tag filter"
+msgstr ""
+
 #: app/views/popup.service.edit.php:59 app/views/popup.service.edit.php:269
 #: app/views/popup.services.php:62
 msgid "Problem tags"
@@ -15240,6 +15450,12 @@ msgstr "Удаленная команда"
 msgid "Remove"
 msgstr "Удалить"
 
+#: app/partials/hostmacros.inherited.list.html.php:116
+#: app/partials/hostmacros.inherited.list.html.php:121
+msgctxt "verb"
+msgid "Remove"
+msgstr ""
+
 #: app/partials/massupdate.macros.tab.php:127
 #: app/partials/massupdate.valuemaps.tab.php:98
 msgid "Remove all"
@@ -15636,6 +15852,11 @@ msgstr "Возвращает количество UDP сокетов, котор
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr "Возвращает процент потерянных ICMP ping пакетов."
 
+#: app/partials/hostmacros.inherited.list.html.php:105
+#: app/partials/hostmacros.list.html.php:77 jsLoader.php:331
+msgid "Revert"
+msgstr ""
+
 #: include/classes/html/CMacroValue.php:94
 msgid "Revert changes"
 msgstr "Отменить изменения"
@@ -16886,6 +17107,10 @@ msgstr "Прототип простого графика"
 msgid "Simple graphs"
 msgstr ""
 
+#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:168
+msgid "Simple triggers"
+msgstr ""
+
 #: include/views/configuration.trigger.prototype.edit.php:507
 #: include/views/configuration.triggers.edit.php:536
 msgid "Single"
@@ -17414,6 +17639,23 @@ msgstr "Поддерживаемые макросы:"
 msgid "Supported macros:"
 msgstr "Поддерживаемые макросы:"
 
+#: app/controllers/CControllerPopupAcknowledgeCreate.php:101
+#: app/views/popup.acknowledge.edit.php:82
+msgid "Suppress"
+msgstr ""
+
+#: include/classes/helpers/CRoleHelper.php:471
+msgid "Suppress problems"
+msgstr ""
+
+#: include/actions.inc.php:1761
+msgid "Suppress until"
+msgstr ""
+
+#: include/actions.inc.php:1771 include/classes/screens/CScreenProblem.php:1259
+msgid "Suppressed"
+msgstr ""
+
 #: include/html.inc.php:973
 #, c-format
 msgid "Suppressed till: %1$s"
@@ -17680,6 +17922,11 @@ msgstr "Шаблон \"%1$s\" уже существует."
 msgid "Template \"%1$s\" cannot be without host group."
 msgstr "Шаблон \"%1$s\" не может быть без группы узлов сети."
 
+#: include/classes/api/services/CTemplateGroup.php:942
+#, c-format
+msgid "Template \"%1$s\" cannot be without template group."
+msgstr ""
+
 #: include/classes/import/importers/CHostImporter.php:54
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
@@ -17713,6 +17960,49 @@ msgstr "Шаблон удален"
 msgid "Template group"
 msgstr "Группа шаблона"
 
+#: include/classes/api/services/CTemplateGroup.php:540
+#, c-format
+msgid "Template group \"%1$s\" already exists."
+msgstr ""
+
+#: app/controllers/CControllerTemplateGroupCreate.php:62
+msgid "Template group added"
+msgstr ""
+
+#: app/controllers/CControllerTemplateGroupDelete.php:60
+msgid "Template group deleted"
+msgid_plural "Template groups deleted"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: app/controllers/CControllerTemplateGroupUpdate.php:86
+msgid "Template group updated"
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:487
+#, c-format
+msgid "Template group with ID \"%1$s\" is not available."
+msgstr ""
+
+#: app/controllers/CControllerPopupGeneric.php:197
+#: app/controllers/CControllerPopupImportCompare.php:168
+#: app/controllers/CControllerUsergroupTemplateGrouprightAdd.php:36
+#: app/partials/configuration.filter.items.php:58
+#: app/views/configuration.templategroup.list.php:30
+#: app/views/popup.import.php:29 app/views/popup.massupdate.template.php:84
+#: app/views/search.php:410 include/classes/helpers/CMenuHelper.php:170
+#: include/classes/helpers/CRoleHelper.php:406
+#: include/views/configuration.copy.elements.php:62
+#: include/views/configuration.graph.list.php:93
+#: include/views/configuration.host.discovery.list.php:69
+#: include/views/configuration.httpconf.list.php:31
+#: include/views/configuration.template.edit.php:148
+#: include/views/configuration.template.list.php:45
+#: include/views/configuration.triggers.list.php:33
+msgid "Template groups"
+msgstr ""
+
 #: app/views/popup.import.php:34
 msgid "Template linkage"
 msgstr "Соединения с шаблонами"
@@ -17725,6 +18015,10 @@ msgstr "Шаблонные макросы"
 msgid "Template name"
 msgstr "Имя шаблона"
 
+#: app/views/administration.usergroup.edit.php:273
+msgid "Template permissions"
+msgstr ""
+
 #: report2.php:396
 msgid "Template trigger"
 msgstr "Шаблонный триггер"
@@ -18640,6 +18934,10 @@ msgstr "Прототипы триггеров обновлены"
 msgid "Trigger severity"
 msgstr "Важность триггеров"
 
+#: app/views/popup.condition.common.php:228
+msgid "Trigger source"
+msgstr ""
+
 #: jsLoader.php:367
 msgid "Trigger status \"OK\""
 msgstr "Состояние триггера \"ОК\""
@@ -18960,6 +19258,10 @@ msgstr "Разблокировать"
 msgid "Unblock selected users?"
 msgstr "Разблокировать выбранных пользователей?"
 
+#: app/views/popup.acknowledge.edit.php:125
+msgid "Undo problem acknowledgement."
+msgstr ""
+
 #: include/classes/core/ZBase.php:574
 #, c-format
 msgid "Unexpected response for action %1$s."
@@ -19128,6 +19430,25 @@ msgstr "Неподдерживаемый параметр \"%2$s\" для пра
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"."
 
+#: app/views/popup.acknowledge.edit.php:102
+msgid "Unsuppress"
+msgstr ""
+
+#: include/actions.inc.php:1785 include/actions.inc.php:2235
+#: include/classes/screens/CScreenProblem.php:1262
+msgid "Unsuppressed"
+msgstr ""
+
+#: app/views/monitoring.widget.problems.view.php:174 include/blocks.inc.php:668
+#: include/classes/screens/CScreenProblem.php:1026
+#, c-format
+msgid "Unsuppressed by: %1$s"
+msgstr ""
+
+#: app/views/popup.acknowledge.edit.php:91
+msgid "Until"
+msgstr ""
+
 #: app/controllers/CControllerPopupTabFilterEdit.php:98
 #: include/classes/services/CTabFilterProfile.php:95
 msgid "Untitled"
@@ -20742,6 +21063,10 @@ msgstr "Вы не выполнили вход"
 msgid "You cannot switch hosts for current selection."
 msgstr "Вы не можете переключить узлы сети для текущего выбора."
 
+#: app/views/popup.generic.php:88
+msgid "You cannot switch templates for current selection."
+msgstr ""
+
 #: include/classes/api/services/CAuditLog.php:73
 #: include/classes/api/services/CHaNode.php:45
 #: include/classes/api/services/CHost.php:848
@@ -21877,11 +22202,19 @@ msgstr "ошибочный седьмой параметр в функции \"%
 msgid "invalid sixth parameter in function \"%1$s\""
 msgstr "ошибочный шестой параметр в функции \"%1$s\""
 
+#: include/classes/validators/CApiInputValidator.php:3078
+msgid "invalid template group name"
+msgstr ""
+
 #: include/classes/validators/CHistFunctionValidator.php:65
 #, c-format
 msgid "invalid third parameter in function \"%1$s\""
 msgstr "недопустимый третий параметр в функции \"%1$s\""
 
+#: app/controllers/CControllerPopupAcknowledgeCreate.php:101
+msgid "invalid time"
+msgstr ""
+
 #: app/controllers/CControllerWidgetTopHostsView.php:422
 #: include/classes/graphdraw/CLineGraphDraw.php:250
 #: include/classes/graphdraw/CPieGraphDraw.php:176
@@ -22238,10 +22571,18 @@ msgstr "нет прав закрывать проблемы"
 msgid "no permissions to create and edit maps"
 msgstr "нет прав создавать и редактировать карты"
 
+#: include/classes/api/services/CEvent.php:863
+msgid "no permissions to suppress problems"
+msgstr ""
+
 #: include/classes/api/services/CEvent.php:774
 msgid "no permissions to unacknowledge problems"
 msgstr "нет прав отменять подтверждение проблем"
 
+#: include/classes/api/services/CEvent.php:864
+msgid "no permissions to unsuppress problems"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:836
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr "nodata() - Отсутствие данных полученных за период времени T (1 - правда, 0 - ложь), Режим (strict - игнорировать задержку прокси при отправке данных)"