diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4a39de8694..b27a003338 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-28  Jorge Gonzalez  <jorgegonz@artica.es>
+
+	* include/functions.php, operation/agentes/sla_view.php,
+	  operation/agentes/ver_agente.php,
+	  operation/reporting/reporting_xml.php,
+	  operation/reporting/reporting_viewer.php: Fixed typo.
+
+	* include/languages/index.pot: Updated PO template.
+
+	* include/languages/pt_BR.po, include/languages/es.po,
+	  include/languages/pt_BR.mo, include/languages/es.mo: Updated
+	  translations.
+
 2009-01-28  Esteban Sanchez  <estebans@artica.es>
 
 	* godmode/alerts/configure_alert_template.php: Removed a javascript
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 065da40964..5f1883ae47 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -706,7 +706,7 @@ function get_report_types () {
 	$types = array ();
 	$types['simple_graph'] = __('Simple graph');
 	$types['custom_graph'] = __('Custom graph');
-	$types['SLA'] = __('S.L.A');
+	$types['SLA'] = __('S.L.A.');
 	$types['event_report'] = __('Event report');
 	$types['alert_report'] = __('Alert report');
 	$types['monitor_report'] = __('Monitor report');
diff --git a/pandora_console/include/languages/es.mo b/pandora_console/include/languages/es.mo
index 2afb4b826d..d2c44381a4 100644
Binary files a/pandora_console/include/languages/es.mo and b/pandora_console/include/languages/es.mo differ
diff --git a/pandora_console/include/languages/es.po b/pandora_console/include/languages/es.po
index a4dd18d768..323600c55b 100644
--- a/pandora_console/include/languages/es.po
+++ b/pandora_console/include/languages/es.po
@@ -1,267 +1,217 @@
-# translation of es.po to Español
+# translation of index.es.po to Español
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Jorge Gonzalez <jorge.gonzalez@artica.es>, 2009.
-# Jorge González <jorgegonz@svn.gnome.org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
+"Project-Id-Version: index.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:50+0100\n"
-"PO-Revision-Date: 2009-01-22 13:20+0100\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2009-01-28 12:16+0100\n"
+"PO-Revision-Date: 2009-01-28 12:22+0100\n"
+"Last-Translator: Jorge Gonzalez <jorge.gonzalez@artica.es>\n"
+"Language-Team: Español <artica@artica.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../reporting/stat_win.php:46
+#: ../../reporting/stat_win.php:103
 #: ../../operation/agentes/datos_agente.php:100
 msgid "There was a problem locating the source of the graph"
 msgstr "Hubo un problema al localizar la fuente del gráfico"
 
-#: ../../reporting/stat_win.php:53 ../../reporting/stat_win.php:218
-#: ../../godmode/reporting/graph_builder.php:329
-#: ../../godmode/reporting/graph_builder.php:385
-#: ../../godmode/reporting/reporting_builder.php:392
-#: ../../include/functions_custom_graphs.php:101
-msgid "1 hour"
-msgstr "1 hora"
-
-#: ../../reporting/stat_win.php:55 ../../reporting/stat_win.php:219
-#: ../../godmode/reporting/graph_builder.php:332
-#: ../../godmode/reporting/graph_builder.php:386
-msgid "2 hours"
-msgstr "2 horas"
-
-#: ../../reporting/stat_win.php:57 ../../reporting/stat_win.php:220
-#: ../../godmode/reporting/graph_builder.php:338
-#: ../../godmode/reporting/graph_builder.php:388
-msgid "6 hours"
-msgstr "6 horas"
-
-#: ../../reporting/stat_win.php:59 ../../reporting/stat_win.php:221
-#: ../../godmode/reporting/graph_builder.php:341
-#: ../../godmode/reporting/graph_builder.php:389
-msgid "12 hours"
-msgstr "12 horas"
-
-#: ../../reporting/stat_win.php:61 ../../reporting/stat_win.php:222
-#: ../../godmode/reporting/graph_builder.php:344
-#: ../../godmode/reporting/graph_builder.php:371
-#: ../../godmode/reporting/reporting_builder.php:397
-#: ../../include/functions_custom_graphs.php:106
-msgid "1 day"
-msgstr "1 día"
-
-#: ../../reporting/stat_win.php:63 ../../reporting/stat_win.php:223
-#: ../../godmode/reporting/graph_builder.php:347
-#: ../../godmode/reporting/graph_builder.php:391
-#: ../../godmode/reporting/reporting_builder.php:398
-#: ../../include/functions_custom_graphs.php:107
-msgid "2 days"
-msgstr "2 días"
-
-#: ../../reporting/stat_win.php:65 ../../reporting/stat_win.php:224
-msgid "5 days"
-msgstr "5 días"
-
-#: ../../reporting/stat_win.php:67 ../../reporting/stat_win.php:225
-#: ../../godmode/reporting/reporting_builder.php:399
-#: ../../include/functions_custom_graphs.php:108
-msgid "1 week"
-msgstr "1 semana"
-
-#: ../../reporting/stat_win.php:69 ../../reporting/stat_win.php:226
-#: ../../godmode/reporting/map_builder.php:367
-#: ../../godmode/reporting/graph_builder.php:356
-#: ../../godmode/reporting/graph_builder.php:393
-msgid "15 days"
-msgstr "15 días"
-
-#: ../../reporting/stat_win.php:71 ../../reporting/stat_win.php:227
-#: ../../godmode/reporting/reporting_builder.php:401
-#: ../../include/functions_custom_graphs.php:109
-msgid "1 month"
-msgstr "1 mes"
-
-#: ../../reporting/stat_win.php:73 ../../reporting/stat_win.php:228
-#: ../../godmode/reporting/graph_builder.php:362
-#: ../../godmode/reporting/graph_builder.php:395
-msgid "2 months"
-msgstr "2 meses"
-
-#: ../../reporting/stat_win.php:75 ../../reporting/stat_win.php:229
-#: ../../godmode/reporting/graph_builder.php:365
-#: ../../godmode/reporting/graph_builder.php:396
-#: ../../godmode/reporting/reporting_builder.php:402
-#: ../../include/functions_custom_graphs.php:110
-msgid "6 months"
-msgstr "6 meses"
-
-#: ../../reporting/stat_win.php:114
-#: ../../godmode/agentes/module_manager_editor_wmi.php:217
-#: ../../godmode/agentes/module_manager_editor_data.php:147
-#: ../../godmode/agentes/module_manager_editor_plugin.php:186
+#: ../../reporting/stat_win.php:138
+#: ../../godmode/agentes/module_manager_editor_wmi.php:223
+#: ../../godmode/agentes/module_manager_editor_data.php:153
+#: ../../godmode/agentes/module_manager_editor_data.php:186
+#: ../../godmode/agentes/module_manager_editor_plugin.php:217
 #: ../../godmode/agentes/module_manager_editor_network.php:245
-#: ../../godmode/agentes/alert_manager_editor.php:123
-#: ../../godmode/alerts/alert_templates.php:59 ../../include/functions.php:906
+#: ../../include/functions.php:714
 #: ../../enterprise/include/functions_reporting_pdf.php:269
 #: ../../operation/reporting/reporting_viewer.php:319
-#: ../../operation/reporting/reporting_xml.php:252
+#: ../../operation/reporting/reporting_xml.php:248
 msgid "Max. Value"
 msgstr "Valor máximo"
 
-#: ../../reporting/stat_win.php:116 ../../include/functions.php:905
+#: ../../reporting/stat_win.php:139 ../../include/functions.php:713
 #: ../../enterprise/include/functions_reporting_pdf.php:261
 #: ../../operation/reporting/reporting_viewer.php:304
-#: ../../operation/reporting/reporting_xml.php:247
+#: ../../operation/reporting/reporting_xml.php:243
 msgid "Avg. Value"
 msgstr "Valor promedio"
 
-#: ../../reporting/stat_win.php:118
-#: ../../godmode/agentes/module_manager_editor_wmi.php:215
-#: ../../godmode/agentes/module_manager_editor_data.php:144
-#: ../../godmode/agentes/module_manager_editor_plugin.php:184
+#: ../../reporting/stat_win.php:140
+#: ../../godmode/agentes/module_manager_editor_wmi.php:221
+#: ../../godmode/agentes/module_manager_editor_data.php:150
+#: ../../godmode/agentes/module_manager_editor_data.php:184
+#: ../../godmode/agentes/module_manager_editor_plugin.php:215
 #: ../../godmode/agentes/module_manager_editor_network.php:243
-#: ../../godmode/agentes/alert_manager_editor.php:118
-#: ../../godmode/alerts/alert_templates.php:67 ../../include/functions.php:907
+#: ../../include/functions.php:715
 #: ../../enterprise/include/functions_reporting_pdf.php:277
 #: ../../operation/reporting/reporting_viewer.php:334
-#: ../../operation/reporting/reporting_xml.php:257
+#: ../../operation/reporting/reporting_xml.php:253
 msgid "Min. Value"
 msgstr "Valor mínimo"
 
-#: ../../reporting/stat_win.php:187
+#: ../../reporting/stat_win.php:144
+msgid "Pandora FMS Graph configuration menu"
+msgstr "Menú de configuración de gráficos"
+
+#: ../../reporting/stat_win.php:144
+msgid "Please, make your changes and apply with the <i>Reload</i> button"
+msgstr "Haga sus cambios y aplíquelos con el botón <i>Recargar</i>."
+
+#: ../../reporting/stat_win.php:154
 msgid "Refresh time"
 msgstr "Tiempo de actualización"
 
-#: ../../reporting/stat_win.php:191
+#: ../../reporting/stat_win.php:158
 msgid "Avg. Only"
 msgstr "Sólo la media"
 
-#: ../../reporting/stat_win.php:198
+#: ../../reporting/stat_win.php:162
 msgid "Begin date"
 msgstr "Fecha de inicio"
 
-#: ../../reporting/stat_win.php:203
+#: ../../reporting/stat_win.php:167
 msgid "Zoom factor"
 msgstr "Factor de ampliación"
 
-#: ../../reporting/stat_win.php:214
+#: ../../reporting/stat_win.php:179
 msgid "Time range"
 msgstr "Rango de tiempo"
 
-#: ../../reporting/stat_win.php:233
+#: ../../reporting/stat_win.php:197
 msgid "Show events"
 msgstr "Mostrar eventos"
 
-#: ../../reporting/stat_win.php:242
-msgid "Show alert"
-msgstr "Mostrar alerta"
+#: ../../reporting/stat_win.php:201
+msgid "Show alerts"
+msgstr "Mostrar alertas"
 
-#: ../../reporting/fgraph.php:946
+#: ../../reporting/fgraph.php:958
 msgid "Data occurrence for module "
 msgstr "Ocurrencias de los datos para el módulo "
 
-#: ../../reporting/fgraph.php:1038 ../../include/functions_incidents.php:26
+#: ../../reporting/fgraph.php:1043 ../../include/functions_incidents.php:26
 msgid "Informative"
 msgstr "Informativo"
 
-#: ../../reporting/fgraph.php:1039 ../../include/functions_incidents.php:27
+#: ../../reporting/fgraph.php:1044 ../../include/functions_incidents.php:27
 msgid "Low"
 msgstr "Bajo"
 
-#: ../../reporting/fgraph.php:1040 ../../include/functions_incidents.php:28
+#: ../../reporting/fgraph.php:1045 ../../include/functions_incidents.php:28
 msgid "Medium"
 msgstr "Medio"
 
-#: ../../reporting/fgraph.php:1041 ../../include/functions_incidents.php:29
+#: ../../reporting/fgraph.php:1046 ../../include/functions_incidents.php:29
 msgid "Serious"
 msgstr "Grave"
 
-#: ../../reporting/fgraph.php:1042 ../../include/functions_incidents.php:30
+#: ../../reporting/fgraph.php:1047 ../../include/functions_incidents.php:30
 msgid "Very serious"
 msgstr "Muy grave"
 
-#: ../../reporting/fgraph.php:1043 ../../reporting/fgraph.php:1259
+#: ../../reporting/fgraph.php:1048 ../../reporting/fgraph.php:1187
 #: ../../include/functions_incidents.php:31 ../../include/functions.php:617
-#: ../../include/functions.php:1058 ../../include/functions.php:1077
+#: ../../include/functions.php:866 ../../include/functions.php:885
 msgid "Maintenance"
 msgstr "Mantenimiento"
 
-#: ../../reporting/fgraph.php:1267 ../../include/functions.php:620
-#: ../../include/functions.php:1059 ../../include/functions.php:1079
+#: ../../reporting/fgraph.php:1095 ../../reporting/fgraph.php:1121
+#: ../../reporting/fgraph.php:1162 ../../reporting/fgraph.php:1284
+msgid "Other"
+msgstr "Otro"
+
+#: ../../reporting/fgraph.php:1098 ../../include/functions_alerts.php:253
+#: ../../include/functions.php:734 ../../include/functions.php:845
+#: ../../include/functions_db.php:1170
+#: ../../enterprise/extensions/cron/functions.php:42
+#: ../../enterprise/include/functions_reporting_pdf.php:187
+#: ../../operation/reporting/reporting_viewer.php:225
+#: ../../operation/reporting/reporting_xml.php:208
+#: ../../operation/agentes/status_monitor.php:74
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../../reporting/fgraph.php:1165 ../../reporting/fgraph.php:1287
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+#: ../../reporting/fgraph.php:1195 ../../include/functions.php:620
+#: ../../include/functions.php:867 ../../include/functions.php:887
 msgid "Informational"
 msgstr "Informativo"
 
-#: ../../reporting/fgraph.php:1274 ../../include/functions.php:623
-#: ../../include/functions.php:1060 ../../include/functions.php:1081
+#: ../../reporting/fgraph.php:1202 ../../include/functions.php:623
+#: ../../include/functions.php:868 ../../include/functions.php:889
+#: ../../operation/agentes/status_monitor.php:71
 #: ../../operation/agentes/estado_grupo.php:223
 msgid "Normal"
 msgstr "Normal"
 
-#: ../../reporting/fgraph.php:1281 ../../include/functions.php:626
-#: ../../include/functions.php:1061 ../../include/functions.php:1083
+#: ../../reporting/fgraph.php:1209 ../../include/functions.php:626
+#: ../../include/functions.php:869 ../../include/functions.php:891
+#: ../../operation/agentes/status_monitor.php:72
 #: ../../operation/agentes/estado_grupo.php:225
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../../reporting/fgraph.php:1288 ../../include/functions.php:629
-#: ../../include/functions.php:1062 ../../include/functions.php:1085
+#: ../../reporting/fgraph.php:1216 ../../include/functions.php:629
+#: ../../include/functions.php:870 ../../include/functions.php:893
+#: ../../operation/agentes/status_monitor.php:73
 #: ../../operation/agentes/estado_grupo.php:227
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../../reporting/fgraph.php:1467
+#: ../../reporting/fgraph.php:1385
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../reporting/fgraph.php:1468
+#: ../../reporting/fgraph.php:1386
 msgid "Week"
 msgstr "Semana"
 
-#: ../../reporting/fgraph.php:1469
+#: ../../reporting/fgraph.php:1387
 msgid "Month"
 msgstr "Mes"
 
-#: ../../reporting/fgraph.php:1470
+#: ../../reporting/fgraph.php:1388
 msgid "Months"
 msgstr "Meses"
 
-#: ../../reporting/fgraph.php:1471
+#: ../../reporting/fgraph.php:1389
 msgid "Older"
 msgstr "Más antiguo"
 
-#: ../../reporting/fgraph.php:1511
+#: ../../reporting/fgraph.php:1429
 msgid "no data"
 msgstr "sin datos"
 
-#: ../../reporting/fgraph.php:1578
+#: ../../reporting/fgraph.php:1496
 msgid "Out of limits"
 msgstr "Fuera de límites"
 
-#: ../../reporting/fgraph.php:2139 ../../include/functions_reporting.php:395
+#: ../../reporting/fgraph.php:2057 ../../include/functions_reporting.php:380
 #: ../../enterprise/include/functions_reporting_pdf.php:235
 #: ../../operation/agentes/estado_grupo.php:175
-#: ../../operation/agentes/ver_agente.php:108
-#: ../../operation/agentes/tactical.php:133
-#: ../../operation/agentes/tactical.php:173
+#: ../../operation/agentes/ver_agente.php:116
+#: ../../operation/agentes/tactical.php:126
 msgid "Alerts fired"
 msgstr "Alertas disparadas"
 
-#: ../../reporting/fgraph.php:2140
+#: ../../reporting/fgraph.php:2058
 msgid "Alerts not fired"
 msgstr "Alertas no disparadas"
 
-#: ../../reporting/fgraph.php:2149
+#: ../../reporting/fgraph.php:2067
 msgid "Monitors BAD"
 msgstr "Monitores en mal estado"
 
-#: ../../reporting/fgraph.php:2150
+#: ../../reporting/fgraph.php:2068
 msgid "Monitors OK"
 msgstr "Monitores en buen estado"
 
@@ -303,13 +253,11 @@ msgstr "Iniciar sesión"
 
 #: ../../general/login_page.php:66
 #: ../../godmode/servers/manage_export_form.php:107
-#: ../../godmode/agentes/module_manager_editor_wmi.php:166
-#: ../../godmode/agentes/module_manager_editor_plugin.php:138
+#: ../../godmode/agentes/module_manager_editor_wmi.php:172
+#: ../../godmode/agentes/module_manager_editor_plugin.php:144
 #: ../../godmode/modules/manage_network_components_form_wmi.php:182
-#: ../../godmode/users/configure_user.php:184
+#: ../../godmode/users/configure_user.php:144
 #: ../../enterprise/godmode/agentes/inventory_manager.php:126
-#: ../../operation/users/user_edit.php:115
-#: ../../operation/users/user_edit.php:119
 msgid "Password"
 msgstr "Contraseña"
 
@@ -342,7 +290,6 @@ msgid "Links"
 msgstr "Enlaces"
 
 #: ../../general/main_menu.php:98
-#: ../../godmode/agentes/alert_manager_editor.php:343
 msgid "Operation"
 msgstr "Operación"
 
@@ -366,11 +313,11 @@ msgstr ""
 "intentos de acceso a esta página son grabados en los registros de seguridad "
 "de Pandora FMS."
 
-#: ../../general/logon_ok.php:30
+#: ../../general/logon_ok.php:33
 msgid "Welcome to Pandora FMS Web Console"
 msgstr "Bienvenido a la consola web de Pandora FMS"
 
-#: ../../general/logon_ok.php:32
+#: ../../general/logon_ok.php:35
 msgid ""
 "This is the Web Management System for Pandora FMS. From here you can manage "
 "its agents, alerts and incidents. Session is open while activity exists."
@@ -379,154 +326,143 @@ msgstr ""
 "gestionar sus agentes, alertas e incidentes. La sesión permanecerá abierta "
 "mientras exista actividad."
 
-#: ../../general/logon_ok.php:40 ../../operation/messages/message.php:179
+#: ../../general/logon_ok.php:43 ../../operation/messages/message.php:179
 msgid "You have "
 msgstr "Tiene "
 
-#: ../../general/logon_ok.php:41 ../../operation/messages/message.php:179
+#: ../../general/logon_ok.php:44 ../../operation/messages/message.php:179
 msgid " unread message(s)."
 msgstr " mensaje(s) sin leer."
 
-#: ../../general/logon_ok.php:47 ../../godmode/menu.php:150
+#: ../../general/logon_ok.php:50 ../../godmode/menu.php:150
 msgid "Site news"
 msgstr "Noticias del sistema"
 
-#: ../../general/logon_ok.php:54
+#: ../../general/logon_ok.php:57
 msgid "by"
 msgstr "por"
 
-#: ../../general/logon_ok.php:54
+#: ../../general/logon_ok.php:57
 msgid "at"
 msgstr "el"
 
-#: ../../general/logon_ok.php:61
+#: ../../general/logon_ok.php:64
 msgid "No news articles at this moment"
 msgstr "En estos momentos no hay artículos de noticias "
 
-#: ../../general/logon_ok.php:76 ../../include/functions.php:910
+#: ../../general/logon_ok.php:79 ../../include/functions.php:718
 #: ../../enterprise/include/functions_reporting_pdf.php:301
 #: ../../enterprise/dashboard/widgets/monitor_health.php:71
 #: ../../operation/reporting/reporting_viewer.php:377
-#: ../../operation/reporting/reporting_xml.php:274
+#: ../../operation/reporting/reporting_xml.php:270
 #: ../../operation/agentes/tactical.php:67
 msgid "Monitor health"
 msgstr "Estado de los monitores"
 
-#: ../../general/logon_ok.php:77 ../../operation/agentes/tactical.php:70
+#: ../../general/logon_ok.php:80 ../../operation/agentes/tactical.php:70
 msgid "of monitors up"
 msgstr "de monitores funcionando"
 
-#: ../../general/logon_ok.php:79
-#: ../../enterprise/dashboard/widgets/monitor_health.php:73
-#: ../../operation/agentes/tactical.php:73
-msgid "Data health"
-msgstr "Estado de los datos"
-
-#: ../../general/logon_ok.php:80 ../../operation/agentes/tactical.php:76
-msgid "of data modules up"
-msgstr "de módulos de datos funcionando"
-
 #: ../../general/logon_ok.php:82
-#: ../../enterprise/dashboard/widgets/monitor_health.php:16
-#: ../../enterprise/dashboard/widgets/monitor_health.php:75
-#: ../../operation/agentes/tactical.php:79
-msgid "Global health"
-msgstr "Salud global"
-
-#: ../../general/logon_ok.php:83 ../../operation/agentes/tactical.php:82
-msgid "of total modules up"
-msgstr "del total de módulos funcionando"
-
-#: ../../general/logon_ok.php:85
 #: ../../enterprise/dashboard/widgets/monitor_health.php:77
-#: ../../operation/agentes/tactical.php:85
+#: ../../operation/agentes/tactical.php:73
 msgid "Module sanity"
 msgstr "Salud de los módulos"
 
-#: ../../general/logon_ok.php:86 ../../operation/agentes/tactical.php:88
+#: ../../general/logon_ok.php:83 ../../operation/agentes/tactical.php:76
 msgid "of total modules inited"
 msgstr "del total de módulos inic."
 
-#: ../../general/logon_ok.php:88
+#: ../../general/logon_ok.php:85
 #: ../../enterprise/dashboard/widgets/monitor_health.php:79
-#: ../../operation/agentes/tactical.php:91
+#: ../../operation/agentes/tactical.php:79
 msgid "Alert level"
 msgstr "Nivel de alerta"
 
-#: ../../general/logon_ok.php:89 ../../operation/agentes/tactical.php:94
+#: ../../general/logon_ok.php:86 ../../operation/agentes/tactical.php:82
 msgid "of defined alerts not fired"
 msgstr "de alertas definidas no disparadas"
 
-#: ../../general/logon_ok.php:95
+#: ../../general/logon_ok.php:92
 msgid "Pandora FMS Overview"
 msgstr "Visión general de Pandora FMS"
 
-#: ../../general/logon_ok.php:98
+#: ../../general/logon_ok.php:95
 msgid "Total agents"
 msgstr "Agentes totales"
 
-#: ../../general/logon_ok.php:103
+#: ../../general/logon_ok.php:100
 msgid "Total checks"
 msgstr "Comprobaciones totales"
 
-#: ../../general/logon_ok.php:108
-msgid "Modules Down"
-msgstr "Módulos caídos"
+#: ../../general/logon_ok.php:105 ../../operation/agentes/estado_grupo.php:162
+msgid "Modules critical"
+msgstr "Módulos críticos"
 
-#: ../../general/logon_ok.php:113 ../../operation/agentes/tactical.php:128
-#: ../../operation/agentes/tactical.php:168
+#: ../../general/logon_ok.php:110 ../../operation/agentes/estado_grupo.php:170
+msgid "Modules warning"
+msgstr "Módulos en advertencia"
+
+#: ../../general/logon_ok.php:115 ../../operation/agentes/estado_grupo.php:166
+msgid "Modules normal"
+msgstr "Módulos normales"
+
+#: ../../general/logon_ok.php:120
+msgid "Modules unknown"
+msgstr "Módulos en desconocido"
+
+#: ../../general/logon_ok.php:125 ../../operation/agentes/tactical.php:121
 msgid "Alerts defined"
 msgstr "Alertas definidas"
 
-#: ../../general/logon_ok.php:118
+#: ../../general/logon_ok.php:130
 msgid "Users defined"
 msgstr "Usuarios definidos"
 
-#: ../../general/logon_ok.php:137
+#: ../../general/logon_ok.php:149
 msgid "This is your last activity in Pandora FMS console"
 msgstr "Ésta es su última actividad en la consola de Pandora FMS"
 
-#: ../../general/logon_ok.php:145
+#: ../../general/logon_ok.php:157
 #: ../../godmode/servers/manage_export_form.php:103
 #: ../../godmode/admin_access_logs.php:88
 #: ../../enterprise/extensions/cron/main.php:85
 msgid "User"
 msgstr "Usuario"
 
-#: ../../general/logon_ok.php:146 ../../godmode/servers/manage_export.php:102
+#: ../../general/logon_ok.php:158 ../../godmode/servers/manage_export.php:102
 #: ../../godmode/servers/manage_recontask.php:100
-#: ../../godmode/snmpconsole/snmp_alert.php:292
+#: ../../godmode/snmpconsole/snmp_alert.php:293
 #: ../../godmode/admin_access_logs.php:52
 #: ../../godmode/admin_access_logs.php:89
 #: ../../godmode/agentes/agent_template.php:134
-#: ../../godmode/agentes/alert_manager.php:206
+#: ../../godmode/agentes/alert_manager.php:269
 #: ../../godmode/agentes/module_manager.php:83
-#: ../../godmode/agentes/alert_manager_editor.php:373
 #: ../../godmode/modules/manage_network_components.php:189
 #: ../../godmode/modules/manage_network_templates.php:54
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:82
 #: ../../operation/snmpconsole/snmp_view.php:224
 #: ../../operation/snmpconsole/snmp_view.php:390
-#: ../../operation/events/events.php:276 ../../operation/events/events.php:427
+#: ../../operation/events/events.php:277 ../../operation/events/events.php:428
 msgid "Action"
 msgstr "Acción"
 
-#: ../../general/logon_ok.php:147 ../../godmode/admin_access_logs.php:90
+#: ../../general/logon_ok.php:159 ../../godmode/admin_access_logs.php:90
 #: ../../operation/reporting/reporting_viewer.php:69
 msgid "Date"
 msgstr "Fecha"
 
-#: ../../general/logon_ok.php:148 ../../godmode/admin_access_logs.php:91
+#: ../../general/logon_ok.php:160 ../../godmode/admin_access_logs.php:91
 msgid "Source IP"
 msgstr "IP origen"
 
-#: ../../general/logon_ok.php:149
+#: ../../general/logon_ok.php:161
 #: ../../godmode/servers/manage_recontask_form.php:135
 #: ../../godmode/admin_access_logs.php:92
 #: ../../godmode/modules/manage_network_components_form_wmi.php:200
 #: ../../godmode/modules/manage_network_components_form_network.php:270
-#: ../../godmode/users/configure_user.php:209
-#: ../../operation/users/user_edit.php:129
+#: ../../godmode/users/configure_user.php:175
+#: ../../operation/users/user_edit.php:97
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -561,11 +497,45 @@ msgstr "servidor(es) caído(s)"
 msgid "Ready"
 msgstr "Listos"
 
-#: ../../general/header.php:70 ../../general/header.php:72
+#: ../../general/header.php:71 ../../general/header.php:75
 msgid "Autorefresh"
 msgstr "Autorefresco"
 
-#: ../../general/header.php:77 ../../operation/events/event_statistics.php:31
+#: ../../general/header.php:76 ../../general/header.php:77
+#: ../../general/header.php:78 ../../general/header.php:79
+#: ../../godmode/snmpconsole/snmp_alert.php:235
+#: ../../godmode/alerts/configure_alert_template.php:346
+#: ../../include/functions.php:492
+msgid "seconds"
+msgstr "segundos"
+
+#: ../../general/header.php:80
+msgid "minute"
+msgstr "minuto"
+
+#: ../../general/header.php:81 ../../general/header.php:82
+#: ../../general/header.php:83 ../../general/header.php:84
+#: ../../include/functions_alerts.php:511
+#: ../../include/functions_alerts.php:512
+#: ../../include/functions_alerts.php:513
+#: ../../include/functions_alerts.php:514 ../../include/functions.php:498
+#: ../../include/functions.php:500
+msgid "minutes"
+msgstr "minutos"
+
+#: ../../general/header.php:85
+#: ../../godmode/servers/manage_recontask_form.php:86
+#: ../../include/functions_alerts.php:515
+#: ../../enterprise/godmode/agentes/inventory_manager.php:114
+msgid "hour"
+msgstr "horas"
+
+#: ../../general/header.php:87
+#: ../../godmode/alerts/configure_alert_template.php:434
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../../general/header.php:93 ../../operation/events/event_statistics.php:31
 #: ../../operation/events/events.php:103
 msgid "Events"
 msgstr "Eventos"
@@ -589,11 +559,11 @@ msgstr ""
 "pueden ser revisados por cada usuario. Comunique al administrador cualquier "
 "incidente o fallo."
 
-#: ../../index.php:109
+#: ../../index.php:115
 msgid "the Flexible Monitoring System"
 msgstr "el Sistema Flexible de Monitorización"
 
-#: ../../index.php:231
+#: ../../index.php:247
 msgid "Sorry! I can't find the page!"
 msgstr "No se puede encontrar la página."
 
@@ -672,12 +642,12 @@ msgstr "ID"
 
 #: ../../extensions/update_manager/main.php:80
 #: ../../godmode/setup/news.php:121 ../../include/functions_events.php:210
-#: ../../include/functions_reporting.php:301
+#: ../../include/functions_reporting.php:280
 #: ../../operation/snmpconsole/snmp_view.php:217
-#: ../../operation/agentes/status_monitor.php:184
+#: ../../operation/agentes/status_monitor.php:211
 #: ../../operation/agentes/estado_ultimopaquete.php:59
 #: ../../operation/agentes/datos_agente.php:73
-#: ../../operation/events/events.php:273
+#: ../../operation/events/events.php:274
 #: ../../operation/messages/message.php:191
 msgid "Timestamp"
 msgstr "Fecha/Hora"
@@ -689,34 +659,31 @@ msgstr "Fecha/Hora"
 #: ../../godmode/servers/modificar_server.php:69
 #: ../../godmode/servers/modificar_server.php:87
 #: ../../godmode/servers/plugin.php:174
-#: ../../godmode/snmpconsole/snmp_alert.php:174
-#: ../../godmode/snmpconsole/snmp_alert.php:284
-#: ../../godmode/agentes/module_manager_editor_wmi.php:244
+#: ../../godmode/snmpconsole/snmp_alert.php:175
+#: ../../godmode/snmpconsole/snmp_alert.php:285
+#: ../../godmode/agentes/module_manager_editor_wmi.php:275
 #: ../../godmode/agentes/agent_template.php:133
-#: ../../godmode/agentes/module_manager_editor_data.php:178
+#: ../../godmode/agentes/module_manager_editor_data.php:217
 #: ../../godmode/agentes/planned_downtime.php:145
 #: ../../godmode/agentes/planned_downtime.php:268
-#: ../../godmode/agentes/module_manager_editor_plugin.php:213
+#: ../../godmode/agentes/module_manager_editor_plugin.php:244
 #: ../../godmode/agentes/module_manager_editor_prediction.php:159
-#: ../../godmode/agentes/module_manager_editor_network.php:311
+#: ../../godmode/agentes/module_manager_editor_network.php:312
 #: ../../godmode/agentes/modificar_agente.php:144
-#: ../../godmode/agentes/agent_manager.php:132
+#: ../../godmode/agentes/agent_manager.php:133
 #: ../../godmode/agentes/module_manager.php:81
-#: ../../godmode/agentes/alert_manager_editor.php:113
-#: ../../godmode/agentes/alert_manager_editor.php:371
 #: ../../godmode/modules/manage_network_components.php:185
 #: ../../godmode/modules/manage_network_templates.php:53
 #: ../../godmode/modules/manage_network_templates_form.php:107
 #: ../../godmode/modules/manage_network_templates_form.php:143
 #: ../../godmode/modules/module_list.php:57
-#: ../../godmode/users/user_list.php:70
+#: ../../godmode/users/user_list.php:56
 #: ../../godmode/alerts/configure_alert_command.php:56
-#: ../../godmode/alerts/alert_templates.php:73
-#: ../../godmode/alerts/alert_templates.php:166
-#: ../../godmode/alerts/configure_alert_template.php:411
-#: ../../godmode/alerts/configure_alert.php:88
+#: ../../godmode/alerts/alert_templates.php:52
+#: ../../godmode/alerts/alert_templates.php:145
+#: ../../godmode/alerts/configure_alert_template.php:428
 #: ../../godmode/alerts/alert_commands.php:99
-#: ../../include/functions_reporting.php:547
+#: ../../include/functions_reporting.php:532
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:72
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:177
 #: ../../enterprise/godmode/agentes/inventory_manager.php:161
@@ -729,8 +696,7 @@ msgstr "Fecha/Hora"
 #: ../../operation/agentes/estado_generalagente.php:82
 #: ../../operation/agentes/estado_ultimopaquete.php:55
 #: ../../operation/agentes/estado_monitores.php:52
-#: ../../operation/agentes/estado_alertas.php:121
-#: ../../operation/users/user.php:35
+#: ../../operation/users/user.php:39
 msgid "Description"
 msgstr "Descripción"
 
@@ -740,39 +706,36 @@ msgstr "Sobreescribir cambios locales"
 
 #: ../../extensions/update_manager/main.php:93
 #: ../../extensions/update_manager/settings.php:82
-#: ../../godmode/reporting/map_builder.php:315
-#: ../../godmode/reporting/map_builder.php:544
+#: ../../godmode/reporting/map_builder.php:324
+#: ../../godmode/reporting/map_builder.php:555
 #: ../../godmode/reporting/reporting_builder.php:364
 #: ../../godmode/servers/modificar_server.php:74
 #: ../../godmode/servers/manage_recontask_form.php:141
 #: ../../godmode/servers/manage_export_form.php:126
 #: ../../godmode/servers/plugin.php:186
 #: ../../godmode/groups/configure_group.php:102
-#: ../../godmode/snmpconsole/snmp_alert.php:244
-#: ../../godmode/snmpconsole/snmp_alert.php:331
-#: ../../godmode/setup/setup.php:148 ../../godmode/setup/links.php:109
+#: ../../godmode/snmpconsole/snmp_alert.php:245
+#: ../../godmode/snmpconsole/snmp_alert.php:332
+#: ../../godmode/setup/setup.php:155 ../../godmode/setup/links.php:109
 #: ../../godmode/setup/news.php:113
 #: ../../godmode/profiles/profile_list.php:206
-#: ../../godmode/agentes/module_manager_editor_wmi.php:262
+#: ../../godmode/agentes/module_manager_editor_wmi.php:293
 #: ../../godmode/agentes/agent_template.php:151
-#: ../../godmode/agentes/module_manager_editor_data.php:197
+#: ../../godmode/agentes/module_manager_editor_data.php:236
 #: ../../godmode/agentes/planned_downtime.php:172
 #: ../../godmode/agentes/planned_downtime.php:294
-#: ../../godmode/agentes/module_manager_editor_plugin.php:231
+#: ../../godmode/agentes/module_manager_editor_plugin.php:262
 #: ../../godmode/agentes/module_manager_editor_prediction.php:178
-#: ../../godmode/agentes/module_manager_editor_network.php:329
-#: ../../godmode/agentes/agent_manager.php:165
+#: ../../godmode/agentes/module_manager_editor_network.php:330
+#: ../../godmode/agentes/agent_manager.php:166
 #: ../../godmode/agentes/module_manager.php:151
-#: ../../godmode/agentes/alert_manager_editor.php:292
-#: ../../godmode/agentes/alert_manager_editor.php:404
 #: ../../godmode/modules/manage_nc_groups_form.php:75
 #: ../../godmode/modules/manage_network_components_form_wmi.php:215
 #: ../../godmode/modules/manage_network_templates_form.php:113
 #: ../../godmode/modules/manage_network_components_form_network.php:284
-#: ../../godmode/users/configure_user.php:246
+#: ../../godmode/users/configure_user.php:189
 #: ../../godmode/alerts/configure_alert_command.php:66
 #: ../../godmode/alerts/configure_alert_action.php:82
-#: ../../godmode/alerts/configure_alert.php:100
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:198
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:80
 #: ../../enterprise/godmode/agentes/inventory_manager.php:137
@@ -780,9 +743,9 @@ msgstr "Sobreescribir cambios locales"
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:108
 #: ../../operation/reporting/reporting_viewer.php:72
 #: ../../operation/reporting/graph_viewer.php:127
-#: ../../operation/agentes/networkmap.php:316
-#: ../../operation/events/events.php:206
-#: ../../operation/users/user_edit.php:137
+#: ../../operation/agentes/networkmap.php:322
+#: ../../operation/events/events.php:207
+#: ../../operation/users/user_edit.php:106
 msgid "Update"
 msgstr "Actualizar"
 
@@ -838,41 +801,36 @@ msgstr "Usuario del proxy"
 msgid "Proxy password"
 msgstr "Contraseña del proxy"
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:552
+#: ../../extensions/update_manager/lib/libupdate_manager.php:556
 msgid "Development"
 msgstr "Desarrollo"
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:553
+#: ../../extensions/update_manager/lib/libupdate_manager.php:557
 msgid "Testing"
 msgstr "Pruebas"
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:554
+#: ../../extensions/update_manager/lib/libupdate_manager.php:558
 msgid "Public"
 msgstr "Público"
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:555
+#: ../../extensions/update_manager/lib/libupdate_manager.php:559
 #: ../../godmode/groups/group_list.php:128
-#: ../../godmode/agentes/module_manager_editor_wmi.php:130
-#: ../../godmode/agentes/module_manager_editor_data.php:93
-#: ../../godmode/agentes/module_manager_editor_plugin.php:101
+#: ../../godmode/agentes/module_manager_editor_wmi.php:136
+#: ../../godmode/agentes/module_manager_editor_data.php:99
+#: ../../godmode/agentes/module_manager_editor_plugin.php:107
 #: ../../godmode/agentes/module_manager_editor_prediction.php:101
 #: ../../godmode/agentes/module_manager_editor_network.php:138
-#: ../../godmode/agentes/agent_manager.php:142
-#: ../../godmode/agentes/alert_manager_editor.php:104
-#: ../../godmode/agentes/alert_manager_editor.php:108
-#: ../../godmode/agentes/alert_manager_editor.php:273
-#: ../../godmode/agentes/alert_manager_editor.php:275
-#: ../../godmode/alerts/configure_alert_template.php:368
-#: ../../include/functions.php:709
+#: ../../godmode/agentes/agent_manager.php:143
+#: ../../godmode/alerts/configure_alert_template.php:380
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:563
-#: ../../godmode/setup/setup.php:136
+#: ../../extensions/update_manager/lib/libupdate_manager.php:567
+#: ../../godmode/setup/setup.php:142
 msgid "Database"
 msgstr "Base de datos"
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:564
+#: ../../extensions/update_manager/lib/libupdate_manager.php:568
 msgid "Code / binary directory"
 msgstr "Directorio de código / binario"
 
@@ -889,7 +847,7 @@ msgid "Update manager settings"
 msgstr "Ajustes del Update Manager"
 
 #: ../../godmode/reporting/map_builder.php:65
-#: ../../godmode/reporting/map_builder.php:164 ../../godmode/setup/news.php:38
+#: ../../godmode/reporting/map_builder.php:170 ../../godmode/setup/news.php:38
 #: ../../godmode/agentes/planned_downtime.php:118
 #: ../../godmode/modules/manage_network_components.php:78
 #: ../../godmode/modules/manage_nc_groups.php:40
@@ -897,7 +855,7 @@ msgid "Created successfully"
 msgstr "Creado correctamente"
 
 #: ../../godmode/reporting/map_builder.php:67
-#: ../../godmode/reporting/map_builder.php:166 ../../godmode/setup/news.php:38
+#: ../../godmode/reporting/map_builder.php:172 ../../godmode/setup/news.php:38
 #: ../../godmode/agentes/planned_downtime.php:96
 #: ../../godmode/agentes/planned_downtime.php:116
 #: ../../godmode/modules/manage_network_components.php:76
@@ -937,7 +895,7 @@ msgstr "Diseño actualizado correctamente"
 msgid "Update layout failed"
 msgstr "Falló la actualización del diseño"
 
-#: ../../godmode/reporting/map_builder.php:238
+#: ../../godmode/reporting/map_builder.php:247
 #: ../../godmode/reporting/reporting_builder.php:190
 #: ../../godmode/setup/news.php:50
 #: ../../godmode/modules/manage_network_components.php:116
@@ -945,7 +903,7 @@ msgstr "Falló la actualización del diseño"
 msgid "Updated successfully"
 msgstr "Actualizado correctamente"
 
-#: ../../godmode/reporting/map_builder.php:240
+#: ../../godmode/reporting/map_builder.php:249
 #: ../../godmode/reporting/reporting_builder.php:192
 #: ../../godmode/setup/news.php:50
 #: ../../godmode/modules/manage_network_components.php:114
@@ -953,7 +911,7 @@ msgstr "Actualizado correctamente"
 msgid "Not updated. Error updating data"
 msgstr "No se ha podido actualizar. Error al actualizar los datos."
 
-#: ../../godmode/reporting/map_builder.php:253
+#: ../../godmode/reporting/map_builder.php:262
 #: ../../godmode/reporting/graph_builder.php:202
 #: ../../godmode/reporting/reporting_builder.php:250
 #: ../../godmode/reporting/reporting_builder.php:327
@@ -966,16 +924,16 @@ msgstr "No se ha podido actualizar. Error al actualizar los datos."
 msgid "Reporting"
 msgstr "Informes"
 
-#: ../../godmode/reporting/map_builder.php:253 ../../godmode/menu.php:112
+#: ../../godmode/reporting/map_builder.php:262 ../../godmode/menu.php:112
 msgid "Map builder"
 msgstr "Creador de mapas"
 
-#: ../../godmode/reporting/map_builder.php:261
+#: ../../godmode/reporting/map_builder.php:270
 msgid "Map name"
 msgstr "Nombre de mapa"
 
-#: ../../godmode/reporting/map_builder.php:262
-#: ../../godmode/reporting/map_builder.php:299
+#: ../../godmode/reporting/map_builder.php:271
+#: ../../godmode/reporting/map_builder.php:308
 #: ../../godmode/reporting/reporting_builder.php:337
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:127
@@ -992,24 +950,24 @@ msgstr "Nombre de mapa"
 #: ../../enterprise/include/functions_reporting_pdf.php:325
 #: ../../enterprise/operation/inventory/inventory.php:38
 #: ../../operation/reporting/reporting_viewer.php:364
-#: ../../operation/reporting/reporting_xml.php:267
+#: ../../operation/reporting/reporting_xml.php:263
 #: ../../operation/incidents/incident.php:256
 #: ../../operation/incidents/incident_detail.php:256
-#: ../../operation/servers/view_server_detail.php:86
+#: ../../operation/servers/view_server_detail.php:87
 #: ../../operation/visual_console/index.php:36
-#: ../../operation/agentes/status_monitor.php:58
+#: ../../operation/agentes/status_monitor.php:62
 #: ../../operation/agentes/estado_generalagente.php:86
+#: ../../operation/agentes/alerts_status.php:107
 #: ../../operation/agentes/ver_agente.php:52
-#: ../../operation/agentes/ver_agente.php:230
+#: ../../operation/agentes/ver_agente.php:224
 #: ../../operation/agentes/estado_agente.php:53
-#: ../../operation/agentes/estado_agente.php:151
-#: ../../operation/agentes/estado_alertas.php:95
-#: ../../operation/events/events.php:122 ../../operation/events/events.php:267
+#: ../../operation/agentes/estado_agente.php:150
+#: ../../operation/events/events.php:122 ../../operation/events/events.php:268
 msgid "Group"
 msgstr "Grupo"
 
-#: ../../godmode/reporting/map_builder.php:263
-#: ../../godmode/reporting/map_builder.php:352
+#: ../../godmode/reporting/map_builder.php:272
+#: ../../godmode/reporting/map_builder.php:363
 #: ../../godmode/reporting/graph_builder.php:218
 #: ../../godmode/reporting/graph_builder.php:242
 #: ../../godmode/reporting/reporting_builder.php:267
@@ -1018,7 +976,7 @@ msgstr "Grupo"
 #: ../../godmode/servers/modificar_server.php:87
 #: ../../godmode/servers/plugin.php:200
 #: ../../godmode/groups/group_list.php:113
-#: ../../godmode/snmpconsole/snmp_alert.php:329
+#: ../../godmode/snmpconsole/snmp_alert.php:330
 #: ../../godmode/setup/links.php:118 ../../godmode/setup/news.php:122
 #: ../../godmode/profiles/profile_list.php:241
 #: ../../godmode/agentes/agent_template.php:150
@@ -1026,12 +984,11 @@ msgstr "Grupo"
 #: ../../godmode/agentes/planned_downtime.php:292
 #: ../../godmode/agentes/modificar_agente.php:145
 #: ../../godmode/agentes/module_manager.php:147
-#: ../../godmode/agentes/alert_manager_editor.php:402
 #: ../../godmode/modules/manage_network_components.php:232
 #: ../../godmode/modules/manage_nc_groups.php:76
 #: ../../godmode/modules/manage_network_templates_form.php:163
-#: ../../godmode/users/user_list.php:73 ../../godmode/db/db_refine.php:93
-#: ../../godmode/alerts/alert_templates.php:168
+#: ../../godmode/db/db_refine.php:93
+#: ../../godmode/alerts/alert_templates.php:147
 #: ../../godmode/alerts/alert_actions.php:96
 #: ../../godmode/alerts/alert_commands.php:100
 #: ../../enterprise/extensions/cron/main.php:89
@@ -1045,14 +1002,14 @@ msgstr "Grupo"
 #: ../../operation/snmpconsole/snmp_view.php:372
 #: ../../operation/snmpconsole/snmp_view.php:393
 #: ../../operation/agentes/datos_agente.php:70
-#: ../../operation/events/events.php:411
+#: ../../operation/events/events.php:412
 #: ../../operation/messages/message.php:192
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../../godmode/reporting/map_builder.php:287
-#: ../../godmode/reporting/map_builder.php:319
-#: ../../godmode/reporting/map_builder.php:417
+#: ../../godmode/reporting/map_builder.php:296
+#: ../../godmode/reporting/map_builder.php:328
+#: ../../godmode/reporting/map_builder.php:428
 #: ../../godmode/reporting/reporting_builder.php:320
 #: ../../godmode/reporting/reporting_builder.php:367
 #: ../../godmode/servers/manage_export.php:96
@@ -1060,28 +1017,26 @@ msgstr "Borrar"
 #: ../../godmode/servers/manage_recontask.php:136
 #: ../../godmode/servers/plugin.php:184 ../../godmode/servers/plugin.php:229
 #: ../../godmode/groups/configure_group.php:105
-#: ../../godmode/snmpconsole/snmp_alert.php:246
-#: ../../godmode/snmpconsole/snmp_alert.php:346
+#: ../../godmode/snmpconsole/snmp_alert.php:247
+#: ../../godmode/snmpconsole/snmp_alert.php:347
 #: ../../godmode/profiles/profile_list.php:201
-#: ../../godmode/agentes/module_manager_editor_wmi.php:260
-#: ../../godmode/agentes/module_manager_editor_data.php:195
+#: ../../godmode/agentes/module_manager_editor_wmi.php:291
+#: ../../godmode/agentes/module_manager_editor_data.php:234
 #: ../../godmode/agentes/planned_downtime.php:309
-#: ../../godmode/agentes/module_manager_editor_plugin.php:229
+#: ../../godmode/agentes/module_manager_editor_plugin.php:260
 #: ../../godmode/agentes/module_manager_editor_prediction.php:176
-#: ../../godmode/agentes/module_manager_editor_network.php:327
-#: ../../godmode/agentes/agent_manager.php:162
+#: ../../godmode/agentes/module_manager_editor_network.php:328
+#: ../../godmode/agentes/agent_manager.php:163
 #: ../../godmode/agentes/module_manager.php:62
 #: ../../godmode/modules/manage_network_components.php:169
 #: ../../godmode/modules/manage_nc_groups.php:109
 #: ../../godmode/modules/manage_nc_groups_form.php:73
 #: ../../godmode/modules/manage_network_templates.php:92
 #: ../../godmode/modules/manage_network_templates_form.php:115
-#: ../../godmode/users/configure_user.php:282
 #: ../../godmode/alerts/configure_alert_command.php:69
 #: ../../godmode/alerts/configure_alert_action.php:85
-#: ../../godmode/alerts/alert_templates.php:200
+#: ../../godmode/alerts/alert_templates.php:179
 #: ../../godmode/alerts/alert_actions.php:124
-#: ../../godmode/alerts/configure_alert.php:98
 #: ../../godmode/alerts/alert_commands.php:135
 #: ../../enterprise/extensions/cron/main.php:138
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:213
@@ -1090,7 +1045,7 @@ msgstr "Borrar"
 msgid "Create"
 msgstr "Crear"
 
-#: ../../godmode/reporting/map_builder.php:297
+#: ../../godmode/reporting/map_builder.php:306
 #: ../../godmode/reporting/graph_builder.php:475
 #: ../../godmode/extensions.php:36 ../../godmode/servers/manage_export.php:102
 #: ../../godmode/servers/modificar_server.php:67
@@ -1107,14 +1062,14 @@ msgstr "Crear"
 #: ../../godmode/modules/manage_network_templates.php:52
 #: ../../godmode/modules/manage_network_templates_form.php:103
 #: ../../godmode/modules/module_list.php:56
-#: ../../godmode/users/user_list.php:67
+#: ../../godmode/users/user_list.php:53
 #: ../../godmode/alerts/configure_alert_command.php:52
 #: ../../godmode/alerts/configure_alert_action.php:56
-#: ../../godmode/alerts/alert_templates.php:165
-#: ../../godmode/alerts/configure_alert_template.php:408
+#: ../../godmode/alerts/alert_templates.php:144
+#: ../../godmode/alerts/configure_alert_template.php:425
 #: ../../godmode/alerts/alert_actions.php:95
 #: ../../godmode/alerts/alert_commands.php:98
-#: ../../include/functions_db.php:1970
+#: ../../include/functions_db.php:1959
 #: ../../enterprise/godmode/agentes/inventory_manager.php:160
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:78
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:55
@@ -1122,55 +1077,55 @@ msgstr "Crear"
 #: ../../operation/extensions.php:36
 #: ../../operation/servers/view_server.php:53
 #: ../../operation/visual_console/index.php:35
-#: ../../operation/agentes/tactical.php:219 ../../operation/users/user.php:34
+#: ../../operation/agentes/tactical.php:172 ../../operation/users/user.php:36
 msgid "Name"
 msgstr "Nombre"
 
-#: ../../godmode/reporting/map_builder.php:301
+#: ../../godmode/reporting/map_builder.php:310
 msgid "Background"
 msgstr "Imagen de fondo"
 
-#: ../../godmode/reporting/map_builder.php:305
-#: ../../godmode/reporting/map_builder.php:392
+#: ../../godmode/reporting/map_builder.php:314
+#: ../../godmode/reporting/map_builder.php:403
 #: ../../godmode/reporting/graph_builder.php:304
 msgid "Width"
 msgstr "Anchura"
 
-#: ../../godmode/reporting/map_builder.php:307
-#: ../../godmode/reporting/map_builder.php:390
+#: ../../godmode/reporting/map_builder.php:316
+#: ../../godmode/reporting/map_builder.php:401
 #: ../../godmode/reporting/graph_builder.php:322
 msgid "Height"
 msgstr "Altura"
 
-#: ../../godmode/reporting/map_builder.php:327
+#: ../../godmode/reporting/map_builder.php:336
 msgid "preview"
 msgstr "vista previa"
 
-#: ../../godmode/reporting/map_builder.php:345
+#: ../../godmode/reporting/map_builder.php:356
 msgid "Map element trash"
 msgstr "Papelera de elementos"
 
-#: ../../godmode/reporting/map_builder.php:346
+#: ../../godmode/reporting/map_builder.php:357
 msgid "Drag an element here to delete from the map"
 msgstr "Arrastre un elemento aquí para borrarlo del mapa"
 
-#: ../../godmode/reporting/map_builder.php:359
+#: ../../godmode/reporting/map_builder.php:370
 msgid "Hour"
 msgstr "Hora"
 
-#: ../../godmode/reporting/map_builder.php:360
-#: ../../godmode/reporting/map_builder.php:361
-#: ../../godmode/reporting/map_builder.php:362
-#: ../../godmode/reporting/map_builder.php:363
+#: ../../godmode/reporting/map_builder.php:371
+#: ../../godmode/reporting/map_builder.php:372
+#: ../../godmode/reporting/map_builder.php:373
+#: ../../godmode/reporting/map_builder.php:374
 msgid "Hours"
 msgstr "Horas"
 
-#: ../../godmode/reporting/map_builder.php:364
+#: ../../godmode/reporting/map_builder.php:375
 #: ../../godmode/reporting/graph_builder.php:390
 msgid "Last day"
 msgstr "Último día"
 
-#: ../../godmode/reporting/map_builder.php:365
+#: ../../godmode/reporting/map_builder.php:376
 #: ../../godmode/servers/manage_recontask_form.php:91
 #: ../../godmode/db/db_main.php:43 ../../godmode/db/db_main.php:44
 #: ../../include/functions.php:507
@@ -1180,99 +1135,103 @@ msgstr "Último día"
 msgid "days"
 msgstr "días"
 
-#: ../../godmode/reporting/map_builder.php:366
+#: ../../godmode/reporting/map_builder.php:377
 #: ../../godmode/reporting/graph_builder.php:353
 #: ../../godmode/reporting/graph_builder.php:392
 msgid "Last week"
 msgstr "Última semana"
 
-#: ../../godmode/reporting/map_builder.php:368
+#: ../../godmode/reporting/map_builder.php:378
+#: ../../godmode/reporting/graph_builder.php:356
+#: ../../godmode/reporting/graph_builder.php:393
+msgid "15 days"
+msgstr "15 días"
+
+#: ../../godmode/reporting/map_builder.php:379
 msgid "Last Month"
 msgstr "Último mes"
 
-#: ../../godmode/reporting/map_builder.php:369
+#: ../../godmode/reporting/map_builder.php:380
 msgid "Two Months"
 msgstr "Dos meses"
 
-#: ../../godmode/reporting/map_builder.php:370
+#: ../../godmode/reporting/map_builder.php:381
 msgid "Six Months"
 msgstr "Seis meses"
 
-#: ../../godmode/reporting/map_builder.php:375
+#: ../../godmode/reporting/map_builder.php:386
 msgid "Map element editor"
 msgstr "Editor de elementos"
 
-#: ../../godmode/reporting/map_builder.php:376
+#: ../../godmode/reporting/map_builder.php:387
 msgid "Drag an element here to edit the properties"
 msgstr "Arrastre un elemento aquí para editar sus propiedades"
 
-#: ../../godmode/reporting/map_builder.php:384
+#: ../../godmode/reporting/map_builder.php:395
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../../godmode/reporting/map_builder.php:386
+#: ../../godmode/reporting/map_builder.php:397
 msgid "Label color"
 msgstr "Color de etiqueta"
 
-#: ../../godmode/reporting/map_builder.php:388
+#: ../../godmode/reporting/map_builder.php:399
 #: ../../godmode/reporting/reporting_builder.php:438
 #: ../../godmode/servers/modificar_server.php:87
 #: ../../godmode/agentes/agent_template.php:132
 #: ../../godmode/agentes/module_manager.php:79
-#: ../../godmode/agentes/alert_manager_editor.php:365
 #: ../../godmode/modules/manage_network_components.php:183
 #: ../../godmode/modules/manage_network_templates_form.php:141
 #: ../../godmode/alerts/alert_templates.php:43
-#: ../../godmode/alerts/alert_templates.php:167
+#: ../../godmode/alerts/alert_templates.php:146
 #: ../../include/functions_events.php:198
-#: ../../include/functions_reporting.php:546
+#: ../../include/functions_reporting.php:531
 #: ../../operation/servers/view_server.php:58
-#: ../../operation/agentes/status_monitor.php:173
+#: ../../operation/agentes/status_monitor.php:200
 #: ../../operation/agentes/estado_ultimopaquete.php:53
 #: ../../operation/agentes/estado_monitores.php:50
 #: ../../operation/agentes/sla_view.php:45
 #: ../../operation/agentes/sla_view.php:146
-#: ../../operation/agentes/estado_alertas.php:119
-#: ../../operation/events/events.php:255
+#: ../../operation/events/events.php:256
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../godmode/reporting/map_builder.php:394
+#: ../../godmode/reporting/map_builder.php:405
 #: ../../godmode/reporting/graph_builder.php:215
 #: ../../godmode/reporting/reporting_builder.php:262
 #: ../../godmode/reporting/reporting_builder.php:300
 #: ../../godmode/reporting/reporting_builder.php:439
-#: ../../godmode/agentes/alert_manager_editor.php:363
-#: ../../include/functions_reporting.php:348
-#: ../../include/functions_reporting.php:480
-#: ../../include/functions_reporting.php:656
+#: ../../include/functions_reporting.php:331
+#: ../../include/functions_reporting.php:465
+#: ../../include/functions_reporting.php:666
 #: ../../enterprise/include/functions_reporting_pdf.php:178
 #: ../../enterprise/operation/inventory/inventory.php:52
 #: ../../operation/reporting/reporting_viewer.php:211
 #: ../../operation/snmpconsole/snmp_view.php:148
-#: ../../operation/agentes/status_monitor.php:171
-#: ../../operation/agentes/estado_agente.php:148
+#: ../../operation/agentes/status_monitor.php:198
+#: ../../operation/agentes/alerts_status.php:147
+#: ../../operation/agentes/alerts_status.php:173
+#: ../../operation/agentes/estado_agente.php:147
 msgid "Agent"
 msgstr "Agente"
 
-#: ../../godmode/reporting/map_builder.php:396
+#: ../../godmode/reporting/map_builder.php:407
 #: ../../godmode/reporting/graph_builder.php:216
 #: ../../godmode/reporting/reporting_builder.php:263
 #: ../../godmode/reporting/reporting_builder.php:302
 #: ../../godmode/reporting/reporting_builder.php:408
 #: ../../godmode/reporting/reporting_builder.php:440
-#: ../../godmode/agentes/alert_manager.php:78
-#: ../../godmode/agentes/alert_manager_editor.php:364
 #: ../../enterprise/godmode/agentes/inventory_manager.php:104
 #: ../../enterprise/include/functions_reporting_pdf.php:179
 #: ../../enterprise/operation/agentes/agent_inventory.php:43
 #: ../../enterprise/operation/inventory/inventory.php:43
 #: ../../operation/reporting/reporting_viewer.php:213
+#: ../../operation/agentes/alerts_status.php:145
 #: ../../operation/agentes/exportdata.php:174
 msgid "Module"
 msgstr "Módulo"
 
-#: ../../godmode/reporting/map_builder.php:398
+#: ../../godmode/reporting/map_builder.php:409
 #: ../../godmode/reporting/graph_builder.php:376
 #: ../../godmode/reporting/reporting_builder.php:390
 #: ../../godmode/reporting/reporting_builder.php:441
@@ -1280,11 +1239,11 @@ msgstr "Módulo"
 msgid "Period"
 msgstr "Periodo"
 
-#: ../../godmode/reporting/map_builder.php:400
+#: ../../godmode/reporting/map_builder.php:411
 msgid "Image"
 msgstr "Imagen"
 
-#: ../../godmode/reporting/map_builder.php:403
+#: ../../godmode/reporting/map_builder.php:414
 #: ../../godmode/groups/group_list.php:111
 #: ../../godmode/groups/configure_group.php:79
 #: ../../godmode/agentes/agent_manager.php:97
@@ -1294,15 +1253,23 @@ msgstr "Imagen"
 msgid "Parent"
 msgstr "Padre"
 
-#: ../../godmode/reporting/map_builder.php:406
+#: ../../godmode/reporting/map_builder.php:417
 msgid "Map linked"
 msgstr "Mapa enlazado"
 
-#: ../../godmode/reporting/map_builder.php:441
+#: ../../godmode/reporting/map_builder.php:452
 #: ../../operation/reporting/reporting_viewer.php:81
 msgid "Loading"
 msgstr "Cargando"
 
+#: ../../godmode/reporting/map_builder.php:460
+#: ../../godmode/servers/manage_recontask.php:119
+#: ../../godmode/servers/manage_recontask_form.php:113
+#: ../../godmode/agentes/planned_downtime.php:203
+#: ../../operation/events/events.php:201
+msgid "Any"
+msgstr "Cualquier"
+
 #: ../../godmode/reporting/graph_builder.php:83
 msgid "Graph stored successfully"
 msgstr "Gráfica almacenada correctamente"
@@ -1332,7 +1299,7 @@ msgstr "Constructor de gráficos"
 #: ../../godmode/reporting/graph_builder.php:272
 #: ../../godmode/reporting/reporting_builder.php:405
 #: ../../godmode/agentes/manage_config_remote.php:97
-#: ../../godmode/agentes/manage_config.php:382
+#: ../../godmode/agentes/manage_config.php:371
 #: ../../godmode/db/db_refine.php:64
 #: ../../operation/agentes/exportdata.php:240
 msgid "Source agent"
@@ -1340,14 +1307,14 @@ msgstr "Agente origen"
 
 #: ../../godmode/reporting/graph_builder.php:285
 #: ../../godmode/agentes/configurar_agente.php:214
-#: ../../godmode/agentes/manage_config.php:432
-#: ../../godmode/agentes/manage_config.php:441
+#: ../../godmode/agentes/manage_config.php:421
+#: ../../godmode/agentes/manage_config.php:430
 #: ../../godmode/agentes/module_manager.php:25
-#: ../../godmode/db/db_refine.php:76 ../../include/functions_reporting.php:657
+#: ../../godmode/db/db_refine.php:76 ../../include/functions_reporting.php:667
 #: ../../enterprise/include/functions_reporting_pdf.php:329
 #: ../../operation/servers/view_server.php:56
 #: ../../operation/agentes/exportdata.php:267
-#: ../../operation/agentes/estado_agente.php:152
+#: ../../operation/agentes/estado_agente.php:151
 msgid "Modules"
 msgstr "Módulos"
 
@@ -1366,8 +1333,7 @@ msgstr "Ver ahora"
 #: ../../godmode/reporting/graph_builder.php:483
 #: ../../godmode/servers/manage_recontask.php:117
 #: ../../godmode/servers/manage_recontask_form.php:131
-#: ../../include/functions.php:764 ../../include/functions.php:850
-#: ../../include/functions_db.php:2043
+#: ../../include/functions_db.php:2032
 msgid "Yes"
 msgstr "Sí"
 
@@ -1378,16 +1344,51 @@ msgstr "Sí"
 #: ../../godmode/reporting/graph_builder.php:482
 #: ../../godmode/servers/manage_recontask.php:117
 #: ../../godmode/servers/manage_recontask_form.php:131
-#: ../../include/functions.php:766 ../../include/functions.php:850
-#: ../../include/functions_db.php:2045
+#: ../../include/functions_db.php:2034
 msgid "No"
 msgstr "No"
 
+#: ../../godmode/reporting/graph_builder.php:329
+#: ../../godmode/reporting/graph_builder.php:385
+#: ../../godmode/reporting/reporting_builder.php:392
+#: ../../include/functions_custom_graphs.php:101
+msgid "1 hour"
+msgstr "1 hora"
+
+#: ../../godmode/reporting/graph_builder.php:332
+#: ../../godmode/reporting/graph_builder.php:386
+msgid "2 hours"
+msgstr "2 horas"
+
 #: ../../godmode/reporting/graph_builder.php:335
 #: ../../godmode/reporting/graph_builder.php:387
 msgid "3 hours"
 msgstr "3 horas"
 
+#: ../../godmode/reporting/graph_builder.php:338
+#: ../../godmode/reporting/graph_builder.php:388
+msgid "6 hours"
+msgstr "6 horas"
+
+#: ../../godmode/reporting/graph_builder.php:341
+#: ../../godmode/reporting/graph_builder.php:389
+msgid "12 hours"
+msgstr "12 horas"
+
+#: ../../godmode/reporting/graph_builder.php:344
+#: ../../godmode/reporting/graph_builder.php:371
+#: ../../godmode/reporting/reporting_builder.php:397
+#: ../../include/functions_custom_graphs.php:106
+msgid "1 day"
+msgstr "1 día"
+
+#: ../../godmode/reporting/graph_builder.php:347
+#: ../../godmode/reporting/graph_builder.php:391
+#: ../../godmode/reporting/reporting_builder.php:398
+#: ../../include/functions_custom_graphs.php:107
+msgid "2 days"
+msgstr "2 días"
+
 #: ../../godmode/reporting/graph_builder.php:350
 msgid "4 days"
 msgstr "días"
@@ -1397,6 +1398,18 @@ msgstr "días"
 msgid "Last month"
 msgstr "Último mes"
 
+#: ../../godmode/reporting/graph_builder.php:362
+#: ../../godmode/reporting/graph_builder.php:395
+msgid "2 months"
+msgstr "2 meses"
+
+#: ../../godmode/reporting/graph_builder.php:365
+#: ../../godmode/reporting/graph_builder.php:396
+#: ../../godmode/reporting/reporting_builder.php:402
+#: ../../include/functions_custom_graphs.php:110
+msgid "6 months"
+msgstr "6 meses"
+
 #: ../../godmode/reporting/graph_builder.php:368
 msgid "1 year"
 msgstr "1 año"
@@ -1431,10 +1444,8 @@ msgstr "Línea"
 #: ../../godmode/setup/links.php:138 ../../godmode/setup/news.php:146
 #: ../../godmode/agentes/planned_downtime.php:175
 #: ../../godmode/agentes/planned_downtime.php:212
-#: ../../godmode/agentes/alert_manager.php:221
-#: ../../godmode/agentes/alert_manager.php:288
-#: ../../godmode/agentes/alert_manager_editor.php:294
-#: ../../godmode/agentes/alert_manager_editor.php:357
+#: ../../godmode/agentes/alert_manager.php:285
+#: ../../godmode/agentes/alert_manager.php:354
 #: ../../godmode/modules/manage_network_components_form_wmi.php:217
 #: ../../godmode/modules/manage_network_templates_form.php:216
 #: ../../godmode/modules/manage_network_components_form_network.php:286
@@ -1552,9 +1563,9 @@ msgstr "Tipo de informe"
 #: ../../godmode/servers/manage_recontask_form.php:87
 #: ../../godmode/servers/manage_recontask_form.php:88
 #: ../../godmode/servers/manage_recontask_form.php:89
-#: ../../include/functions_alerts.php:506
-#: ../../include/functions_alerts.php:507
-#: ../../include/functions_alerts.php:508 ../../include/functions.php:504
+#: ../../include/functions_alerts.php:516
+#: ../../include/functions_alerts.php:517
+#: ../../include/functions_alerts.php:518 ../../include/functions.php:504
 #: ../../include/functions_custom_graphs.php:102
 #: ../../include/functions_custom_graphs.php:103
 #: ../../include/functions_custom_graphs.php:104
@@ -1565,10 +1576,20 @@ msgstr "Tipo de informe"
 msgid "hours"
 msgstr "horas"
 
+#: ../../godmode/reporting/reporting_builder.php:399
+#: ../../include/functions_custom_graphs.php:108
+msgid "1 week"
+msgstr "1 semana"
+
 #: ../../godmode/reporting/reporting_builder.php:400
 msgid "2 weeks"
 msgstr "semana"
 
+#: ../../godmode/reporting/reporting_builder.php:401
+#: ../../include/functions_custom_graphs.php:109
+msgid "1 month"
+msgstr "1 mes"
+
 #: ../../godmode/reporting/reporting_builder.php:416
 msgid "Custom graph name"
 msgstr "Nombre de gráfica personalizada"
@@ -1667,9 +1688,9 @@ msgstr "Prefijo"
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:97
 #: ../../godmode/servers/manage_export_form.php:86
-#: ../../godmode/agentes/module_manager_editor_wmi.php:198
-#: ../../godmode/agentes/module_manager_editor_data.php:154
-#: ../../godmode/agentes/module_manager_editor_plugin.php:167
+#: ../../godmode/agentes/module_manager_editor_wmi.php:204
+#: ../../godmode/agentes/module_manager_editor_data.php:160
+#: ../../godmode/agentes/module_manager_editor_plugin.php:198
 #: ../../godmode/agentes/module_manager_editor_prediction.php:138
 #: ../../godmode/agentes/module_manager_editor_network.php:178
 #: ../../godmode/agentes/agent_manager.php:103
@@ -1677,12 +1698,12 @@ msgstr "Prefijo"
 #: ../../godmode/modules/manage_network_components.php:184
 #: ../../enterprise/godmode/agentes/inventory_manager.php:113
 #: ../../enterprise/godmode/agentes/inventory_manager.php:163
-#: ../../operation/servers/view_server_detail.php:74
-#: ../../operation/agentes/status_monitor.php:178
+#: ../../operation/servers/view_server_detail.php:75
+#: ../../operation/agentes/status_monitor.php:205
 #: ../../operation/agentes/estado_generalagente.php:78
 #: ../../operation/agentes/estado_monitores.php:54
 #: ../../operation/agentes/sla_view.php:49
-#: ../../operation/agentes/estado_agente.php:150
+#: ../../operation/agentes/estado_agente.php:149
 msgid "Interval"
 msgstr "Intervalo"
 
@@ -1727,23 +1748,23 @@ msgid "Manage servers"
 msgstr "Gestionar servidores"
 
 #: ../../godmode/servers/modificar_server.php:87
-#: ../../godmode/agentes/agent_manager.php:141
-#: ../../include/functions_reporting.php:298
+#: ../../godmode/agentes/agent_manager.php:142
+#: ../../include/functions_reporting.php:277
 #: ../../operation/incidents/incident.php:183
 #: ../../operation/incidents/incident.php:253
 #: ../../operation/incidents/incident_detail.php:230
-#: ../../operation/servers/view_server_detail.php:80
+#: ../../operation/servers/view_server_detail.php:81
 #: ../../operation/servers/view_server.php:54
 #: ../../operation/snmpconsole/snmp_view.php:199
 #: ../../operation/snmpconsole/snmp_view.php:378
-#: ../../operation/agentes/status_monitor.php:181
+#: ../../operation/agentes/status_monitor.php:208
+#: ../../operation/agentes/alerts_status.php:140
 #: ../../operation/agentes/estado_monitores.php:53
 #: ../../operation/agentes/sla_view.php:48
 #: ../../operation/agentes/sla_view.php:149
-#: ../../operation/agentes/estado_agente.php:153
-#: ../../operation/agentes/estado_alertas.php:125
-#: ../../operation/agentes/tactical.php:220
-#: ../../operation/events/events.php:421
+#: ../../operation/agentes/estado_agente.php:152
+#: ../../operation/agentes/tactical.php:173
+#: ../../operation/events/events.php:422
 msgid "Status"
 msgstr "Estado"
 
@@ -1782,7 +1803,7 @@ msgstr "Consola SNMP"
 
 #: ../../godmode/servers/modificar_server.php:132
 #: ../../operation/servers/view_server.php:65
-#: ../../operation/agentes/tactical.php:260
+#: ../../operation/agentes/tactical.php:213
 msgid "There are no servers configured into the database"
 msgstr "No hay ningún servidor configurado en la base de datos"
 
@@ -1818,13 +1839,13 @@ msgstr "Gestionar tarea recon"
 
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:82
-#: ../../operation/servers/view_server_detail.php:77
+#: ../../operation/servers/view_server_detail.php:78
 msgid "Network"
 msgstr "Red"
 
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:107
-#: ../../operation/servers/view_server_detail.php:83
+#: ../../operation/servers/view_server_detail.php:84
 msgid "Network profile"
 msgstr "Perfil de red"
 
@@ -1842,25 +1863,18 @@ msgstr "Incidente"
 #: ../../godmode/agentes/agent_manager.php:106
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:80
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:59
-#: ../../operation/servers/view_server_detail.php:89
+#: ../../operation/servers/view_server_detail.php:90
 #: ../../operation/agentes/estado_generalagente.php:70
-#: ../../operation/agentes/estado_agente.php:149
+#: ../../operation/agentes/estado_agente.php:148
 msgid "OS"
 msgstr "SO"
 
-#: ../../godmode/servers/manage_recontask.php:119
-#: ../../godmode/servers/manage_recontask_form.php:113
-#: ../../godmode/agentes/planned_downtime.php:203
-#: ../../operation/events/events.php:200
-msgid "Any"
-msgstr "Cualquier"
-
 #: ../../godmode/servers/manage_recontask.php:131
 msgid "There are no recon task configured"
 msgstr "No hay ninguna tarea de reconocimiento configurada"
 
 #: ../../godmode/servers/manage_recontask_form.php:69
-#: ../../operation/servers/view_server_detail.php:71
+#: ../../operation/servers/view_server_detail.php:72
 msgid "Task name"
 msgstr "Nombre tarea"
 
@@ -1877,21 +1891,15 @@ msgstr ""
 "Debe seleccionar un Servidor Recon para la tarea, de otra forma la tarea "
 "Recon nunca se ejecutará"
 
-#: ../../godmode/servers/manage_recontask_form.php:86
-#: ../../include/functions_alerts.php:505
-#: ../../enterprise/godmode/agentes/inventory_manager.php:114
-msgid "hour"
-msgstr "horas"
-
 #: ../../godmode/servers/manage_recontask_form.php:90
-#: ../../include/functions_alerts.php:509
+#: ../../include/functions_alerts.php:519
 #: ../../enterprise/godmode/agentes/inventory_manager.php:118
 #: ../../operation/agentes/exportdata.php:61
 msgid "day"
 msgstr "día"
 
 #: ../../godmode/servers/manage_recontask_form.php:92
-#: ../../include/functions_alerts.php:510
+#: ../../include/functions_alerts.php:520
 msgid "week"
 msgstr "semana"
 
@@ -1910,18 +1918,19 @@ msgid "Export server"
 msgstr "Servidor de exportación"
 
 #: ../../godmode/servers/manage_export_form.php:79
-#: ../../godmode/agentes/module_manager_editor_wmi.php:233
-#: ../../godmode/agentes/module_manager_editor_data.php:138
-#: ../../godmode/agentes/module_manager_editor_plugin.php:116
-#: ../../godmode/agentes/module_manager_editor_plugin.php:202
-#: ../../godmode/agentes/alert_manager.php:204
-#: ../../godmode/agentes/alert_manager.php:210
+#: ../../godmode/agentes/module_manager_editor_wmi.php:264
+#: ../../godmode/agentes/module_manager_editor_data.php:144
+#: ../../godmode/agentes/module_manager_editor_plugin.php:122
+#: ../../godmode/agentes/module_manager_editor_plugin.php:233
+#: ../../godmode/agentes/alert_manager.php:267
+#: ../../godmode/agentes/alert_manager.php:273
 #: ../../godmode/agentes/module_manager_editor_prediction.php:152
-#: ../../godmode/agentes/module_manager_editor_network.php:284
+#: ../../godmode/agentes/module_manager_editor_network.php:285
 #: ../../godmode/agentes/agent_manager.php:98
-#: ../../godmode/users/configure_user.php:224
+#: ../../godmode/users/configure_user.php:181
+#: ../../godmode/users/configure_user.php:185
 #: ../../godmode/alerts/configure_alert_action.php:61
-#: ../../godmode/alerts/configure_alert_template.php:345
+#: ../../godmode/alerts/configure_alert_template.php:357
 #: ../../include/functions.php:651
 msgid "None"
 msgstr "Ninguno/a"
@@ -1931,7 +1940,7 @@ msgid "Transfer mode"
 msgstr "Modo de transferencia"
 
 #: ../../godmode/servers/manage_export_form.php:111
-#: ../../godmode/agentes/module_manager_editor_plugin.php:131
+#: ../../godmode/agentes/module_manager_editor_plugin.php:137
 msgid "Port"
 msgstr "Puerto"
 
@@ -2054,22 +2063,19 @@ msgstr "Icono"
 #: ../../godmode/groups/configure_group.php:90
 #: ../../godmode/agentes/configurar_agente.php:222
 #: ../../godmode/agentes/alert_manager.php:27
-#: ../../godmode/agentes/alert_manager.php:124
-#: ../../godmode/agentes/manage_config.php:444
-#: ../../include/functions_reporting.php:666
+#: ../../godmode/agentes/alert_manager.php:161
+#: ../../godmode/agentes/manage_config.php:433
+#: ../../include/functions_reporting.php:676
 #: ../../enterprise/include/functions_reporting_pdf.php:335
 #: ../../operation/agentes/estado_grupo.php:233
-#: ../../operation/agentes/ver_agente.php:214
-#: ../../operation/agentes/estado_agente.php:154
+#: ../../operation/agentes/alerts_status.php:87
+#: ../../operation/agentes/ver_agente.php:208
+#: ../../operation/agentes/estado_agente.php:153
 msgid "Alerts"
 msgstr "Alertas"
 
 #: ../../godmode/groups/group_list.php:128
-#: ../../godmode/agentes/alert_manager_editor.php:105
-#: ../../godmode/agentes/alert_manager_editor.php:107
-#: ../../godmode/agentes/alert_manager_editor.php:272
-#: ../../godmode/agentes/alert_manager_editor.php:276
-#: ../../godmode/alerts/configure_alert_template.php:368
+#: ../../godmode/alerts/configure_alert_template.php:380
 msgid "Enabled"
 msgstr "Activado"
 
@@ -2078,17 +2084,16 @@ msgstr "Activado"
 #: ../../godmode/profiles/profile_list.php:274
 #: ../../godmode/agentes/agent_template.php:150
 #: ../../godmode/agentes/manage_config_remote.php:144
-#: ../../godmode/agentes/manage_config.php:469
+#: ../../godmode/agentes/alert_manager.php:392
+#: ../../godmode/agentes/manage_config.php:458
 #: ../../godmode/agentes/modificar_agente.php:194
 #: ../../godmode/agentes/module_manager.php:146
 #: ../../godmode/agentes/module_manager.php:157
 #: ../../godmode/modules/manage_nc_groups.php:98
 #: ../../godmode/modules/manage_network_templates.php:75
-#: ../../godmode/users/user_list.php:106
-#: ../../godmode/users/configure_user.php:268
 #: ../../godmode/db/db_purge.php:221 ../../godmode/db/db_audit.php:106
 #: ../../godmode/db/db_refine.php:93 ../../godmode/db/db_event.php:86
-#: ../../godmode/alerts/alert_templates.php:190
+#: ../../godmode/alerts/alert_templates.php:169
 #: ../../godmode/alerts/alert_actions.php:114
 #: ../../godmode/alerts/alert_commands.php:125
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:193
@@ -2115,12 +2120,12 @@ msgid "Update group"
 msgstr "Actualizar grupo"
 
 #: ../../godmode/groups/configure_group.php:93
-#: ../../godmode/agentes/module_manager_editor_wmi.php:250
-#: ../../godmode/agentes/module_manager_editor_data.php:185
-#: ../../godmode/agentes/module_manager_editor_plugin.php:219
+#: ../../godmode/agentes/module_manager_editor_wmi.php:281
+#: ../../godmode/agentes/module_manager_editor_data.php:224
+#: ../../godmode/agentes/module_manager_editor_plugin.php:250
 #: ../../godmode/agentes/module_manager_editor_prediction.php:166
-#: ../../godmode/agentes/module_manager_editor_network.php:317
-#: ../../godmode/agentes/agent_manager.php:128
+#: ../../godmode/agentes/module_manager_editor_network.php:318
+#: ../../godmode/agentes/agent_manager.php:129
 msgid "Custom ID"
 msgstr "ID personalizado"
 
@@ -2210,7 +2215,8 @@ msgstr "Servidores de exportación"
 msgid "System audit log"
 msgstr "Auditoría del sistema"
 
-#: ../../godmode/menu.php:143 ../../godmode/setup/setup.php:78
+#: ../../godmode/menu.php:143 ../../godmode/setup/setup.php:81
+#: ../../godmode/agentes/configurar_agente.php:206
 msgid "Setup"
 msgstr "Configuración"
 
@@ -2247,58 +2253,52 @@ msgid "Extensions"
 msgstr "Extensiones"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:37
-#: ../../godmode/agentes/configurar_agente.php:285
 msgid "There was a problem deleting the alert"
 msgstr "Hubo un problema al borrar la alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:39
 #: ../../godmode/agentes/configurar_agente.php:287
-#: ../../godmode/agentes/configurar_agente.php:303
 msgid "Alert successfully deleted"
 msgstr "Alerta eliminada correctamente"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:76
+#: ../../godmode/snmpconsole/snmp_alert.php:77
 msgid "There was a problem creating the alert"
 msgstr "Hubo un problema al crear la alerta"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:78
-#: ../../godmode/agentes/configurar_agente.php:384
+#: ../../godmode/snmpconsole/snmp_alert.php:79
 msgid "Alert successfully created"
 msgstr "Alerta creada correctamente"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:91
+#: ../../godmode/snmpconsole/snmp_alert.php:92
 msgid "There was a problem updating the alert"
 msgstr "Hubo un problema al actualizar la alerta"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:93
-#: ../../godmode/agentes/configurar_agente.php:484
+#: ../../godmode/snmpconsole/snmp_alert.php:94
 msgid "Alert successfully updated"
 msgstr "Alerta actualizada correctamente"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:139
+#: ../../godmode/snmpconsole/snmp_alert.php:140
 msgid "Update alert"
 msgstr "Actualizar alerta"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:141
-#: ../../godmode/alerts/configure_alert.php:60
+#: ../../godmode/snmpconsole/snmp_alert.php:142
 msgid "Create alert"
 msgstr "Crear alerta"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:147
-#: ../../godmode/snmpconsole/snmp_alert.php:269
-#: ../../godmode/agentes/alert_manager_editor.php:84
+#: ../../godmode/snmpconsole/snmp_alert.php:148
+#: ../../godmode/snmpconsole/snmp_alert.php:270
 msgid "Alert type"
 msgstr "Tipo de alerta"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:163
-#: ../../godmode/snmpconsole/snmp_alert.php:271
+#: ../../godmode/snmpconsole/snmp_alert.php:164
+#: ../../godmode/snmpconsole/snmp_alert.php:272
 msgid "Alert trigger"
 msgstr "Disparador de alerta"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:179
-#: ../../godmode/snmpconsole/snmp_alert.php:184
-#: ../../godmode/snmpconsole/snmp_alert.php:278
-#: ../../godmode/snmpconsole/snmp_alert.php:306
+#: ../../godmode/snmpconsole/snmp_alert.php:180
+#: ../../godmode/snmpconsole/snmp_alert.php:185
+#: ../../godmode/snmpconsole/snmp_alert.php:279
+#: ../../godmode/snmpconsole/snmp_alert.php:307
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:61
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:174
 #: ../../operation/snmpconsole/snmp_view.php:152
@@ -2306,106 +2306,91 @@ msgstr "Disparador de alerta"
 msgid "OID"
 msgstr "OID"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:184
+#: ../../godmode/snmpconsole/snmp_alert.php:185
 msgid "Custom Value"
 msgstr "Valor personalizado"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:189
-#: ../../godmode/snmpconsole/snmp_alert.php:274
-#: ../../godmode/snmpconsole/snmp_alert.php:314
+#: ../../godmode/snmpconsole/snmp_alert.php:190
+#: ../../godmode/snmpconsole/snmp_alert.php:275
+#: ../../godmode/snmpconsole/snmp_alert.php:315
 #: ../../operation/snmpconsole/snmp_view.php:202
 msgid "SNMP Agent"
 msgstr "Agente SNMP"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:194
-#: ../../godmode/agentes/alert_manager_editor.php:185
+#: ../../godmode/snmpconsole/snmp_alert.php:195
 msgid "Field #1 (Alias, name)"
 msgstr "Campo #1 (Alias, nombre)"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:198
-#: ../../godmode/agentes/alert_manager_editor.php:191
+#: ../../godmode/snmpconsole/snmp_alert.php:199
 msgid "Field #2 (Single Line)"
 msgstr "Campo #2 (Línea sencilla)"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:202
-#: ../../godmode/agentes/alert_manager_editor.php:198
+#: ../../godmode/snmpconsole/snmp_alert.php:203
 msgid "Field #3 (Full Text)"
 msgstr "Campo #3 (Texto completo)"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:207
-#: ../../godmode/agentes/alert_manager_editor.php:165
-#: ../../godmode/alerts/configure_alert_template.php:336
+#: ../../godmode/snmpconsole/snmp_alert.php:208
+#: ../../godmode/alerts/configure_alert_template.php:348
 msgid "Min. number of alerts"
 msgstr "Número mínimo de alertas"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:210
-#: ../../godmode/agentes/alert_manager_editor.php:175
-#: ../../godmode/alerts/configure_alert_template.php:339
+#: ../../godmode/snmpconsole/snmp_alert.php:211
+#: ../../godmode/alerts/configure_alert_template.php:351
 msgid "Max. number of alerts"
 msgstr "Número máximo de alertas"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:215
-#: ../../godmode/agentes/alert_manager_editor.php:137
-#: ../../godmode/alerts/configure_alert_template.php:328
+#: ../../godmode/snmpconsole/snmp_alert.php:216
+#: ../../godmode/alerts/configure_alert_template.php:340
 msgid "Time threshold"
 msgstr "Umbral de tiempo"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:229
-#: ../../godmode/alerts/configure_alert_template.php:331
-#: ../../include/functions_alerts.php:511
+#: ../../godmode/snmpconsole/snmp_alert.php:230
+#: ../../godmode/alerts/configure_alert_template.php:343
+#: ../../include/functions_alerts.php:521
 msgid "Other value"
 msgstr "Otros valores"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:234
-#: ../../godmode/alerts/configure_alert_template.php:334
-#: ../../include/functions.php:492
-msgid "seconds"
-msgstr "segundos"
-
-#: ../../godmode/snmpconsole/snmp_alert.php:237
-#: ../../godmode/agentes/alert_manager_editor.php:75
-#: ../../include/functions.php:792 ../../include/functions.php:851
-#: ../../include/functions_reporting.php:351
+#: ../../godmode/snmpconsole/snmp_alert.php:238
+#: ../../include/functions_reporting.php:334
 #: ../../operation/incidents/incident.php:189
 #: ../../operation/incidents/incident.php:255
 #: ../../operation/incidents/incident_detail.php:265
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:252
+#: ../../godmode/snmpconsole/snmp_alert.php:253
 msgid "Alert Overview"
 msgstr "Vista general de alertas"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:257
+#: ../../godmode/snmpconsole/snmp_alert.php:258
 msgid "There are no SNMP alerts"
 msgstr "No hay definida ninguna alerta SNMP"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:281
-#: ../../godmode/snmpconsole/snmp_alert.php:310
+#: ../../godmode/snmpconsole/snmp_alert.php:282
+#: ../../godmode/snmpconsole/snmp_alert.php:311
 msgid "Custom Value/OID"
 msgstr "Valor/OID personalizado"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:286
+#: ../../godmode/snmpconsole/snmp_alert.php:287
 msgid "Times fired"
 msgstr "Veces disparada"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:289
-#: ../../include/functions_reporting.php:551
-#: ../../operation/agentes/estado_alertas.php:124
+#: ../../godmode/snmpconsole/snmp_alert.php:290
+#: ../../include/functions_reporting.php:535
+#: ../../operation/agentes/alerts_status.php:139
 msgid "Last fired"
 msgstr "Lanzada por última vez"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:299
 #: ../../godmode/snmpconsole/snmp_alert.php:300
 #: ../../godmode/snmpconsole/snmp_alert.php:301
 #: ../../godmode/snmpconsole/snmp_alert.php:302
-#: ../../godmode/agentes/alert_manager.php:97
-#: ../../godmode/agentes/alert_manager_editor.php:72
-#: ../../include/functions.php:687 ../../include/functions.php:692
-#: ../../include/functions.php:695 ../../include/functions_db.php:2023
-#: ../../include/functions_reporting.php:585
-#: ../../include/functions_reporting.php:623
-#: ../../include/functions_reporting.php:652
+#: ../../godmode/snmpconsole/snmp_alert.php:303
+#: ../../godmode/agentes/alert_manager.php:132 ../../include/functions.php:687
+#: ../../include/functions.php:692 ../../include/functions.php:695
+#: ../../include/functions_db.php:2012
+#: ../../include/functions_reporting.php:595
+#: ../../include/functions_reporting.php:633
+#: ../../include/functions_reporting.php:662
 #: ../../operation/snmpconsole/snmp_view.php:294
 #: ../../operation/snmpconsole/snmp_view.php:306
 #: ../../operation/snmpconsole/snmp_view.php:315
@@ -2415,17 +2400,17 @@ msgstr "Lanzada por última vez"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:325
+#: ../../godmode/snmpconsole/snmp_alert.php:326
 #: ../../include/functions.php:488 ../../include/functions_ui.php:97
 #: ../../include/functions_ui.php:98
 #: ../../enterprise/extensions/cron/main.php:102
 #: ../../operation/agentes/estado_generalagente.php:104
-#: ../../operation/agentes/estado_ultimopaquete.php:201
+#: ../../operation/agentes/estado_ultimopaquete.php:198
 #: ../../operation/agentes/sla_view.php:126
 msgid "Never"
 msgstr "Nunca"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:350
+#: ../../godmode/snmpconsole/snmp_alert.php:351
 #: ../../operation/snmpconsole/snmp_view.php:396
 msgid "Legend"
 msgstr "Leyenda"
@@ -2440,7 +2425,7 @@ msgstr "Revisar logs"
 
 #: ../../godmode/admin_access_logs.php:36
 #: ../../godmode/agentes/manage_config_remote.php:93
-#: ../../godmode/agentes/manage_config.php:378
+#: ../../godmode/agentes/manage_config.php:367
 #: ../../godmode/modules/manage_network_templates_form.php:194
 #: ../../operation/incidents/incident.php:172
 msgid "Filter"
@@ -2449,7 +2434,7 @@ msgstr "Filtrar"
 #: ../../godmode/admin_access_logs.php:53
 #: ../../godmode/modules/manage_network_components.php:157
 #: ../../godmode/modules/manage_network_templates_form.php:192
-#: ../../include/functions.php:649 ../../include/functions.php:1087
+#: ../../include/functions.php:649 ../../include/functions.php:895
 #: ../../enterprise/operation/snmpconsole/snmp_view.php:26
 #: ../../enterprise/operation/agentes/agent_inventory.php:46
 #: ../../operation/incidents/incident_search.php:37
@@ -2458,8 +2443,9 @@ msgstr "Filtrar"
 #: ../../operation/snmpconsole/snmp_view.php:157
 #: ../../operation/snmpconsole/snmp_view.php:174
 #: ../../operation/snmpconsole/snmp_view.php:227
-#: ../../operation/agentes/status_monitor.php:71
-#: ../../operation/agentes/status_monitor.php:86
+#: ../../operation/agentes/status_monitor.php:77
+#: ../../operation/agentes/status_monitor.php:84
+#: ../../operation/agentes/status_monitor.php:101
 #: ../../operation/events/events.php:128 ../../operation/events/events.php:133
 #: ../../operation/events/events.php:160
 msgid "All"
@@ -2470,102 +2456,105 @@ msgstr "Todo"
 #: ../../operation/incidents/incident.php:181
 #: ../../operation/incidents/incident.php:203
 #: ../../operation/incidents/incident.php:209
-#: ../../operation/agentes/status_monitor.php:93
+#: ../../operation/agentes/status_monitor.php:109
 #: ../../operation/agentes/estado_agente.php:62
-#: ../../operation/agentes/estado_alertas.php:102
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../../godmode/setup/setup.php:79
+#: ../../godmode/setup/setup.php:82
 msgid "General configuration"
 msgstr "Configuración general"
 
-#: ../../godmode/setup/setup.php:85
+#: ../../godmode/setup/setup.php:88
 msgid "Language code for Pandora"
 msgstr "Código de idioma para Pandora FMS"
 
-#: ../../godmode/setup/setup.php:88
+#: ../../godmode/setup/setup.php:91
 msgid "Date format string"
 msgstr "Información de la base de datos"
 
-#: ../../godmode/setup/setup.php:89
+#: ../../godmode/setup/setup.php:92
 msgid "Example"
 msgstr "Ejemplo"
 
-#: ../../godmode/setup/setup.php:92
+#: ../../godmode/setup/setup.php:95
 msgid "Remote config directory"
 msgstr "Directorio remoto de configuración"
 
-#: ../../godmode/setup/setup.php:95
+#: ../../godmode/setup/setup.php:98
 msgid "Graph color (min)"
 msgstr "Color de la gráfica (mín.)"
 
-#: ../../godmode/setup/setup.php:98
+#: ../../godmode/setup/setup.php:101
 msgid "Graph color (avg)"
 msgstr "Color de la gráfica (med.)"
 
-#: ../../godmode/setup/setup.php:101
+#: ../../godmode/setup/setup.php:104
 msgid "Graph color (max)"
 msgstr "Color de la gráfica (máx.)"
 
-#: ../../godmode/setup/setup.php:104
+#: ../../godmode/setup/setup.php:107
 msgid "SLA period (seconds)"
 msgstr "Periodo del SLA (segundos)"
 
-#: ../../godmode/setup/setup.php:107
+#: ../../godmode/setup/setup.php:110
 msgid "Max. days before compact data"
 msgstr "Máx. días antes de comprimir datos"
 
-#: ../../godmode/setup/setup.php:110
+#: ../../godmode/setup/setup.php:113
 msgid "Max. days before purge"
 msgstr "Máx. días antes de eliminar datos"
 
-#: ../../godmode/setup/setup.php:113
+#: ../../godmode/setup/setup.php:116
 msgid "Graphic resolution (1-low, 5-high)"
 msgstr "Resolución de los gráficos (1 baja, 5 alta)"
 
-#: ../../godmode/setup/setup.php:116
+#: ../../godmode/setup/setup.php:119
 msgid "Compact interpolation in hours (1 Fine-20 bad)"
 msgstr "Interpolación de la compactación en horas (1 bueno-20 malo)"
 
-#: ../../godmode/setup/setup.php:119
+#: ../../godmode/setup/setup.php:122
+msgid "Auto login (Hash) password"
+msgstr "Contraseña («hash») de Inicio de sesión automático"
+
+#: ../../godmode/setup/setup.php:125
 msgid "Style template"
 msgstr "Plantilla de estilo"
 
-#: ../../godmode/setup/setup.php:122
+#: ../../godmode/setup/setup.php:128
 #: ../../operation/snmpconsole/snmp_view.php:164
 #: ../../operation/events/events.php:179
 msgid "Block size for pagination"
 msgstr "Tamaño de bloque para la paginación"
 
-#: ../../godmode/setup/setup.php:125
+#: ../../godmode/setup/setup.php:131
 msgid "Default hours for event view"
 msgstr "Núm. de horas predeterminado para la visión de eventos"
 
-#: ../../godmode/setup/setup.php:128
+#: ../../godmode/setup/setup.php:134
 msgid "Timestamp or time comparation"
 msgstr "Marca de tiempo o comparación de hora"
 
-#: ../../godmode/setup/setup.php:129
+#: ../../godmode/setup/setup.php:135
 msgid "Comparation in rollover"
 msgstr "Fecha en comparación"
 
-#: ../../godmode/setup/setup.php:131
+#: ../../godmode/setup/setup.php:137
 msgid "Timestamp in rollover"
 msgstr "Fecha literal"
 
-#: ../../godmode/setup/setup.php:134
+#: ../../godmode/setup/setup.php:140
 msgid "Time source"
 msgstr "Origen de tiempo"
 
-#: ../../godmode/setup/setup.php:135 ../../include/functions_events.php:245
-#: ../../include/functions_events.php:268 ../../include/functions.php:1045
-#: ../../operation/events/events.php:163 ../../operation/events/events.php:320
-#: ../../operation/events/events.php:344 ../../operation/events/events.php:373
+#: ../../godmode/setup/setup.php:141 ../../include/functions_events.php:245
+#: ../../include/functions_events.php:268 ../../include/functions.php:853
+#: ../../operation/events/events.php:163 ../../operation/events/events.php:321
+#: ../../operation/events/events.php:345 ../../operation/events/events.php:374
 msgid "System"
 msgstr "Sistema"
 
-#: ../../godmode/setup/setup.php:139
+#: ../../godmode/setup/setup.php:145
 msgid "Automatic update check"
 msgstr "Comprobación automática de actualizaciones"
 
@@ -2626,9 +2615,8 @@ msgstr "Gestionar noticias"
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../../godmode/setup/news.php:104 ../../include/functions.php:749
-#: ../../include/functions.php:773 ../../include/functions_db.php:2029
-#: ../../include/functions_db.php:2051
+#: ../../godmode/setup/news.php:104 ../../include/functions_db.php:2018
+#: ../../include/functions_db.php:2040
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:70
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:176
 msgid "Text"
@@ -2640,15 +2628,18 @@ msgid "Author"
 msgstr "Autor"
 
 #: ../../godmode/profiles/profile_list.php:33
-#: ../../operation/users/user.php:91
+#: ../../godmode/users/user_list.php:122 ../../operation/users/user.php:88
 msgid "Profiles defined in Pandora"
 msgstr "Perfiles definidos en Pandora"
 
 #: ../../godmode/profiles/profile_list.php:47
+#: ../../godmode/users/user_list.php:38
 msgid "There was a problem deleting the profile"
 msgstr "Hubo un problema al borrar el perfil"
 
 #: ../../godmode/profiles/profile_list.php:49
+#: ../../godmode/users/user_list.php:38
+#: ../../godmode/users/configure_user.php:118
 msgid "Profile successfully deleted"
 msgstr "Perfil eliminado correctamente"
 
@@ -2686,6 +2677,7 @@ msgid "Update profile"
 msgstr "Actualizar perfil"
 
 #: ../../godmode/profiles/profile_list.php:172
+#: ../../godmode/users/configure_user.php:204
 msgid "Profile name"
 msgstr "Nombre del perfil"
 
@@ -2723,8 +2715,9 @@ msgid "Pandora management"
 msgstr "Gestionar Pandora FMS"
 
 #: ../../godmode/profiles/profile_list.php:230
-#: ../../godmode/users/configure_user.php:233
-#: ../../operation/users/user.php:100
+#: ../../godmode/users/user_list.php:134
+#: ../../godmode/users/configure_user.php:183
+#: ../../operation/users/user.php:99
 msgid "Profiles"
 msgstr "Perfiles"
 
@@ -2769,12 +2762,12 @@ msgid "Pandora System Management"
 msgstr "Gestionar Pandora FMS"
 
 #: ../../godmode/agentes/configurar_agente.php:134
-#: ../../godmode/agentes/configurar_agente.php:518
+#: ../../godmode/agentes/configurar_agente.php:337
 msgid "No agent name specified"
 msgstr "No se especificó el nombre del agente"
 
 #: ../../godmode/agentes/configurar_agente.php:137
-#: ../../godmode/agentes/configurar_agente.php:521
+#: ../../godmode/agentes/configurar_agente.php:340
 msgid "There is already an agent in the database with this name"
 msgstr "Ya existe un agente con ese nombre en la base de datos"
 
@@ -2790,18 +2783,10 @@ msgstr "Hubo un problema al crear el módulo agent_keepalive"
 msgid "There was a problem creating the agent"
 msgstr "Hubo un problema al crear el agente"
 
-#: ../../godmode/agentes/configurar_agente.php:191
-msgid "Setup mode"
-msgstr "Modo gestión"
-
 #: ../../godmode/agentes/configurar_agente.php:198
 msgid "View"
 msgstr "Ver"
 
-#: ../../godmode/agentes/configurar_agente.php:206
-msgid "Setup Agent"
-msgstr "Configurar agente"
-
 #: ../../godmode/agentes/configurar_agente.php:230
 msgid "Net. Templates"
 msgstr "Plantillas de red"
@@ -2826,117 +2811,105 @@ msgstr "Dato borrado"
 msgid "Error normalizing module"
 msgstr "Error al normalizar el módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:301
+#: ../../godmode/agentes/configurar_agente.php:285
 msgid "There was a problem deleting alert"
 msgstr "Hubo un problema al borrar la alerta"
 
-#: ../../godmode/agentes/configurar_agente.php:382
-msgid "There was a problem creating alert"
-msgstr "Hubo un problema al crear la alerta"
-
-#: ../../godmode/agentes/configurar_agente.php:398
+#: ../../godmode/agentes/configurar_agente.php:300
 msgid "There was a problem creating the combined alert"
 msgstr "Hubo un problema al crear la alerta combinada"
 
-#: ../../godmode/agentes/configurar_agente.php:400
+#: ../../godmode/agentes/configurar_agente.php:302
 msgid "Combined alert successfully created"
 msgstr "Alerta combinada creada correctamente"
 
-#: ../../godmode/agentes/configurar_agente.php:482
-msgid "There was a problem updating alert"
-msgstr "Hubo un problema al actualizar la alerta"
-
-#: ../../godmode/agentes/configurar_agente.php:546
+#: ../../godmode/agentes/configurar_agente.php:365
 msgid "There was a problem updating agent"
 msgstr "Hubo un problema al actualizar el agente"
 
-#: ../../godmode/agentes/configurar_agente.php:549
+#: ../../godmode/agentes/configurar_agente.php:368
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:45
 msgid "Agent successfully updated"
 msgstr "Agente actualizado correctamente"
 
-#: ../../godmode/agentes/configurar_agente.php:573
+#: ../../godmode/agentes/configurar_agente.php:392
 #: ../../operation/agentes/estado_generalagente.php:30
 msgid "There was a problem loading agent"
 msgstr "Hubo un problema al cargar la configuración del agente"
 
-#: ../../godmode/agentes/configurar_agente.php:606
+#: ../../godmode/agentes/configurar_agente.php:425
 msgid "There was a problem loading the module"
 msgstr "Hubo un problema al cargar el módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:643
-msgid "There was a problem loading the alert"
-msgstr "Hubo un problema al cargar la alerta"
-
-#: ../../godmode/agentes/configurar_agente.php:772
+#: ../../godmode/agentes/configurar_agente.php:543
 msgid "There was a problem updating module"
 msgstr "Hubo un problema al actualizar el módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:774
+#: ../../godmode/agentes/configurar_agente.php:545
 msgid "Module successfully updated"
 msgstr "Módulo actualizado correctamente"
 
-#: ../../godmode/agentes/configurar_agente.php:787
+#: ../../godmode/agentes/configurar_agente.php:558
 msgid "Cannot read from SNMP source"
 msgstr "No se puede leer SNMP del origen"
 
-#: ../../godmode/agentes/configurar_agente.php:789
+#: ../../godmode/agentes/configurar_agente.php:560
 msgid "SNMP source has been scanned"
 msgstr "El origen SNMP ha sido analizado"
 
-#: ../../godmode/agentes/configurar_agente.php:821
+#: ../../godmode/agentes/configurar_agente.php:592
 msgid "There was a problem adding module"
 msgstr "Ha habido un problema al añadir el módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:829
-#: ../../godmode/agentes/configurar_agente.php:831
+#: ../../godmode/agentes/configurar_agente.php:600
+#: ../../godmode/agentes/configurar_agente.php:602
 msgid "Module added successfully"
 msgstr "Módulo añadido correctamente"
 
-#: ../../godmode/agentes/configurar_agente.php:831
+#: ../../godmode/agentes/configurar_agente.php:602
 msgid "Status init unsuccessful"
 msgstr "Inicialización de estado incorrecta"
 
-#: ../../godmode/agentes/configurar_agente.php:871
+#: ../../godmode/agentes/configurar_agente.php:646
 msgid "There was a problem deleting the module"
 msgstr "Hubo un problema al borrar el módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:874
+#: ../../godmode/agentes/configurar_agente.php:649
 msgid "Module deleted successfully"
 msgstr "Módulo borrado correctamente"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:80
-#: ../../godmode/agentes/module_manager_editor_data.php:75
-#: ../../godmode/agentes/module_manager_editor_plugin.php:81
+#: ../../godmode/agentes/module_manager_editor_wmi.php:86
+#: ../../godmode/agentes/module_manager_editor_data.php:81
+#: ../../godmode/agentes/module_manager_editor_plugin.php:87
 #: ../../godmode/agentes/module_manager_editor_prediction.php:80
 #: ../../godmode/agentes/module_manager_editor_network.php:87
 msgid "Module assignment"
 msgstr "Asignación de módulos"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:80
+#: ../../godmode/agentes/module_manager_editor_wmi.php:86
 msgid "WMI server module"
 msgstr "Módulo del servidor WMI"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:98
+#: ../../godmode/agentes/module_manager_editor_wmi.php:104
 #: ../../godmode/agentes/module_manager_editor_network.php:106
 msgid "Using Module Component"
 msgstr "Usando componente de red"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:107
+#: ../../godmode/agentes/module_manager_editor_wmi.php:113
 #: ../../godmode/agentes/module_manager_editor_network.php:115
 msgid "Manual setup"
 msgstr "Configuración manual"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:123
+#: ../../godmode/agentes/module_manager_editor_wmi.php:129
 #: ../../godmode/agentes/module_manager_editor_network.php:131
 #: ../../godmode/db/db_purge.php:143
 msgid "Get data"
 msgstr "Obtener datos"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:128
+#: ../../godmode/agentes/module_manager_editor_wmi.php:134
 #: ../../godmode/agentes/agent_template.php:131
-#: ../../godmode/agentes/module_manager_editor_data.php:91
-#: ../../godmode/agentes/module_manager_editor_plugin.php:99
+#: ../../godmode/agentes/module_manager_editor_data.php:97
+#: ../../godmode/agentes/module_manager_editor_plugin.php:105
 #: ../../godmode/agentes/module_manager_editor_prediction.php:98
 #: ../../godmode/agentes/module_manager_editor_network.php:136
 #: ../../godmode/agentes/module_manager.php:77
@@ -2944,51 +2917,50 @@ msgstr "Obtener datos"
 #: ../../godmode/modules/manage_network_components_form_wmi.php:92
 #: ../../godmode/modules/manage_network_templates_form.php:140
 #: ../../godmode/modules/manage_network_components_form_network.php:195
-#: ../../operation/agentes/status_monitor.php:73
+#: ../../operation/agentes/status_monitor.php:88
 #: ../../operation/agentes/estado_ultimopaquete.php:52
 #: ../../operation/agentes/estado_monitores.php:51
 #: ../../operation/agentes/sla_view.php:46
 #: ../../operation/agentes/sla_view.php:147
-#: ../../operation/agentes/estado_alertas.php:138
 msgid "Module name"
 msgstr "Nombre módulo"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:136
-#: ../../godmode/agentes/module_manager_editor_plugin.php:107
+#: ../../godmode/agentes/module_manager_editor_wmi.php:142
+#: ../../godmode/agentes/module_manager_editor_plugin.php:113
 #: ../../godmode/agentes/module_manager_editor_network.php:144
 msgid "Target IP"
 msgstr "IP destino"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:138
+#: ../../godmode/agentes/module_manager_editor_wmi.php:144
 #: ../../godmode/modules/manage_network_components_form_wmi.php:168
 msgid "Namespace"
 msgstr "Espacio de nombres"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:145
+#: ../../godmode/agentes/module_manager_editor_wmi.php:151
 #: ../../godmode/modules/manage_network_components_form_wmi.php:144
 msgid "WMI Query"
 msgstr "Consulta WMI"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:152
+#: ../../godmode/agentes/module_manager_editor_wmi.php:158
 #: ../../godmode/modules/manage_network_components_form_wmi.php:152
 msgid "Key string"
 msgstr "Texto clave"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:156
+#: ../../godmode/agentes/module_manager_editor_wmi.php:162
 #: ../../godmode/modules/manage_network_components_form_wmi.php:160
 msgid "Field number"
 msgstr "Campo número"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:164
-#: ../../godmode/agentes/module_manager_editor_plugin.php:136
+#: ../../godmode/agentes/module_manager_editor_wmi.php:170
+#: ../../godmode/agentes/module_manager_editor_plugin.php:142
 #: ../../godmode/modules/manage_network_components_form_wmi.php:176
 #: ../../enterprise/godmode/agentes/inventory_manager.php:124
 msgid "Username"
 msgstr "Usuario"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:173
-#: ../../godmode/agentes/module_manager_editor_data.php:98
-#: ../../godmode/agentes/module_manager_editor_plugin.php:144
+#: ../../godmode/agentes/module_manager_editor_wmi.php:179
+#: ../../godmode/agentes/module_manager_editor_data.php:104
+#: ../../godmode/agentes/module_manager_editor_plugin.php:150
 #: ../../godmode/agentes/module_manager_editor_prediction.php:127
 #: ../../godmode/agentes/module_manager_editor_network.php:152
 #: ../../godmode/modules/manage_network_components_form_wmi.php:96
@@ -2996,35 +2968,92 @@ msgstr "Usuario"
 msgid "Module type"
 msgstr "Tipo módulo"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:193
-#: ../../godmode/agentes/module_manager_editor_plugin.php:162
+#: ../../godmode/agentes/module_manager_editor_wmi.php:199
+#: ../../godmode/agentes/module_manager_editor_plugin.php:168
 #: ../../godmode/agentes/module_manager_editor_network.php:173
 #: ../../godmode/modules/manage_network_components_form_wmi.php:138
 msgid "Max. timeout"
 msgstr "Máx. tiempo de expiración"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:200
-#: ../../godmode/agentes/module_manager_editor_data.php:156
-#: ../../godmode/agentes/module_manager_editor_plugin.php:169
+#: ../../godmode/agentes/module_manager_editor_wmi.php:206
+#: ../../godmode/agentes/module_manager_editor_data.php:162
+#: ../../godmode/agentes/module_manager_editor_plugin.php:200
 #: ../../godmode/agentes/module_manager_editor_prediction.php:143
 #: ../../godmode/agentes/module_manager_editor_network.php:180
 #: ../../godmode/modules/manage_network_components_form_wmi.php:120
 #: ../../godmode/modules/manage_network_components_form_network.php:223
+#: ../../operation/agentes/status_monitor.php:82
 msgid "Module group"
 msgstr "Grupo módulos"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:223
-#: ../../godmode/agentes/module_manager_editor_data.php:119
-#: ../../godmode/agentes/module_manager_editor_plugin.php:192
-#: ../../godmode/agentes/module_manager_editor_network.php:274
+#: ../../godmode/agentes/module_manager_editor_wmi.php:230
+#: ../../godmode/agentes/module_manager_editor_data.php:192
+#: ../../godmode/agentes/module_manager_editor_plugin.php:173
+#: ../../godmode/agentes/module_manager_editor_network.php:251
+msgid "Warning status"
+msgstr "Estado advertencia"
+
+#: ../../godmode/agentes/module_manager_editor_wmi.php:231
+#: ../../godmode/agentes/module_manager_editor_wmi.php:236
+#: ../../godmode/agentes/module_manager_editor_data.php:193
+#: ../../godmode/agentes/module_manager_editor_data.php:198
+#: ../../godmode/agentes/module_manager_editor_plugin.php:174
+#: ../../godmode/agentes/module_manager_editor_plugin.php:179
+#: ../../godmode/agentes/module_manager_editor_network.php:252
+#: ../../godmode/agentes/module_manager_editor_network.php:257
+#: ../../godmode/alerts/configure_alert_template.php:456
+#: ../../include/functions_alerts.php:243
+#: ../../include/functions_reporting.php:563
+msgid "Min."
+msgstr "Mín."
+
+#: ../../godmode/agentes/module_manager_editor_wmi.php:232
+#: ../../godmode/agentes/module_manager_editor_wmi.php:237
+#: ../../godmode/agentes/module_manager_editor_data.php:194
+#: ../../godmode/agentes/module_manager_editor_data.php:199
+#: ../../godmode/agentes/module_manager_editor_plugin.php:175
+#: ../../godmode/agentes/module_manager_editor_plugin.php:180
+#: ../../godmode/agentes/module_manager_editor_network.php:253
+#: ../../godmode/agentes/module_manager_editor_network.php:258
+#: ../../godmode/alerts/configure_alert_template.php:459
+#: ../../include/functions_alerts.php:242
+#: ../../include/functions_reporting.php:564
+msgid "Max."
+msgstr "Máx."
+
+#: ../../godmode/agentes/module_manager_editor_wmi.php:235
+#: ../../godmode/agentes/module_manager_editor_data.php:197
+#: ../../godmode/agentes/module_manager_editor_plugin.php:178
+#: ../../godmode/agentes/module_manager_editor_network.php:256
+msgid "Critical status"
+msgstr "Estado crítico"
+
+#: ../../godmode/agentes/module_manager_editor_wmi.php:242
+#: ../../godmode/agentes/module_manager_editor_data.php:204
+#: ../../godmode/agentes/module_manager_editor_plugin.php:185
+#: ../../godmode/agentes/module_manager_editor_network.php:263
+msgid "Historical data"
+msgstr "Histórico de datos"
+
+#: ../../godmode/agentes/module_manager_editor_wmi.php:247
+#: ../../godmode/agentes/module_manager_editor_data.php:209
+#: ../../godmode/agentes/module_manager_editor_plugin.php:190
+#: ../../godmode/agentes/module_manager_editor_network.php:268
+msgid "FF threshold"
+msgstr "Umbral Flip-Flop"
+
+#: ../../godmode/agentes/module_manager_editor_wmi.php:254
+#: ../../godmode/agentes/module_manager_editor_data.php:125
+#: ../../godmode/agentes/module_manager_editor_plugin.php:223
+#: ../../godmode/agentes/module_manager_editor_network.php:275
 msgid "Post process"
 msgstr "Posprocesado"
 
-#: ../../godmode/agentes/module_manager_editor_wmi.php:228
-#: ../../godmode/agentes/module_manager_editor_data.php:124
-#: ../../godmode/agentes/module_manager_editor_plugin.php:197
+#: ../../godmode/agentes/module_manager_editor_wmi.php:259
+#: ../../godmode/agentes/module_manager_editor_data.php:130
+#: ../../godmode/agentes/module_manager_editor_plugin.php:228
 #: ../../godmode/agentes/module_manager_editor_prediction.php:148
-#: ../../godmode/agentes/module_manager_editor_network.php:279
+#: ../../godmode/agentes/module_manager_editor_network.php:280
 msgid "Export target"
 msgstr "Servidor de exportación"
 
@@ -3039,7 +3068,7 @@ msgstr "Módulos añadidos correctamente "
 #: ../../godmode/agentes/agent_template.php:88
 #: ../../godmode/agentes/manage_config_remote.php:80
 #: ../../godmode/agentes/alert_manager.php:27
-#: ../../godmode/agentes/manage_config.php:368
+#: ../../godmode/agentes/manage_config.php:357
 #: ../../godmode/agentes/modificar_agente.php:53
 #: ../../godmode/agentes/agent_manager.php:30
 #: ../../godmode/agentes/module_manager.php:25
@@ -3052,7 +3081,8 @@ msgid "Available templates"
 msgstr "Plantillas disponibles"
 
 #: ../../godmode/agentes/agent_template.php:107
-#: ../../godmode/agentes/alert_manager.php:200
+#: ../../godmode/agentes/alert_manager.php:263
+#: ../../operation/agentes/alerts_status.php:138
 msgid "Template"
 msgstr "Plantilla"
 
@@ -3065,11 +3095,11 @@ msgstr "Asignar"
 msgid "Assigned modules"
 msgstr "Módulos asignados"
 
-#: ../../godmode/agentes/module_manager_editor_data.php:75
+#: ../../godmode/agentes/module_manager_editor_data.php:81
 msgid "Data server module"
 msgstr "Módulo del servidor de datos"
 
-#: ../../godmode/agentes/module_manager_editor_data.php:166
+#: ../../godmode/agentes/module_manager_editor_data.php:172
 msgid "Not assigned"
 msgstr "Sin asignar"
 
@@ -3080,7 +3110,7 @@ msgstr "Copia de datos"
 
 #: ../../godmode/agentes/manage_config_remote.php:48
 #: ../../godmode/agentes/manage_config.php:48
-#: ../../godmode/agentes/manage_config.php:236
+#: ../../godmode/agentes/manage_config.php:224
 msgid "No selected agents to copy"
 msgstr "No se han seleccionado agentes destino para la copia"
 
@@ -3089,24 +3119,24 @@ msgid "copyage"
 msgstr "Copiando agente"
 
 #: ../../godmode/agentes/manage_config_remote.php:80
-#: ../../godmode/agentes/manage_config.php:368
+#: ../../godmode/agentes/manage_config.php:357
 msgid "Configuration Management"
 msgstr "Gestión de Configuraciones"
 
 #: ../../godmode/agentes/manage_config_remote.php:85
-#: ../../godmode/agentes/manage_config.php:373
+#: ../../godmode/agentes/manage_config.php:362
 msgid "Source group"
 msgstr "Grupo origen"
 
 #: ../../godmode/agentes/manage_config_remote.php:127
-#: ../../godmode/agentes/manage_config.php:412
+#: ../../godmode/agentes/manage_config.php:401
 #: ../../godmode/db/db_refine.php:73
 #: ../../operation/agentes/exportdata.php:262
 msgid "Get Info"
 msgstr "Obtener info."
 
 #: ../../godmode/agentes/manage_config_remote.php:132
-#: ../../godmode/agentes/manage_config.php:462
+#: ../../godmode/agentes/manage_config.php:451
 msgid "To Agent(s):"
 msgstr "Agente(s) destino"
 
@@ -3139,13 +3169,13 @@ msgid "Agents planned for this downtime"
 msgstr "Desconexión no planificada"
 
 #: ../../godmode/agentes/planned_downtime.php:225
-#: ../../godmode/users/user_list.php:61
+#: ../../godmode/users/user_list.php:54
 #: ../../operation/agentes/estado_generalagente.php:98
 #: ../../operation/agentes/estado_monitores.php:55
 #: ../../operation/agentes/ver_agente.php:56
 #: ../../operation/agentes/sla_view.php:50
-#: ../../operation/agentes/estado_agente.php:155
-#: ../../operation/users/user.php:32
+#: ../../operation/agentes/estado_agente.php:154
+#: ../../operation/users/user.php:37
 msgid "Last contact"
 msgstr "Último contacto"
 
@@ -3167,9 +3197,9 @@ msgid "Name #Ag."
 msgstr "Nombre"
 
 #: ../../godmode/agentes/planned_downtime.php:269
-#: ../../godmode/agentes/alert_manager.php:159
-#: ../../godmode/agentes/alert_manager.php:214
-#: ../../godmode/alerts/alert_templates.php:112
+#: ../../godmode/agentes/alert_manager.php:217
+#: ../../godmode/agentes/alert_manager.php:277
+#: ../../godmode/alerts/alert_templates.php:91
 #: ../../operation/messages/message.php:64
 #: ../../operation/messages/message.php:105
 #: ../../operation/messages/message.php:139
@@ -3194,179 +3224,217 @@ msgstr "Activo"
 msgid "Running"
 msgstr "Ejecutándose"
 
-#: ../../godmode/agentes/module_manager_editor_plugin.php:81
+#: ../../godmode/agentes/module_manager_editor_plugin.php:87
 msgid "Plugin server module"
 msgstr "Módulo del servidor WMI"
 
-#: ../../godmode/agentes/module_manager_editor_plugin.php:109
+#: ../../godmode/agentes/module_manager_editor_plugin.php:115
 msgid "plugin"
 msgstr "complemento"
 
-#: ../../godmode/agentes/module_manager_editor_plugin.php:126
+#: ../../godmode/agentes/module_manager_editor_plugin.php:132
 msgid "Plugin parameters"
 msgstr "Parámetros del complemento"
 
-#: ../../godmode/agentes/alert_manager.php:37
-#: ../../godmode/alerts/configure_alert_template.php:218
+#: ../../godmode/agentes/alert_manager.php:41
+#: ../../godmode/alerts/configure_alert_template.php:227
 #: ../../godmode/alerts/alert_actions.php:62
 #: ../../godmode/alerts/alert_commands.php:55
 msgid "Successfully created"
 msgstr "Creado correctamente"
 
-#: ../../godmode/agentes/alert_manager.php:38
-#: ../../godmode/alerts/configure_alert_template.php:219
+#: ../../godmode/agentes/alert_manager.php:42
+#: ../../godmode/alerts/configure_alert_template.php:228
 #: ../../godmode/alerts/alert_actions.php:63
 #: ../../godmode/alerts/alert_commands.php:56
 msgid "Could not be created"
 msgstr "No se pudo crear"
 
-#: ../../godmode/agentes/alert_manager.php:65
+#: ../../godmode/agentes/alert_manager.php:61
+#: ../../godmode/agentes/alert_manager.php:86
+#: ../../godmode/alerts/alert_templates.php:137
+#: ../../godmode/alerts/alert_actions.php:88
+#: ../../godmode/alerts/alert_commands.php:91
+msgid "Successfully deleted"
+msgstr "Borrado correctamente"
+
+#: ../../godmode/agentes/alert_manager.php:62
+#: ../../godmode/agentes/alert_manager.php:87
+#: ../../godmode/alerts/alert_templates.php:138
+#: ../../godmode/alerts/alert_actions.php:89
+#: ../../godmode/alerts/alert_commands.php:92
+msgid "Could not be deleted"
+msgstr "No se pudo borrar"
+
+#: ../../godmode/agentes/alert_manager.php:77
 msgid "Successfully added"
 msgstr "Añadido correctamente"
 
-#: ../../godmode/agentes/alert_manager.php:66
+#: ../../godmode/agentes/alert_manager.php:78
 msgid "Could not be added"
 msgstr "No se pudo añadir"
 
-#: ../../godmode/agentes/alert_manager.php:72
+#: ../../godmode/agentes/alert_manager.php:94
+msgid "Successfully enabled"
+msgstr "Activado correctamente"
+
+#: ../../godmode/agentes/alert_manager.php:95
+msgid "Could not be enabled"
+msgstr "No se pudo activar"
+
+#: ../../godmode/agentes/alert_manager.php:102
+msgid "Successfully disabled"
+msgstr "Desactivado correctamente"
+
+#: ../../godmode/agentes/alert_manager.php:103
+msgid "Could not be disabled"
+msgstr "No se pudo desactivar"
+
+#: ../../godmode/agentes/alert_manager.php:109
 msgid "Modules defined"
 msgstr "Módulos definidos"
 
-#: ../../godmode/agentes/alert_manager.php:102
+#: ../../godmode/agentes/alert_manager.php:137
 msgid "Latest value"
 msgstr "Último valor"
 
-#: ../../godmode/agentes/alert_manager.php:109
+#: ../../godmode/agentes/alert_manager.php:144
 msgid "Add alert"
 msgstr "Añadir alerta"
 
-#: ../../godmode/agentes/alert_manager.php:152 ../../include/functions.php:863
+#: ../../godmode/agentes/alert_manager.php:210
 msgid "Always"
 msgstr "Siempre"
 
-#: ../../godmode/agentes/alert_manager.php:154
+#: ../../godmode/agentes/alert_manager.php:212
 msgid "On"
 msgstr "Activado"
 
-#: ../../godmode/agentes/alert_manager.php:157
+#: ../../godmode/agentes/alert_manager.php:215
 msgid "Until"
 msgstr "Hasta"
 
-#: ../../godmode/agentes/alert_manager.php:160
-#: ../../godmode/agentes/alert_manager.php:216
-#: ../../godmode/alerts/alert_templates.php:114
+#: ../../godmode/agentes/alert_manager.php:218
+#: ../../godmode/agentes/alert_manager.php:279
+#: ../../godmode/alerts/alert_templates.php:93
 #: ../../operation/agentes/exportdata.php:118
 #: ../../operation/agentes/exportdata.php:138
 msgid "to"
 msgstr "a"
 
-#: ../../godmode/agentes/alert_manager.php:178
+#: ../../godmode/agentes/alert_manager.php:239
 msgid "Add action"
 msgstr "Añadir acción"
 
-#: ../../godmode/agentes/alert_manager.php:212
+#: ../../godmode/agentes/alert_manager.php:275
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
-#: ../../godmode/agentes/alert_manager.php:218
+#: ../../godmode/agentes/alert_manager.php:281
 msgid "matches of the alert"
 msgstr "coincidencias de la alerta"
 
+#: ../../godmode/agentes/alert_manager.php:397
+msgid "Disable"
+msgstr "Desactivar"
+
+#: ../../godmode/agentes/alert_manager.php:405
+msgid "Enable"
+msgstr "Activar"
+
 #: ../../godmode/agentes/manage_config.php:53
-#: ../../godmode/agentes/manage_config.php:241
+#: ../../godmode/agentes/manage_config.php:229
 #: ../../godmode/db/db_refine.php:46
 msgid "No modules have been selected"
 msgstr "No se ha seleccionado ningún módulo"
 
-#: ../../godmode/agentes/manage_config.php:71
+#: ../../godmode/agentes/manage_config.php:61
 msgid "You must check modules and/or alerts to be copied"
 msgstr "Debe comprobar los módulos y/o alertas para copiar"
 
-#: ../../godmode/agentes/manage_config.php:90
+#: ../../godmode/agentes/manage_config.php:84
 msgid "Copying module"
 msgstr "Copiando módulo"
 
-#: ../../godmode/agentes/manage_config.php:173
+#: ../../godmode/agentes/manage_config.php:171
 msgid "Copying alert"
 msgstr "Copiando alerta"
 
-#: ../../godmode/agentes/manage_config.php:219
+#: ../../godmode/agentes/manage_config.php:207
 msgid "There was an error copying the module, the copy has been cancelled"
 msgstr "Hubo un error al copiar el módulo. Se canceló la copia."
 
-#: ../../godmode/agentes/manage_config.php:222
+#: ../../godmode/agentes/manage_config.php:210
 msgid "Successfully copied module"
 msgstr "Módulo copiado correctamente"
 
-#: ../../godmode/agentes/manage_config.php:233
+#: ../../godmode/agentes/manage_config.php:221
 msgid "Agent Module Data Deletion"
 msgstr "Eliminación de módulo de datos de agentes"
 
-#: ../../godmode/agentes/manage_config.php:260
+#: ../../godmode/agentes/manage_config.php:248
 msgid "You must check modules and/or alerts to be deleted"
 msgstr "Debe comprobar módulos y/o alertas para borrar"
 
-#: ../../godmode/agentes/manage_config.php:325
-msgid ""
-"There was an error removing the module data, the removal has been cancelled"
-msgstr ""
-"Hubo un error al eliminar el módulo de datos. Se canceló la eliminación."
+#: ../../godmode/agentes/manage_config.php:314
+msgid "There was an error removing the module data, the removal has been cancelled"
+msgstr "Hubo un error al eliminar el módulo de datos. Se canceló la eliminación."
 
-#: ../../godmode/agentes/manage_config.php:328
+#: ../../godmode/agentes/manage_config.php:317
 msgid "Successfully removed module data"
 msgstr "Modulo de datos eliminado correctamente"
 
-#: ../../godmode/agentes/manage_config.php:340
+#: ../../godmode/agentes/manage_config.php:329
 msgid "Deleting Agent"
 msgstr "Borrando agente"
 
-#: ../../godmode/agentes/manage_config.php:347
+#: ../../godmode/agentes/manage_config.php:336
 msgid "You must select at least one agent to be removed"
 msgstr "Debe seleccionar al menos un agente para eliminar"
 
-#: ../../godmode/agentes/manage_config.php:354
+#: ../../godmode/agentes/manage_config.php:343
 msgid "There was an error removing the agents. Removal has been cancelled"
 msgstr "Hubo un error al eliminar los agentes. Se canceló la eliminación."
 
-#: ../../godmode/agentes/manage_config.php:356
+#: ../../godmode/agentes/manage_config.php:345
 msgid "Successfully removed agents"
 msgstr "Agentes eliminados correctamente"
 
-#: ../../godmode/agentes/manage_config.php:395
+#: ../../godmode/agentes/manage_config.php:384
 msgid "No Agents in this Group"
 msgstr "No hay agentes en este grupo"
 
-#: ../../godmode/agentes/manage_config.php:423
+#: ../../godmode/agentes/manage_config.php:412
 msgid "No modules for this agent"
 msgstr "No existen módulos para este agente"
 
-#: ../../godmode/agentes/manage_config.php:425
+#: ../../godmode/agentes/manage_config.php:414
 #: ../../godmode/db/db_refine.php:69
 #: ../../enterprise/operation/inventory/inventory.php:76
 msgid "No agent selected"
 msgstr "No hay ningún agente seleccionado"
 
-#: ../../godmode/agentes/manage_config.php:437
+#: ../../godmode/agentes/manage_config.php:426
 msgid "Targets"
 msgstr "Objetivos"
 
-#: ../../godmode/agentes/manage_config.php:469
+#: ../../godmode/agentes/manage_config.php:458
 msgid "Copy Modules/Alerts"
 msgstr "Copiar módulos/alertas"
 
-#: ../../godmode/agentes/manage_config.php:472
+#: ../../godmode/agentes/manage_config.php:461
 msgid "Delete Modules/Alerts"
 msgstr "Borrar módulos/alertas"
 
-#: ../../godmode/agentes/manage_config.php:472
+#: ../../godmode/agentes/manage_config.php:461
 msgid "Are you sure you want to delete these modules and alerts?"
 msgstr "¿Está seguro de que quiere borrar estos módulos y alertas?"
 
-#: ../../godmode/agentes/manage_config.php:475
+#: ../../godmode/agentes/manage_config.php:464
 msgid "Delete Agents"
 msgstr "Eliminar agentes"
 
-#: ../../godmode/agentes/manage_config.php:475
+#: ../../godmode/agentes/manage_config.php:464
 msgid "Are you sure you want to delete these agents?"
 msgstr "¿Está seguro de que quiere borrar estos agentes?"
 
@@ -3405,46 +3473,12 @@ msgstr "Comunidad SNMP"
 msgid "SNMP version"
 msgstr "Versión SNMP"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:251
-msgid "Warning status"
-msgstr "Estado advertencia"
-
-#: ../../godmode/agentes/module_manager_editor_network.php:252
-#: ../../godmode/agentes/module_manager_editor_network.php:257
-#: ../../godmode/agentes/alert_manager_editor.php:368
-#: ../../godmode/alerts/configure_alert_template.php:436
-#: ../../include/functions_alerts.php:243
-#: ../../operation/agentes/estado_alertas.php:123
-msgid "Min."
-msgstr "Mín."
-
-#: ../../godmode/agentes/module_manager_editor_network.php:253
-#: ../../godmode/agentes/module_manager_editor_network.php:258
-#: ../../godmode/agentes/alert_manager_editor.php:369
-#: ../../godmode/alerts/configure_alert_template.php:433
-#: ../../include/functions_alerts.php:242
-#: ../../operation/agentes/estado_alertas.php:123
-msgid "Max."
-msgstr "Máx."
-
-#: ../../godmode/agentes/module_manager_editor_network.php:256
-msgid "Critical status"
-msgstr "Estado crítico"
-
-#: ../../godmode/agentes/module_manager_editor_network.php:262
-msgid "Historical data"
-msgstr "Histórico de datos"
-
-#: ../../godmode/agentes/module_manager_editor_network.php:267
-msgid "FF threshold"
-msgstr "Umbral Flip-Flop"
-
-#: ../../godmode/agentes/module_manager_editor_network.php:295
+#: ../../godmode/agentes/module_manager_editor_network.php:296
 #: ../../godmode/modules/manage_network_components_form_network.php:252
 msgid "TCP send"
 msgstr "Enviar TCP"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:305
+#: ../../godmode/agentes/module_manager_editor_network.php:306
 #: ../../godmode/modules/manage_network_components_form_network.php:256
 msgid "TCP receive"
 msgstr "Recibir TCP"
@@ -3472,9 +3506,7 @@ msgstr "Buscar"
 #: ../../include/functions_events.php:204
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:58
 #: ../../operation/agentes/estado_generalagente.php:58
-#: ../../operation/agentes/estado_alertas.php:140
-#: ../../operation/agentes/estado_alertas.php:164
-#: ../../operation/events/events.php:261
+#: ../../operation/events/events.php:262
 msgid "Agent name"
 msgstr "Nombre del agente"
 
@@ -3497,7 +3529,7 @@ msgstr "No hay ningún agente definido"
 #: ../../godmode/agentes/modificar_agente.php:209
 #: ../../godmode/agentes/agent_manager.php:33
 #: ../../operation/snmpconsole/snmp_view.php:284
-#: ../../operation/agentes/estado_agente.php:328
+#: ../../operation/agentes/estado_agente.php:326
 msgid "Create agent"
 msgstr "Crear agente"
 
@@ -3572,27 +3604,27 @@ msgstr ""
 "Debe seleccionar un servidor de predicción para el agente, de manera que "
 "pueda funcionar correctamente con este tipo de módulos."
 
-#: ../../godmode/agentes/agent_manager.php:136
+#: ../../godmode/agentes/agent_manager.php:137
 msgid "Module definition"
 msgstr "Definición de módulos"
 
-#: ../../godmode/agentes/agent_manager.php:137
+#: ../../godmode/agentes/agent_manager.php:138
 msgid "Learning mode"
 msgstr "Modo de aprendizaje"
 
-#: ../../godmode/agentes/agent_manager.php:138
+#: ../../godmode/agentes/agent_manager.php:139
 msgid "Normal mode"
 msgstr "Modo normal"
 
-#: ../../godmode/agentes/agent_manager.php:143
+#: ../../godmode/agentes/agent_manager.php:144
 msgid "Active"
 msgstr "Activo"
 
-#: ../../godmode/agentes/agent_manager.php:146
+#: ../../godmode/agentes/agent_manager.php:147
 msgid "Remote configuration"
 msgstr "Configuración remota"
 
-#: ../../godmode/agentes/agent_manager.php:154
+#: ../../godmode/agentes/agent_manager.php:155
 msgid "Not available"
 msgstr "No disponible"
 
@@ -3629,146 +3661,6 @@ msgstr "Máx/Mín"
 msgid "No available data to show"
 msgstr "No se disponen datos para mostrar"
 
-#: ../../godmode/agentes/alert_manager_editor.php:24
-msgid "Alert association form"
-msgstr "Formulario de asociación de alerta"
-
-#: ../../godmode/agentes/alert_manager_editor.php:49
-msgid "Assigned module"
-msgstr "Módulo asignado"
-
-#: ../../godmode/agentes/alert_manager_editor.php:100
-msgid "Alert status"
-msgstr "Estado alertas"
-
-#: ../../godmode/agentes/alert_manager_editor.php:119
-msgid ""
-"Min. possible value to consider 'valid' values, below this limit, Pandora "
-"FMS will fire the alert"
-msgstr ""
-"Valor mínimo posible a considerar como «válido», por debajo de ese límite "
-"Pandora FMS disparará la alerta"
-
-#: ../../godmode/agentes/alert_manager_editor.php:125
-msgid ""
-"Max. possible value to consider 'valid' values, above this limit, Pandora "
-"FMS will fire the alert"
-msgstr ""
-"Valor máximo posible a considerar como «válido», por encima de ese límite "
-"Pandora FMS disparará la alerta"
-
-#: ../../godmode/agentes/alert_manager_editor.php:132
-msgid "Alert text"
-msgstr "Texto de la alerta"
-
-#: ../../godmode/agentes/alert_manager_editor.php:138
-msgid ""
-"This value must be al least Module Interval * (Min.Number of Alerts + 1)"
-msgstr ""
-"Este valor debe ser como mínimo, el intervalo del módulo multiplicado por el "
-"mínimo número de alertas + 1"
-
-#: ../../godmode/agentes/alert_manager_editor.php:160
-msgid "Other"
-msgstr "Otro"
-
-#: ../../godmode/agentes/alert_manager_editor.php:206
-#: ../../godmode/alerts/configure_alert_template.php:321
-msgid "Time from"
-msgstr "Hora desde"
-
-#: ../../godmode/agentes/alert_manager_editor.php:221
-#: ../../godmode/alerts/configure_alert_template.php:324
-msgid "Time to"
-msgstr "Hora hasta"
-
-#: ../../godmode/agentes/alert_manager_editor.php:237
-#: ../../godmode/alerts/configure_alert_template.php:305
-msgid "Days of week"
-msgstr "Días de la semana"
-
-#: ../../godmode/agentes/alert_manager_editor.php:239
-#: ../../godmode/alerts/configure_alert_template.php:306
-#: ../../include/functions.php:655
-msgid "Mon"
-msgstr "Lun"
-
-#: ../../godmode/agentes/alert_manager_editor.php:242
-#: ../../godmode/alerts/configure_alert_template.php:308
-#: ../../include/functions.php:657
-msgid "Tue"
-msgstr "Mar"
-
-#: ../../godmode/agentes/alert_manager_editor.php:245
-#: ../../godmode/alerts/configure_alert_template.php:310
-#: ../../include/functions.php:659
-msgid "Wed"
-msgstr "Mié"
-
-#: ../../godmode/agentes/alert_manager_editor.php:248
-#: ../../godmode/alerts/configure_alert_template.php:312
-#: ../../include/functions.php:661
-msgid "Thu"
-msgstr "Jue"
-
-#: ../../godmode/agentes/alert_manager_editor.php:251
-#: ../../godmode/alerts/configure_alert_template.php:314
-#: ../../include/functions.php:663
-msgid "Fri"
-msgstr "Vie"
-
-#: ../../godmode/agentes/alert_manager_editor.php:254
-#: ../../godmode/alerts/configure_alert_template.php:316
-#: ../../include/functions.php:665
-msgid "Sat"
-msgstr "Sáb"
-
-#: ../../godmode/agentes/alert_manager_editor.php:257
-#: ../../godmode/alerts/configure_alert_template.php:318
-#: ../../include/functions.php:667
-msgid "Sun"
-msgstr "Dom"
-
-#: ../../godmode/agentes/alert_manager_editor.php:261
-msgid "Field #2 (Rec)"
-msgstr "Campo #2 (Recup.)"
-
-#: ../../godmode/agentes/alert_manager_editor.php:266
-#: ../../godmode/alerts/configure_alert_template.php:367
-msgid "Alert recovery"
-msgstr "Recuperación de alerta"
-
-#: ../../godmode/agentes/alert_manager_editor.php:282
-msgid "Field #3 (Rec)"
-msgstr "Campo #3 (Recup.)"
-
-#: ../../godmode/agentes/alert_manager_editor.php:301
-msgid "Combined alert components"
-msgstr "Componentes de alerta combinada"
-
-#: ../../godmode/agentes/alert_manager_editor.php:314
-msgid "Source Agent/Alert"
-msgstr "Agente/Alerta origen"
-
-#: ../../godmode/agentes/alert_manager_editor.php:366
-#: ../../include/functions_db.php:1971
-msgid "Oper"
-msgstr "Operador"
-
-#: ../../godmode/agentes/alert_manager_editor.php:367
-#: ../../include/functions_reporting.php:550
-msgid "Threshold"
-msgstr "Umbral"
-
-#: ../../godmode/agentes/alert_manager_editor.php:370
-#: ../../include/functions_db.php:1975
-msgid "Time"
-msgstr "Hora"
-
-#: ../../godmode/agentes/alert_manager_editor.php:372
-msgid "info"
-msgstr "Info."
-
 #: ../../godmode/modules/manage_network_components.php:137
 #: ../../godmode/modules/manage_nc_groups.php:70
 #: ../../godmode/modules/manage_network_templates.php:43
@@ -3880,105 +3772,215 @@ msgstr "Actualización de módulos correcta"
 msgid "Defined modules"
 msgstr "Módulos definidos"
 
-#: ../../godmode/users/user_list.php:41
-msgid "There was a problem deleting user"
-msgstr "Ha habido un problema al eliminar el usuario"
-
-#: ../../godmode/users/user_list.php:43
+#: ../../godmode/users/user_list.php:34
 msgid "User successfully deleted"
 msgstr "Usuario eliminado correctamente"
 
-#: ../../godmode/users/user_list.php:47
-#: ../../godmode/users/configure_user.php:157
+#: ../../godmode/users/user_list.php:34
+msgid "There was a problem deleting the user"
+msgstr "Hubo un problema al borrar el usuario"
+
+#: ../../godmode/users/user_list.php:41
 msgid "User management"
 msgstr "Gestión de usuarios"
 
-#: ../../godmode/users/user_list.php:47
-#: ../../operation/users/user_statistics.php:25
-#: ../../operation/users/user.php:28
+#: ../../godmode/users/user_list.php:41
+#: ../../operation/users/user_statistics.php:24
+#: ../../operation/users/user.php:25
 msgid "Users defined in Pandora"
 msgstr "Usuarios definidos en Pandora"
 
-#: ../../godmode/users/user_list.php:59
-#: ../../godmode/users/configure_user.php:177
+#: ../../godmode/users/user_list.php:52
+#: ../../godmode/users/configure_user.php:131
 #: ../../include/functions_events.php:206
-#: ../../include/functions_reporting.php:300
+#: ../../include/functions_reporting.php:279
 #: ../../operation/snmpconsole/snmp_view.php:214
-#: ../../operation/events/events.php:270
-#: ../../operation/users/user_edit.php:109
+#: ../../operation/events/events.php:271
+#: ../../operation/users/user_edit.php:65 ../../operation/users/user.php:35
 msgid "User ID"
 msgstr "ID usuario"
 
-#: ../../godmode/users/user_list.php:64 ../../operation/users/user.php:33
+#: ../../godmode/users/user_list.php:55 ../../operation/users/user.php:38
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../godmode/users/user_list.php:92
-#: ../../godmode/users/configure_user.php:272
-#: ../../operation/users/user_edit.php:160 ../../operation/users/user.php:79
-msgid "This user doesn't have any assigned profile/group"
-msgstr "Este usuario no tiene ningún perfil/grupo asociado"
+#: ../../godmode/users/user_list.php:70
+#: ../../godmode/users/configure_user.php:138
+#: ../../operation/users/user_edit.php:72 ../../operation/users/user.php:54
+msgid "First name"
+msgstr "Nombre"
+
+#: ../../godmode/users/user_list.php:71
+#: ../../godmode/users/configure_user.php:141
+#: ../../operation/users/user_edit.php:75 ../../operation/users/user.php:55
+msgid "Last name"
+msgstr "Apellido"
+
+#: ../../godmode/users/user_list.php:72 ../../operation/users/user.php:56
+msgid "Phone"
+msgstr "Teléfono"
+
+#: ../../godmode/users/user_list.php:73
+#: ../../godmode/users/configure_user.php:169
+#: ../../operation/users/user_edit.php:91 ../../operation/users/user.php:57
+msgid "E-mail"
+msgstr "Correo-e"
+
+#: ../../godmode/users/user_list.php:93 ../../operation/users/user.php:77
+msgid "The user doesn't have any assigned profile/group"
+msgstr "El usuario no tiene ningún perfil/grupo asignnado"
 
 #: ../../godmode/users/user_list.php:115
-#: ../../godmode/users/configure_user.php:160
 msgid "Create user"
 msgstr "Crear usuario"
 
-#: ../../godmode/users/configure_user.php:57
-msgid "There was a problem loading user"
-msgstr "Ha habido un problema al cargar el usuario"
+#: ../../godmode/users/user_list.php:118
+#: ../../godmode/users/configure_user.php:52
+msgid ""
+"The current authentication scheme doesn't support creating users from "
+"Pandora FMS"
+msgstr ""
+"El esquema actual de autenticación no soporta la creación de usuarios desde "
+"Pandora FMS."
 
-#: ../../godmode/users/configure_user.php:82
-#: ../../godmode/users/configure_user.php:136
-#: ../../operation/users/user_edit.php:57
-#: ../../operation/users/user_edit.php:80
-msgid "Passwords don't match. Please repeat again"
-msgstr "Las contraseñas no coinciden. Inténtelo de nuevo"
+#: ../../godmode/users/user_list.php:136 ../../operation/users/user.php:101
+msgid "System incidents reading"
+msgstr "Incidentes activos"
+
+#: ../../godmode/users/user_list.php:137 ../../operation/users/user.php:102
+msgid "System incidents writing"
+msgstr "Incidentes activos, con comentarios"
+
+#: ../../godmode/users/user_list.php:138 ../../operation/users/user.php:103
+msgid "System incidents management"
+msgstr "Gestión de incidentes"
+
+#: ../../godmode/users/user_list.php:139 ../../operation/users/user.php:104
+msgid "Agents reading"
+msgstr "Agentes caídos"
+
+#: ../../godmode/users/user_list.php:140 ../../operation/users/user.php:105
+msgid "Agents management"
+msgstr "Gestión de agentes"
+
+#: ../../godmode/users/user_list.php:141 ../../operation/users/user.php:106
+msgid "Alerts editing"
+msgstr "Edición de alertas"
+
+#: ../../godmode/users/user_list.php:142 ../../operation/users/user.php:107
+msgid "Users management"
+msgstr "Gestión de usuarios"
+
+#: ../../godmode/users/user_list.php:143 ../../operation/users/user.php:108
+msgid "Database management"
+msgstr "Gestión de la BB. DD."
+
+#: ../../godmode/users/user_list.php:144 ../../operation/users/user.php:109
+msgid "Alerts management"
+msgstr "Gestión de alertas"
+
+#: ../../godmode/users/user_list.php:145 ../../operation/users/user.php:110
+msgid "Systems management"
+msgstr "Gestión de sistemas"
+
+#: ../../godmode/users/configure_user.php:73
+msgid "Passwords didn\\t match"
+msgstr "Las contraseñas no coinciden"
+
+#: ../../godmode/users/configure_user.php:84
+msgid "User successfully created"
+msgstr "Usuario creado correctamente"
+
+#: ../../godmode/users/configure_user.php:84
+msgid "Error creating user"
+msgstr "Error al crear el usuario"
+
+#: ../../godmode/users/configure_user.php:93
+#: ../../operation/users/user_edit.php:55
+msgid "User info successfully updated"
+msgstr "Información del usuario actualizada correctamente"
+
+#: ../../godmode/users/configure_user.php:93
+msgid "Error updating user info (no change?)"
+msgstr "Error al actualizar la información del usuario (¿no hubo cambios?)"
+
+#: ../../godmode/users/configure_user.php:101
+#: ../../operation/users/user_edit.php:49
+msgid "Password successfully updated"
+msgstr "Contraseña actualizada correctamente"
+
+#: ../../godmode/users/configure_user.php:101
+#: ../../operation/users/user_edit.php:49
+msgid "Error updating passwords"
+msgstr "Error al actualizar las contraseñas"
+
+#: ../../godmode/users/configure_user.php:103
+#: ../../operation/users/user_edit.php:51
+msgid "Passwords didn't match or other problem encountered while updating passwords"
+msgstr ""
+"Las contraseñas no coincidían o se encontró otro problema al actualizar las "
+"contraseñas"
+
+#: ../../godmode/users/configure_user.php:108
+msgid "User admin status succesfully update"
+msgstr "Estado de administrador correctamente actualizado"
+
+#: ../../godmode/users/configure_user.php:108
+msgid "Error updating admin status"
+msgstr "Error al actualizar el estado de administrador"
+
+#: ../../godmode/users/configure_user.php:113
+msgid "User profile succesfully created"
+msgstr "Perfil de usuario creado correctamente"
+
+#: ../../godmode/users/configure_user.php:113
+msgid "Error creating user profile"
+msgstr "Error al crear el perfil de usuario"
+
+#: ../../godmode/users/configure_user.php:118
+msgid "Error deleting profile"
+msgstr "Error al borrar el perfil"
+
+#: ../../godmode/users/configure_user.php:121
+#: ../../operation/users/user_edit.php:59 ../../operation/users/user.php:25
+msgid "Pandora users"
+msgstr "Usuarios de Pandora"
 
 #: ../../godmode/users/configure_user.php:121
 #: ../../operation/users/user_edit.php:59
-msgid "User successfully updated"
-msgstr "Usuario actualizado correctamente"
+msgid "User detail editor"
+msgstr "Editor de detalles de usuario"
 
-#: ../../godmode/users/configure_user.php:124
-msgid "There was a problem updating user"
-msgstr "Ha habido un problema al actualizar el usuario"
+#: ../../godmode/users/configure_user.php:135
+#: ../../operation/users/user_edit.php:69
+msgid "Full (display) name"
+msgstr "Nombre completo"
 
-#: ../../godmode/users/configure_user.php:148
-msgid "User creation failed"
-msgstr "Creación del usuario fallida"
+#: ../../godmode/users/configure_user.php:149
+#: ../../operation/users/user_edit.php:82
+msgid "New Password"
+msgstr "Contraseña nueva"
 
-#: ../../godmode/users/configure_user.php:150
-msgid "User created successfully"
-msgstr "Usuario creado correctamente"
-
-#: ../../godmode/users/configure_user.php:164
-msgid "Update user"
-msgstr "Actualizar usuario"
-
-#: ../../godmode/users/configure_user.php:179
-#: ../../operation/users/user_edit.php:112
-msgid "Real name"
-msgstr "Nombre Real"
-
-#: ../../godmode/users/configure_user.php:188
+#: ../../godmode/users/configure_user.php:151
+#: ../../operation/users/user_edit.php:84
 msgid "Password confirmation"
 msgstr "Confirmar contraseña"
 
-#: ../../godmode/users/configure_user.php:194
-#: ../../operation/users/user_edit.php:127
-msgid "Telephone"
-msgstr "Teléfono"
+#: ../../godmode/users/configure_user.php:154
+msgid ""
+"You can not change passwords from Pandora FMS under the current "
+"authentication scheme"
+msgstr "No puede cambiar las contraseñas desde Pandora FMS bajo el actual esquema de autenticación"
 
-#: ../../godmode/users/configure_user.php:196
+#: ../../godmode/users/configure_user.php:157
 msgid "Global Profile"
 msgstr "Perfil global"
 
-#: ../../godmode/users/configure_user.php:201
+#: ../../godmode/users/configure_user.php:159
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../../godmode/users/configure_user.php:203
+#: ../../godmode/users/configure_user.php:161
 msgid ""
 "This user has permissions to manage all. This is admin user and overwrites "
 "all permissions given in profiles/groups"
@@ -3987,26 +3989,46 @@ msgstr ""
 "administrador y sobreescribe todos los permisos otorgados en los perfiles/"
 "grupos"
 
-#: ../../godmode/users/configure_user.php:204
+#: ../../godmode/users/configure_user.php:162
 msgid "Standard user"
 msgstr "Usuario estándar"
 
-#: ../../godmode/users/configure_user.php:206
+#: ../../godmode/users/configure_user.php:164
 msgid ""
 "This user has separated permissions to view data in his group agents, create "
 "incidents belong to his groups, add notes in another incidents, create "
 "personal assignments or reviews and other tasks, on different profiles"
-msgstr "usuario hacia hacia grupos"
+msgstr ""
 
-#: ../../godmode/users/configure_user.php:221
+#: ../../godmode/users/configure_user.php:166
+msgid ""
+"You can not change admin status from Pandora FMS under the current "
+"authentication scheme"
+msgstr "No puede cambiar el estado de administración desde Pandora FMS bajo el actual esquema de autenticación"
+
+#: ../../godmode/users/configure_user.php:172
+#: ../../operation/users/user_edit.php:94
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: ../../godmode/users/configure_user.php:178
 msgid "Group(s) available"
 msgstr "Grupo(s) disponible(s)"
 
-#: ../../godmode/users/configure_user.php:251
-#: ../../operation/users/user_edit.php:140
+#: ../../godmode/users/configure_user.php:193
+#: ../../operation/users/user_edit.php:111
 msgid "Profiles/Groups assigned to this user"
 msgstr "Perfiles/Grupos asignados a este usuario"
 
+#: ../../godmode/users/configure_user.php:205
+msgid "Group name"
+msgstr "Nombre del grupo"
+
+#: ../../godmode/users/configure_user.php:230
+#: ../../operation/users/user_edit.php:134
+msgid "This user doesn't have any assigned profile/group"
+msgstr "Este usuario no tiene ningún perfil/grupo asociado"
+
 #: ../../godmode/db/db_info.php:42 ../../godmode/db/db_purge.php:41
 #: ../../godmode/db/db_main.php:40 ../../godmode/db/db_audit.php:72
 #: ../../godmode/db/db_refine.php:32 ../../godmode/db/db_event.php:45
@@ -4278,7 +4300,7 @@ msgid "Purge all audit data"
 msgstr "Borrar todos los datos de auditoría"
 
 #: ../../godmode/db/db_refine.php:41 ../../godmode/db/db_refine.php:46
-#: ../../include/functions.php:1046
+#: ../../include/functions.php:854
 msgid "Error"
 msgstr "Error"
 
@@ -4299,12 +4321,10 @@ msgid "Purge data out of these limits"
 msgstr "Purgar los datos fuera de esos límites"
 
 #: ../../godmode/db/db_refine.php:86 ../../godmode/db/db_refine.php:87
-#: ../../include/functions_reporting.php:548
 msgid "Minimum"
 msgstr "Mínimo"
 
 #: ../../godmode/db/db_refine.php:89 ../../godmode/db/db_refine.php:90
-#: ../../include/functions_reporting.php:549
 msgid "Maximum"
 msgstr "Máximo"
 
@@ -4358,7 +4378,6 @@ msgstr "Configurar comando de alerta"
 
 #: ../../godmode/alerts/configure_alert_command.php:54
 #: ../../godmode/alerts/configure_alert_action.php:59
-#: ../../godmode/alerts/configure_alert.php:84
 msgid "Command"
 msgstr "Comando"
 
@@ -4367,118 +4386,96 @@ msgid "Configure alert action"
 msgstr "Configurar acción de alerta"
 
 #: ../../godmode/alerts/configure_alert_action.php:63
-#: ../../godmode/alerts/configure_alert_template.php:348
+#: ../../godmode/alerts/configure_alert_template.php:360
 msgid "Field 1"
 msgstr "Campo 1"
 
 #: ../../godmode/alerts/configure_alert_action.php:66
-#: ../../godmode/alerts/configure_alert_template.php:351
-#: ../../godmode/alerts/configure_alert_template.php:373
+#: ../../godmode/alerts/configure_alert_template.php:363
+#: ../../godmode/alerts/configure_alert_template.php:385
 msgid "Field 2"
 msgstr "Campo 2"
 
 #: ../../godmode/alerts/configure_alert_action.php:69
-#: ../../godmode/alerts/configure_alert_template.php:354
-#: ../../godmode/alerts/configure_alert_template.php:377
+#: ../../godmode/alerts/configure_alert_template.php:366
+#: ../../godmode/alerts/configure_alert_template.php:389
 msgid "Field 3"
 msgstr "Campo 3"
 
 #: ../../godmode/alerts/configure_alert_action.php:72
-#: ../../godmode/alerts/configure_alert_template.php:357
+#: ../../godmode/alerts/configure_alert_template.php:369
 msgid "Command preview"
 msgstr "Vista previa del comando"
 
-#: ../../godmode/alerts/alert_templates.php:49
-#: ../../godmode/alerts/configure_alert_template.php:419
-#: ../../operation/snmpconsole/snmp_view.php:208
-msgid "Value"
-msgstr "Valor"
-
-#: ../../godmode/alerts/alert_templates.php:51
-msgid "Empty"
-msgstr "Vacío"
-
-#: ../../godmode/alerts/alert_templates.php:84
+#: ../../godmode/alerts/alert_templates.php:63
 msgid "Everyday"
 msgstr "Cada día"
 
-#: ../../godmode/alerts/alert_templates.php:86
+#: ../../godmode/alerts/alert_templates.php:65
 #: ../../operation/agentes/exportdata.php:54
 msgid "Monday"
 msgstr "Lunes"
 
-#: ../../godmode/alerts/alert_templates.php:87
+#: ../../godmode/alerts/alert_templates.php:66
 #: ../../operation/agentes/exportdata.php:54
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../../godmode/alerts/alert_templates.php:88
+#: ../../godmode/alerts/alert_templates.php:67
 #: ../../operation/agentes/exportdata.php:54
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: ../../godmode/alerts/alert_templates.php:89
+#: ../../godmode/alerts/alert_templates.php:68
 msgid "Thursday"
 msgstr "Jueves"
 
-#: ../../godmode/alerts/alert_templates.php:90
+#: ../../godmode/alerts/alert_templates.php:69
 #: ../../operation/agentes/exportdata.php:54
 msgid "Friday"
 msgstr "Sábado"
 
-#: ../../godmode/alerts/alert_templates.php:91
+#: ../../godmode/alerts/alert_templates.php:70
 #: ../../operation/agentes/exportdata.php:54
 msgid "Saturday"
 msgstr "Domingo"
 
-#: ../../godmode/alerts/alert_templates.php:92
+#: ../../godmode/alerts/alert_templates.php:71
 #: ../../operation/agentes/exportdata.php:54
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../../godmode/alerts/alert_templates.php:94
-#: ../../include/functions_db.php:1980
+#: ../../godmode/alerts/alert_templates.php:73
+#: ../../include/functions_db.php:1969
 msgid "Days"
 msgstr "Días"
 
-#: ../../godmode/alerts/alert_templates.php:94
+#: ../../godmode/alerts/alert_templates.php:73
 msgid "Every"
 msgstr "Cada"
 
-#: ../../godmode/alerts/alert_templates.php:104
+#: ../../godmode/alerts/alert_templates.php:83
 msgid "and"
 msgstr "y"
 
-#: ../../godmode/alerts/alert_templates.php:126
+#: ../../godmode/alerts/alert_templates.php:105
 msgid "Alert templates"
 msgstr "Plantillas de alertas"
 
-#: ../../godmode/alerts/alert_templates.php:142
-#: ../../godmode/alerts/configure_alert_template.php:228
+#: ../../godmode/alerts/alert_templates.php:121
+#: ../../godmode/alerts/configure_alert_template.php:239
 #: ../../godmode/alerts/alert_actions.php:79
 #: ../../godmode/alerts/alert_commands.php:74
 msgid "Successfully updated"
 msgstr "Actualizado correctamente"
 
-#: ../../godmode/alerts/alert_templates.php:143
-#: ../../godmode/alerts/configure_alert_template.php:229
+#: ../../godmode/alerts/alert_templates.php:122
+#: ../../godmode/alerts/configure_alert_template.php:240
 #: ../../godmode/alerts/alert_actions.php:80
 #: ../../godmode/alerts/alert_commands.php:75
 msgid "Could not be updated"
 msgstr "No se pudo actualizar"
 
-#: ../../godmode/alerts/alert_templates.php:158
-#: ../../godmode/alerts/alert_actions.php:88
-#: ../../godmode/alerts/alert_commands.php:91
-msgid "Successfully deleted"
-msgstr "Borrado correctamente"
-
-#: ../../godmode/alerts/alert_templates.php:159
-#: ../../godmode/alerts/alert_actions.php:89
-#: ../../godmode/alerts/alert_commands.php:92
-msgid "Could not be deleted"
-msgstr "No se pudo borrar"
-
 #: ../../godmode/alerts/configure_alert_template.php:40
 #: ../../godmode/alerts/configure_alert_template.php:43
 #: ../../godmode/alerts/configure_alert_template.php:55
@@ -4495,69 +4492,163 @@ msgstr "Condiciones"
 
 #: ../../godmode/alerts/configure_alert_template.php:55
 #: ../../godmode/alerts/configure_alert_template.php:58
-#: ../../include/functions_db.php:1974
+#: ../../include/functions_db.php:1963
 msgid "Firing"
 msgstr "Disparado"
 
 #: ../../godmode/alerts/configure_alert_template.php:70
 #: ../../godmode/alerts/configure_alert_template.php:73
-#: ../../include/functions.php:790 ../../include/functions.php:849
-#: ../../include/functions_db.php:1978
+#: ../../include/functions_db.php:1967
 msgid "Recovery"
 msgstr "Recuperación"
 
-#: ../../godmode/alerts/configure_alert_template.php:265
+#: ../../godmode/alerts/configure_alert_template.php:277
 msgid "Configure alert template"
 msgstr "Configurar plantilla de alerta"
 
-#: ../../godmode/alerts/configure_alert_template.php:343
+#: ../../godmode/alerts/configure_alert_template.php:317
+msgid "Days of week"
+msgstr "Días de la semana"
+
+#: ../../godmode/alerts/configure_alert_template.php:318
+#: ../../include/functions.php:655
+msgid "Mon"
+msgstr "Lun"
+
+#: ../../godmode/alerts/configure_alert_template.php:320
+#: ../../include/functions.php:657
+msgid "Tue"
+msgstr "Mar"
+
+#: ../../godmode/alerts/configure_alert_template.php:322
+#: ../../include/functions.php:659
+msgid "Wed"
+msgstr "Mié"
+
+#: ../../godmode/alerts/configure_alert_template.php:324
+#: ../../include/functions.php:661
+msgid "Thu"
+msgstr "Jue"
+
+#: ../../godmode/alerts/configure_alert_template.php:326
+#: ../../include/functions.php:663
+msgid "Fri"
+msgstr "Vie"
+
+#: ../../godmode/alerts/configure_alert_template.php:328
+#: ../../include/functions.php:665
+msgid "Sat"
+msgstr "Sáb"
+
+#: ../../godmode/alerts/configure_alert_template.php:330
+#: ../../include/functions.php:667
+msgid "Sun"
+msgstr "Dom"
+
+#: ../../godmode/alerts/configure_alert_template.php:333
+msgid "Time from"
+msgstr "Hora desde"
+
+#: ../../godmode/alerts/configure_alert_template.php:336
+msgid "Time to"
+msgstr "Hora hasta"
+
+#: ../../godmode/alerts/configure_alert_template.php:355
 msgid "Default action"
 msgstr "Acción predeterminada"
 
-#: ../../godmode/alerts/configure_alert_template.php:415
+#: ../../godmode/alerts/configure_alert_template.php:379
+msgid "Alert recovery"
+msgstr "Recuperación de alerta"
+
+#: ../../godmode/alerts/configure_alert_template.php:432
 msgid "Condition type"
 msgstr "Tipo de condición"
 
-#: ../../godmode/alerts/configure_alert_template.php:417
-msgid "Select"
-msgstr "Seleccionar"
+#: ../../godmode/alerts/configure_alert_template.php:437
+msgid "Trigger when matches the value"
+msgstr "Disparar cuando coincida con el valor"
 
-#: ../../godmode/alerts/configure_alert_template.php:426
+#: ../../godmode/alerts/configure_alert_template.php:441
+#: ../../include/functions_reporting.php:533
+#: ../../operation/snmpconsole/snmp_view.php:208
+msgid "Value"
+msgstr "Valor"
+
+#: ../../godmode/alerts/configure_alert_template.php:448
 msgid "The regular expression is valid"
 msgstr "La expresión regular es válida"
 
-#: ../../godmode/alerts/configure_alert_template.php:430
+#: ../../godmode/alerts/configure_alert_template.php:452
 msgid "The regular expression is not valid"
 msgstr "La expresión regular no es válida"
 
-#: ../../godmode/alerts/configure_alert_template.php:457
+#: ../../godmode/alerts/configure_alert_template.php:483
 msgid "Finish"
-msgstr ""
+msgstr "Finalizar"
 
-#: ../../godmode/alerts/configure_alert_template.php:460
+#: ../../godmode/alerts/configure_alert_template.php:486
 msgid "Next"
 msgstr "Siguiente"
 
+#: ../../godmode/alerts/configure_alert_template.php:500
+msgid "The alert would fire when the value matches <span id=\\\"value\\\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor coincida con <span id=\\\"value\\\"></"
+"span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:501
+msgid ""
+"The alert would fire when the value doesn't match <span id=\\\"value\\\"></"
+"span>"
+msgstr ""
+"La alerta se disparará cuando el valor no coincida con <span id=\\\"value\\"
+"\"></span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:502
+msgid "The alert would fire when the value is <span id=\\\"value\\\"></span>"
+msgstr "La alerta se disparará cuando el valor sea <span id=\\\"value\\\"></span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:503
+msgid "The alert would fire when the value is not <span id=\\\"value\\\"></span>"
+msgstr "La alerta se disparará cuando el valor no sea <span id=\\\"value\\\"></span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:504
+msgid ""
+"The alert would fire when the value is between <span id=\\\"min\\\"></span> "
+"and <span id=\\\"max\\\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor esté entre <span id=\\\"min\\\"></"
+"span> y <span id=\\\"max\\\"></span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:505
+msgid ""
+"The alert would fire when the value is not between <span id=\\\"min\\\"></"
+"span> and <span id=\\\"max\\\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor no esté entre <span id=\\\"min\\\"></"
+"span> y <span id=\\\"max\\\"></span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:506
+msgid "The alert would fire when the value is under <span id=\\\"min\\\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor sea inferior a <span id=\\\"min\\\"></"
+"span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:507
+msgid "The alert would fire when the value is over <span id=\\\"max\\\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor sea superior a <span id=\\\"min\\\"></"
+"span>"
+
+#: ../../godmode/alerts/configure_alert_template.php:546
+msgid "Empty"
+msgstr "Vacío"
+
 #: ../../godmode/alerts/alert_actions.php:44
 msgid "Alert actions"
 msgstr "Acciones de alerta"
 
-#: ../../godmode/alerts/configure_alert.php:46
-msgid "There was a problem loading alert"
-msgstr "Ha habido un error al cargar la configuración de la alerta"
-
-#: ../../godmode/alerts/configure_alert.php:58
-msgid "Alert configuration"
-msgstr "Configuración de alertas"
-
-#: ../../godmode/alerts/configure_alert.php:63
-msgid "Modify alert"
-msgstr "Modificar alerta"
-
-#: ../../godmode/alerts/configure_alert.php:79
-msgid "Alert name"
-msgstr "Nombre de la alerta"
-
 #: ../../godmode/alerts/alert_commands.php:42
 msgid "Alert commands"
 msgstr "Comandos de alerta"
@@ -4583,7 +4674,7 @@ msgid "Closed incidents"
 msgstr "Incidentes cerrados"
 
 #: ../../include/functions_events.php:177
-#: ../../operation/events/events.php:415
+#: ../../operation/events/events.php:416
 msgid "No events"
 msgstr "No hay eventos"
 
@@ -4596,12 +4687,12 @@ msgid "St"
 msgstr "Es"
 
 #: ../../include/functions_events.php:202
-#: ../../include/functions_reporting.php:299
-#: ../../operation/events/events.php:259
+#: ../../include/functions_reporting.php:278
+#: ../../operation/events/events.php:260
 msgid "Event name"
 msgstr "Nombre del evento"
 
-#: ../../include/functions_events.php:230 ../../include/functions.php:1041
+#: ../../include/functions_events.php:230 ../../include/functions.php:849
 msgid "Alert recovered"
 msgstr "Alerta recuperada"
 
@@ -4609,24 +4700,20 @@ msgstr "Alerta recuperada"
 msgid "Alert manually validated"
 msgstr "Alerta validada manualmente"
 
-#: ../../include/functions_events.php:236 ../../include/functions.php:1038
-#: ../../operation/agentes/status_monitor.php:209
-#: ../../operation/agentes/status_monitor.php:229
+#: ../../include/functions_events.php:236 ../../include/functions.php:846
 msgid "Monitor up"
 msgstr "Monitor funcionando"
 
-#: ../../include/functions_events.php:239 ../../include/functions.php:1039
-#: ../../operation/agentes/status_monitor.php:211
-#: ../../operation/agentes/status_monitor.php:229
+#: ../../include/functions_events.php:239 ../../include/functions.php:847
 msgid "Monitor down"
 msgstr "Monitor caído"
 
-#: ../../include/functions_events.php:242 ../../include/functions.php:877
-#: ../../include/functions.php:1040 ../../include/functions_db.php:2063
+#: ../../include/functions_events.php:242 ../../include/functions.php:848
+#: ../../include/functions_db.php:2052 ../../include/functions_ui.php:279
 #: ../../operation/snmpconsole/snmp_view.php:335
+#: ../../operation/agentes/alerts_status.php:111
 #: ../../operation/agentes/bulbs.php:29
-#: ../../operation/agentes/estado_agente.php:306
-#: ../../operation/agentes/estado_alertas.php:105
+#: ../../operation/agentes/estado_agente.php:304
 msgid "Alert fired"
 msgstr "Alerta lanzada"
 
@@ -4638,15 +4725,15 @@ msgstr "Equipo detectado por el servidor de reconocimiento"
 #: ../../operation/snmpconsole/snmp_view.php:156
 #: ../../operation/snmpconsole/snmp_view.php:221
 #: ../../operation/snmpconsole/snmp_view.php:384
-#: ../../operation/events/events.php:356
+#: ../../operation/events/events.php:357
 msgid "Alert"
 msgstr "Alerta"
 
-#: ../../include/functions_visual_map.php:150
+#: ../../include/functions_visual_map.php:213
 msgid "Static graph"
 msgstr "Imagen estática"
 
-#: ../../include/functions_visual_map.php:151
+#: ../../include/functions_visual_map.php:214
 #: ../../enterprise/include/functions_reporting_pdf.php:127
 msgid "Module graph"
 msgstr "Gráfico de módulo"
@@ -4667,28 +4754,6 @@ msgstr "Igual a"
 msgid "Not equal to"
 msgstr "Diferente a "
 
-#: ../../include/functions_alerts.php:253 ../../include/functions.php:926
-#: ../../include/functions.php:1037 ../../include/functions_db.php:1195
-#: ../../enterprise/extensions/cron/functions.php:42
-#: ../../enterprise/include/functions_reporting_pdf.php:187
-#: ../../operation/reporting/reporting_viewer.php:225
-#: ../../operation/reporting/reporting_xml.php:212
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: ../../include/functions_alerts.php:501
-#: ../../include/functions_alerts.php:502
-#: ../../include/functions_alerts.php:503
-#: ../../include/functions_alerts.php:504 ../../include/functions.php:498
-#: ../../include/functions.php:500
-#: ../../operation/visual_console/render_view.php:78
-#: ../../operation/visual_console/render_view.php:79
-#: ../../operation/visual_console/render_view.php:80
-#: ../../operation/visual_console/render_view.php:81
-#: ../../operation/visual_console/render_view.php:82
-msgid "minutes"
-msgstr "minutos"
-
 #: ../../include/functions.php:194
 msgid "You don't have access"
 msgstr "No tiene acceso"
@@ -4713,189 +4778,176 @@ msgstr ","
 msgid "months"
 msgstr "meses"
 
-#: ../../include/functions.php:794
-msgid "Alert Ctrl."
-msgstr "Control de alerta"
-
-#: ../../include/functions.php:796 ../../include/functions.php:860
-msgid "Firing days"
-msgstr "Disparabilidad"
-
-#: ../../include/functions.php:853
-msgid "Fires every"
-msgstr "Se dispara cada"
-
-#: ../../include/functions.php:862
-msgid "Firing times"
-msgstr ""
-
-#: ../../include/functions.php:877
-msgid "times"
-msgstr "veces"
-
-#: ../../include/functions.php:880
-#: ../../operation/agentes/estado_alertas.php:107
-msgid "Alert disabled"
-msgstr "Alerta desactivada"
-
-#: ../../include/functions.php:883 ../../include/functions_db.php:2065
-#: ../../operation/snmpconsole/snmp_view.php:337
-#: ../../operation/agentes/bulbs.php:37
-#: ../../operation/agentes/estado_agente.php:308
-#: ../../operation/agentes/estado_alertas.php:106
-msgid "Alert not fired"
-msgstr "Alerta no lanzada"
-
-#: ../../include/functions.php:899
+#: ../../include/functions.php:707
 #: ../../operation/reporting/reporting_viewer.php:147
-#: ../../operation/reporting/reporting_xml.php:169
+#: ../../operation/reporting/reporting_xml.php:165
 msgid "Simple graph"
 msgstr "Gráfica simple"
 
-#: ../../include/functions.php:900
+#: ../../include/functions.php:708
 #: ../../enterprise/include/functions_reporting_pdf.php:151
 #: ../../operation/reporting/reporting_viewer.php:161
-#: ../../operation/reporting/reporting_xml.php:175
+#: ../../operation/reporting/reporting_xml.php:171
 msgid "Custom graph"
 msgstr "Gráfica combinada"
 
-#: ../../include/functions.php:901
+#: ../../include/functions.php:709
 #: ../../enterprise/include/functions_reporting_pdf.php:164
 #: ../../operation/reporting/reporting_viewer.php:192
-#: ../../operation/reporting/reporting_xml.php:193
-#: ../../operation/agentes/ver_agente.php:223
+#: ../../operation/reporting/reporting_xml.php:189
+#: ../../operation/agentes/ver_agente.php:217
 #: ../../operation/agentes/sla_view.php:47
 #: ../../operation/agentes/sla_view.php:148
-msgid "S.L.A"
+msgid "S.L.A."
 msgstr "S.L.A."
 
-#: ../../include/functions.php:902
+#: ../../include/functions.php:710
 #: ../../enterprise/include/functions_reporting_pdf.php:215
 #: ../../operation/reporting/reporting_viewer.php:256
-#: ../../operation/reporting/reporting_xml.php:225
+#: ../../operation/reporting/reporting_xml.php:221
 msgid "Event report"
 msgstr "Informe de eventos"
 
-#: ../../include/functions.php:903
+#: ../../include/functions.php:711
 #: ../../enterprise/include/functions_reporting_pdf.php:226
 #: ../../operation/reporting/reporting_viewer.php:272
-#: ../../operation/reporting/reporting_xml.php:233
+#: ../../operation/reporting/reporting_xml.php:229
 msgid "Alert report"
 msgstr "Informe de alertas"
 
-#: ../../include/functions.php:904
+#: ../../include/functions.php:712
 #: ../../enterprise/include/functions_reporting_pdf.php:249
 #: ../../operation/reporting/reporting_viewer.php:286
-#: ../../operation/reporting/reporting_xml.php:240
+#: ../../operation/reporting/reporting_xml.php:236
 msgid "Monitor report"
 msgstr "Informe de monitores"
 
-#: ../../include/functions.php:908
+#: ../../include/functions.php:716
 #: ../../enterprise/include/functions_reporting_pdf.php:285
 #: ../../operation/reporting/reporting_viewer.php:349
-#: ../../operation/reporting/reporting_xml.php:262
+#: ../../operation/reporting/reporting_xml.php:258
 msgid "Sumatory"
 msgstr "Sumatorio"
 
-#: ../../include/functions.php:909
+#: ../../include/functions.php:717
 msgid "General group report"
 msgstr "Informe general del grupo"
 
-#: ../../include/functions.php:911
+#: ../../include/functions.php:719
 #: ../../enterprise/include/functions_reporting_pdf.php:324
 #: ../../operation/reporting/reporting_viewer.php:391
-#: ../../operation/reporting/reporting_xml.php:281
+#: ../../operation/reporting/reporting_xml.php:277
 msgid "Agents detailed view"
 msgstr "Vista detallada de agentes"
 
-#: ../../include/functions.php:1042
+#: ../../include/functions.php:850
 msgid "Alert ceased"
 msgstr "Alerta finalizada"
 
-#: ../../include/functions.php:1043
+#: ../../include/functions.php:851
 msgid "Alert manual validation"
 msgstr "Validación manual de alerta"
 
-#: ../../include/functions.php:1044
+#: ../../include/functions.php:852
 msgid "Recon host detected"
 msgstr "Equipo de red detectado con Recon"
 
-#: ../../include/functions_db.php:1183
+#: ../../include/functions_db.php:1158
 msgid "Software agent data"
 msgstr "Datos del agente de software"
 
-#: ../../include/functions_db.php:1186
+#: ../../include/functions_db.php:1161
 msgid "Software agent monitor"
 msgstr "Monitores del agente de software"
 
-#: ../../include/functions_db.php:1189
+#: ../../include/functions_db.php:1164
 msgid "Network agent data"
 msgstr "Datos del agente de red"
 
-#: ../../include/functions_db.php:1192
+#: ../../include/functions_db.php:1167
 msgid "Network agent monitor"
 msgstr "Monitores del agente de red"
 
-#: ../../include/functions_db.php:1856
+#: ../../include/functions_db.php:1849
 msgid "Wrong module type"
 msgstr "Tipo módulo"
 
-#: ../../include/functions_db.php:1973
+#: ../../include/functions_db.php:1960
+msgid "Oper"
+msgstr "Operador"
+
+#: ../../include/functions_db.php:1962
 msgid "Tt"
 msgstr "UT"
 
-#: ../../include/functions_db.php:1977
+#: ../../include/functions_db.php:1964
+msgid "Time"
+msgstr "Hora"
+
+#: ../../include/functions_db.php:1966
 msgid "Desc"
 msgstr "Descripción"
 
-#: ../../include/functions_db.php:1979
+#: ../../include/functions_db.php:1968
 msgid "MinMax.Al"
 msgstr "Alertas Mín/Máx"
 
-#: ../../include/functions_db.php:1981
+#: ../../include/functions_db.php:1970
 #: ../../operation/snmpconsole/snmp_view.php:385
 msgid "Fired"
 msgstr "Lanzada"
 
-#: ../../include/functions_reporting.php:349
+#: ../../include/functions_db.php:2054 ../../include/functions_ui.php:285
+#: ../../operation/snmpconsole/snmp_view.php:337
+#: ../../operation/agentes/alerts_status.php:112
+#: ../../operation/agentes/bulbs.php:37
+#: ../../operation/agentes/estado_agente.php:306
+msgid "Alert not fired"
+msgstr "Alerta no lanzada"
+
+#: ../../include/functions_reporting.php:332
 msgid "Alert description"
 msgstr "Descripción de la alerta"
 
-#: ../../include/functions_reporting.php:350
-#: ../../include/functions_reporting.php:552
+#: ../../include/functions_reporting.php:333
+#: ../../include/functions_reporting.php:536
 msgid "Times Fired"
 msgstr "Número de veces lanzada"
 
-#: ../../include/functions_reporting.php:396
+#: ../../include/functions_reporting.php:381
 #: ../../enterprise/include/functions_reporting_pdf.php:236
 msgid "Total alerts monitored"
 msgstr "Alertas totales monitorizadas"
 
-#: ../../include/functions_reporting.php:445
+#: ../../include/functions_reporting.php:430
 #: ../../enterprise/include/functions_reporting_pdf.php:311
 msgid "Total monitors"
 msgstr "Total de monitores"
 
-#: ../../include/functions_reporting.php:446
+#: ../../include/functions_reporting.php:431
 #: ../../enterprise/include/functions_reporting_pdf.php:312
 msgid "Monitors down on period"
 msgstr "Monitores inactivos en un periodo"
 
-#: ../../include/functions_reporting.php:481
-#: ../../include/functions_reporting.php:587
+#: ../../include/functions_reporting.php:466
+#: ../../include/functions_reporting.php:597
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../include/functions_reporting.php:526
+#: ../../include/functions_reporting.php:511
 #: ../../enterprise/include/functions_reporting_pdf.php:293
 msgid "Agents in group"
 msgstr "Agentes en el grupo"
 
-#: ../../include/functions_reporting.php:588
+#: ../../include/functions_reporting.php:534
+msgid "Threshold"
+msgstr "Umbral"
+
+#: ../../include/functions_reporting.php:598
 msgid "Last failure"
 msgstr "Último fallo"
 
-#: ../../include/functions_reporting.php:683
+#: ../../include/functions_reporting.php:693
 #: ../../enterprise/include/functions_reporting_pdf.php:342
 msgid "Monitors"
 msgstr "Monitores"
@@ -4908,6 +4960,59 @@ msgstr "Petición procesada correctamente"
 msgid "Error processing request"
 msgstr "Error al procesar la petición"
 
+#: ../../include/functions_ui.php:279
+msgid "times"
+msgstr "veces"
+
+#: ../../include/functions_ui.php:282
+#: ../../operation/agentes/alerts_status.php:113
+msgid "Alert disabled"
+msgstr "Alerta desactivada"
+
+#: ../../include/functions_ui.php:331
+msgid "The alert would fire when the value is <span id=\"value\"></span>"
+msgstr "La alerta se disparará cuando el valor sea <span id=\"value\"></span>"
+
+#: ../../include/functions_ui.php:335
+msgid "The alert would fire when the value is not <span id=\"value\"></span>"
+msgstr "La alerta se disparará cuando el valor no sea <span id=\"value\"></span>"
+
+#: ../../include/functions_ui.php:340
+msgid "The alert would fire when the value matches <span id=\"value\"></span>"
+msgstr "La alerta se disparará cuando el valor coincida con <span id=\"value\"></span>"
+
+#: ../../include/functions_ui.php:343
+msgid "The alert would fire when the value doesn't match <span id=\"value\"></span>"
+msgstr "La alerta se disparará cuando el valor no coincida con <span id=\"value\"></span>"
+
+#: ../../include/functions_ui.php:349
+msgid ""
+"The alert would fire when the value is between <span id=\"min\"></span> and "
+"<span id=\"max\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor esté entre <span id=\"min\"></span> y "
+"<span id=\"max\"></span>"
+
+#: ../../include/functions_ui.php:352
+msgid ""
+"The alert would fire when the value is not between <span id=\"min\"></span> "
+"and <span id=\"max\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor no esté entre <span id=\"min\"></span> y "
+"<span id=\"max\"></span>"
+
+#: ../../include/functions_ui.php:356
+msgid "The alert would fire when the value is over <span id=\"max\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor esté por encima de <span id=\"min\"></"
+"span>"
+
+#: ../../include/functions_ui.php:361
+msgid "The alert would fire when the value is under <span id=\"min\"></span>"
+msgstr ""
+"La alerta se disparará cuando el valor esté por debajo de <span id=\"min\"></"
+"span>"
+
 #: ../../enterprise/extensions/cron.php:43
 msgid "Send custom report by email"
 msgstr "Enviar informe personalizado por correo-e"
@@ -5200,12 +5305,11 @@ msgstr "Código"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:169
 #: ../../operation/reporting/reporting_viewer.php:201
-#: ../../operation/reporting/reporting_xml.php:197
+#: ../../operation/reporting/reporting_xml.php:193
 msgid "There are no SLAs defined"
 msgstr "No hay SLA definidos"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:172
-#: ../../operation/agentes/estado_alertas.php:122
 msgid "Info"
 msgstr "Info"
 
@@ -5298,8 +5402,7 @@ msgstr ""
 "derecha del elemento."
 
 #: ../../enterprise/dashboard/widgets/example.php:26
-msgid ""
-"To do so, just click on the title and drag and drop it to the desired place."
+msgid "To do so, just click on the title and drag and drop it to the desired place."
 msgstr ""
 "Para hacerlo, simplemente pulse en la barra de título, arrastre y suéltela "
 "en el lugar deseado."
@@ -5312,10 +5415,19 @@ msgstr "Gracias por usar Pandora FMS"
 msgid "Show a list of global monitor health"
 msgstr "Mostrar una lista de la salud global de los monitores"
 
+#: ../../enterprise/dashboard/widgets/monitor_health.php:16
+#: ../../enterprise/dashboard/widgets/monitor_health.php:75
+msgid "Global health"
+msgstr "Salud global"
+
 #: ../../enterprise/dashboard/widgets/monitor_health.php:72
 msgid "of monitors UP"
 msgstr "de monitores funcionando"
 
+#: ../../enterprise/dashboard/widgets/monitor_health.php:73
+msgid "Data health"
+msgstr "Estado de los datos"
+
 #: ../../enterprise/dashboard/widgets/monitor_health.php:74
 msgid "of modules with updated data"
 msgstr "de módulos con datos actualizados"
@@ -5439,7 +5551,7 @@ msgstr "ID"
 
 #: ../../operation/incidents/incident.php:258
 #: ../../operation/incidents/incident_detail.php:239
-#: ../../operation/events/events.php:264
+#: ../../operation/events/events.php:265
 msgid "Source"
 msgstr "Origen"
 
@@ -5458,7 +5570,7 @@ msgstr "Hacerse propietario"
 
 #: ../../operation/incidents/incident.php:317
 #: ../../operation/incidents/incident_detail.php:206
-#: ../../operation/events/events.php:432
+#: ../../operation/events/events.php:433
 msgid "Create incident"
 msgstr "Crear incidente"
 
@@ -5541,7 +5653,7 @@ msgid "Opened at"
 msgstr "Abierto el"
 
 #: ../../operation/incidents/incident_detail.php:221
-#: ../../operation/servers/view_server_detail.php:95
+#: ../../operation/servers/view_server_detail.php:96
 msgid "Updated at"
 msgstr "Actualizado el"
 
@@ -5611,28 +5723,28 @@ msgstr ""
 msgid "Configuration detail"
 msgstr "Detalle de configuración"
 
-#: ../../operation/servers/view_server_detail.php:92
+#: ../../operation/servers/view_server_detail.php:93
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../../operation/servers/view_server_detail.php:104
+#: ../../operation/servers/view_server_detail.php:105
 msgid "Force"
 msgstr "Forzar"
 
-#: ../../operation/servers/view_server_detail.php:113
+#: ../../operation/servers/view_server_detail.php:114
 msgid "Done"
 msgstr "Hecho"
 
-#: ../../operation/servers/view_server_detail.php:115
+#: ../../operation/servers/view_server_detail.php:116
 msgid "Pending"
 msgstr "Pendiente"
 
-#: ../../operation/servers/view_server_detail.php:142
+#: ../../operation/servers/view_server_detail.php:143
 msgid "This server has no recon tasks assigned"
 msgstr "No hay ninguna tarea de reconocimiento configurada"
 
 #: ../../operation/servers/view_server.php:55
-#: ../../operation/agentes/tactical.php:221
+#: ../../operation/agentes/tactical.php:174
 msgid "Load"
 msgstr "Carga"
 
@@ -5645,7 +5757,7 @@ msgid "Version"
 msgstr "Versión"
 
 #: ../../operation/servers/view_server.php:90
-#: ../../operation/agentes/tactical.php:241
+#: ../../operation/agentes/tactical.php:194
 msgid "of"
 msgstr "de"
 
@@ -5669,30 +5781,13 @@ msgstr "Modo a pantalla completa"
 msgid "Back to normal mode"
 msgstr "Volver a modo normal"
 
-#: ../../operation/visual_console/render_view.php:76
-#: ../../operation/visual_console/render_view.php:77
-msgid "Seconds"
-msgstr "Segundos"
-
-#: ../../operation/visual_console/render_view.php:86
-msgid "Autorefresh time"
-msgstr "Tiempo de autorefresco"
-
-#: ../../operation/visual_console/render_view.php:88
-msgid "Refresh"
-msgstr "Refrescar"
-
-#: ../../operation/visual_console/render_view.php:119
-msgid "Until refresh"
-msgstr "Hasta refrescar"
-
 #: ../../operation/visual_console/index.php:24 ../../operation/menu.php:59
 msgid "Visual console"
 msgstr "Consola visual"
 
 #: ../../operation/visual_console/index.php:24
 #: ../../operation/agentes/estado_agente.php:38
-#: ../../operation/agentes/tactical.php:180
+#: ../../operation/agentes/tactical.php:133
 msgid "Summary"
 msgstr "Lista de agentes"
 
@@ -5712,7 +5807,7 @@ msgstr "Vista táctica"
 msgid "Group view"
 msgstr "Vista de grupo"
 
-#: ../../operation/menu.php:41 ../../operation/agentes/networkmap.php:250
+#: ../../operation/menu.php:41 ../../operation/agentes/networkmap.php:256
 msgid "Network Map"
 msgstr "Mapa de red"
 
@@ -5785,13 +5880,13 @@ msgid "Error updating event"
 msgstr "Error al actualizar el evento"
 
 #: ../../operation/snmpconsole/snmp_view.php:101
-#: ../../operation/agentes/networkmap.php:252
+#: ../../operation/agentes/networkmap.php:258
 #: ../../operation/events/events.php:106
 msgid "Normal screen"
 msgstr "Pantalla normal"
 
 #: ../../operation/snmpconsole/snmp_view.php:104
-#: ../../operation/agentes/networkmap.php:254
+#: ../../operation/agentes/networkmap.php:260
 #: ../../operation/events/events.php:109
 msgid "Full screen"
 msgstr "Pantalla completa"
@@ -5838,9 +5933,9 @@ msgstr "Ver detalles del agente"
 #: ../../operation/snmpconsole/snmp_view.php:346
 #: ../../operation/snmpconsole/snmp_view.php:368
 #: ../../operation/snmpconsole/snmp_view.php:391
-#: ../../operation/agentes/estado_alertas.php:126
-#: ../../operation/agentes/estado_alertas.php:187
-#: ../../operation/events/events.php:408
+#: ../../operation/agentes/alerts_status.php:141
+#: ../../operation/agentes/alerts_status.php:194
+#: ../../operation/events/events.php:409
 msgid "Validate"
 msgstr "Validar"
 
@@ -5853,85 +5948,74 @@ msgstr "¿Está seguro?"
 msgid "No matching traps found"
 msgstr "No se encontraron traps coincidentes"
 
-#: ../../operation/agentes/networkmap.php:250
+#: ../../operation/agentes/networkmap.php:256
 #: ../../operation/agentes/status_monitor.php:33
 #: ../../operation/agentes/estado_generalagente.php:41
 #: ../../operation/agentes/estado_grupo.php:32
+#: ../../operation/agentes/alerts_status.php:87
 #: ../../operation/agentes/estado_ultimopaquete.php:42
 #: ../../operation/agentes/exportdata.php:96
 #: ../../operation/agentes/exportdata.php:234
 #: ../../operation/agentes/estado_agente.php:38
-#: ../../operation/agentes/estado_alertas.php:78
 #: ../../operation/agentes/tactical.php:50
 msgid "Pandora Agents"
 msgstr "Agentes de Pandora FMS"
 
-#: ../../operation/agentes/networkmap.php:269
+#: ../../operation/agentes/networkmap.php:275
 msgid "Layout"
 msgstr "Diseño"
 
-#: ../../operation/agentes/networkmap.php:273
+#: ../../operation/agentes/networkmap.php:279
 msgid "No Overlap"
 msgstr "Sin solapamiento"
 
-#: ../../operation/agentes/networkmap.php:277
+#: ../../operation/agentes/networkmap.php:283
 msgid "Simple"
 msgstr "Simple"
 
-#: ../../operation/agentes/networkmap.php:281
+#: ../../operation/agentes/networkmap.php:287
 msgid "Regenerate"
 msgstr "Regenerar"
 
-#: ../../operation/agentes/networkmap.php:296
+#: ../../operation/agentes/networkmap.php:302
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../../operation/agentes/networkmap.php:304
+#: ../../operation/agentes/networkmap.php:310
 msgid "Distance between nodes"
 msgstr "Distancia entre nodos"
 
-#: ../../operation/agentes/networkmap.php:310
+#: ../../operation/agentes/networkmap.php:316
 msgid "Font"
 msgstr "mes"
 
-#: ../../operation/agentes/networkmap.php:350
-#: ../../operation/agentes/networkmap.php:359
+#: ../../operation/agentes/networkmap.php:369
+#: ../../operation/agentes/networkmap.php:378
 msgid "Map could not be generated"
 msgstr "El mapa no pudo ser generado"
 
 #: ../../operation/agentes/status_monitor.php:33
-#: ../../operation/agentes/estado_monitores.php:103
+#: ../../operation/agentes/estado_monitores.php:109
 msgid "Full list of Monitors"
 msgstr "Lista completa de monitores"
 
-#: ../../operation/agentes/status_monitor.php:64
+#: ../../operation/agentes/status_monitor.php:68
 msgid "Monitor status"
 msgstr "Estado del monitor"
 
-#: ../../operation/agentes/status_monitor.php:67
-#: ../../operation/agentes/ver_agente.php:81
-#: ../../operation/agentes/tactical.php:113
-msgid "Monitors down"
-msgstr "Monitores caídos"
+#: ../../operation/agentes/status_monitor.php:75
+msgid "Not normal"
+msgstr "No normal"
 
-#: ../../operation/agentes/status_monitor.php:68
-msgid "Monitors up"
-msgstr "Monitores funcionando"
-
-#: ../../operation/agentes/status_monitor.php:69
-#: ../../operation/agentes/tactical.php:118
-msgid "Monitors unknown"
-msgstr "Monitores desconocidos"
-
-#: ../../operation/agentes/status_monitor.php:88
+#: ../../operation/agentes/status_monitor.php:103
 msgid "Free text"
 msgstr "Texto libre"
 
-#: ../../operation/agentes/status_monitor.php:176
+#: ../../operation/agentes/status_monitor.php:203
 msgid "Module Name"
 msgstr "Nombre del módulo"
 
-#: ../../operation/agentes/status_monitor.php:231
+#: ../../operation/agentes/status_monitor.php:259
 msgid "This group doesn't have any monitor"
 msgstr "Este grupo no tiene ningún monitor definido"
 
@@ -5975,18 +6059,6 @@ msgstr "Últimos eventos para este agente"
 msgid "There are no defined groups"
 msgstr "No hay grupos definidos"
 
-#: ../../operation/agentes/estado_grupo.php:162
-msgid "Modules critical"
-msgstr "Módulos críticos"
-
-#: ../../operation/agentes/estado_grupo.php:166
-msgid "Modules normal"
-msgstr "Módulos normales"
-
-#: ../../operation/agentes/estado_grupo.php:170
-msgid "Modules warning"
-msgstr "Módulos en advertencia"
-
 #: ../../operation/agentes/estado_grupo.php:180
 msgid "Agents down"
 msgstr "Agentes caídos"
@@ -5999,6 +6071,32 @@ msgstr "Deshabilitar alertas"
 msgid "Agents"
 msgstr "Agentes"
 
+#: ../../operation/agentes/alerts_status.php:95
+msgid "Alert(s) validated"
+msgstr "Alerta(s) validada(s)"
+
+#: ../../operation/agentes/alerts_status.php:96
+msgid "Error processing alert(s)"
+msgstr "Error al procesar la(s) alerta(s)"
+
+#: ../../operation/agentes/alerts_status.php:111
+#: ../../operation/agentes/alerts_status.php:112
+#: ../../operation/agentes/alerts_status.php:113
+msgid "Click to filter"
+msgstr "Pulsar para filtrar"
+
+#: ../../operation/agentes/alerts_status.php:142
+msgid "Single alerts"
+msgstr "Alertas simples"
+
+#: ../../operation/agentes/alerts_status.php:169
+msgid "No simple alerts found"
+msgstr "No se encontró ninguna alerta simple"
+
+#: ../../operation/agentes/alerts_status.php:172
+msgid "Combined alerts"
+msgstr "Alertas asignadas"
+
 #: ../../operation/agentes/estado_ultimopaquete.php:43
 msgid "Display of last data modules received by agent"
 msgstr "Contenido de los últimos paquetes enviados por el agente"
@@ -6010,7 +6108,7 @@ msgstr "Itv."
 #: ../../operation/agentes/estado_ultimopaquete.php:56
 #: ../../operation/agentes/exportdata.php:175
 #: ../../operation/agentes/datos_agente.php:75
-#: ../../operation/agentes/ver_agente.php:205
+#: ../../operation/agentes/ver_agente.php:199
 msgid "Data"
 msgstr "Datos"
 
@@ -6022,7 +6120,7 @@ msgstr "Gráfico"
 msgid "Raw Data"
 msgstr "Datos"
 
-#: ../../operation/agentes/estado_ultimopaquete.php:221
+#: ../../operation/agentes/estado_ultimopaquete.php:218
 msgid "This agent doesn't have any module"
 msgstr "Este agente no tiene ningún módulo definido"
 
@@ -6038,7 +6136,7 @@ msgstr "CRÍTICO"
 msgid "NORMAL"
 msgstr "NORMAL"
 
-#: ../../operation/agentes/estado_monitores.php:101
+#: ../../operation/agentes/estado_monitores.php:107
 msgid "This agent doesn't have any active monitors"
 msgstr "Este agente no tienen ningún monitor activo"
 
@@ -6117,7 +6215,7 @@ msgstr "Exportar"
 #: ../../operation/agentes/bulbs.php:23
 #: ../../operation/agentes/sla_view.php:111
 #: ../../operation/agentes/sla_view.php:186
-#: ../../operation/agentes/estado_agente.php:294
+#: ../../operation/agentes/estado_agente.php:292
 msgid "All Monitors OK"
 msgstr "Todos los monitores BIEN"
 
@@ -6137,12 +6235,12 @@ msgid "Agent without monitors"
 msgstr "Agente sin monitores"
 
 #: ../../operation/agentes/bulbs.php:33
-#: ../../operation/agentes/estado_agente.php:297
+#: ../../operation/agentes/estado_agente.php:295
 msgid "Agent without data"
 msgstr "Agente sin datos"
 
 #: ../../operation/agentes/bulbs.php:35
-#: ../../operation/agentes/estado_agente.php:287
+#: ../../operation/agentes/estado_agente.php:286
 msgid "Agent down"
 msgstr "Agente caído"
 
@@ -6158,21 +6256,15 @@ msgstr "IP principal"
 msgid "Last remote contact"
 msgstr "Último contacto remoto"
 
-#: ../../operation/agentes/ver_agente.php:147
-#: ../../operation/agentes/estado_alertas.php:89
-msgid "Alert(s) validated"
-msgstr "Alerta(s) validada(s)"
+#: ../../operation/agentes/ver_agente.php:81
+msgid "Monitors down"
+msgstr "Monitores caídos"
 
-#: ../../operation/agentes/ver_agente.php:147
-#: ../../operation/agentes/estado_alertas.php:89
-msgid "Error processing alert(s)"
-msgstr "Error al procesar la(s) alerta(s)"
-
-#: ../../operation/agentes/ver_agente.php:186
+#: ../../operation/agentes/ver_agente.php:180
 msgid "Manage"
 msgstr "Gestionar"
 
-#: ../../operation/agentes/ver_agente.php:196
+#: ../../operation/agentes/ver_agente.php:190
 msgid "Main"
 msgstr "Principal"
 
@@ -6188,99 +6280,60 @@ msgstr "SLA Automáticos para los monitores"
 msgid "User-defined SLA items"
 msgstr "Elementos SLA definidos por el usuario"
 
-#: ../../operation/agentes/estado_agente.php:290
+#: ../../operation/agentes/estado_agente.php:288
 msgid "At least one module in CRITICAL status"
 msgstr "Al menos un módulo está en estado CRÍTICO"
 
-#: ../../operation/agentes/estado_agente.php:292
+#: ../../operation/agentes/estado_agente.php:290
 msgid "At least one module in WARNING status"
 msgstr "Al menos un módulo está en estado ADVERTENCIA"
 
-#: ../../operation/agentes/estado_agente.php:319
+#: ../../operation/agentes/estado_agente.php:317
 msgid "There are no agents included in this group"
 msgstr "No hay ningún agente incluido en este grupo"
 
-#: ../../operation/agentes/estado_alertas.php:78
-msgid "Full list of Alerts"
-msgstr "Lista completa de alertas"
-
-#: ../../operation/agentes/estado_alertas.php:81
-msgid "Full list of alerts"
-msgstr "Lista completa de alertas"
-
-#: ../../operation/agentes/estado_alertas.php:105
-#: ../../operation/agentes/estado_alertas.php:106
-#: ../../operation/agentes/estado_alertas.php:107
-msgid "Click to filter"
-msgstr "Pulsar para filtrar"
-
-#: ../../operation/agentes/estado_alertas.php:136
-msgid "Single alerts"
-msgstr "Alertas simples"
-
-#: ../../operation/agentes/estado_alertas.php:160
-msgid "No simple alerts found"
-msgstr "No se encontró ninguna alerta simple"
-
-#: ../../operation/agentes/estado_alertas.php:163
-msgid "Combined alerts"
-msgstr "Alertas asignadas"
-
-#: ../../operation/agentes/estado_alertas.php:182
-msgid "No combined alerts found"
-msgstr "No se encontró ninguna alerta combinada"
-
-#: ../../operation/agentes/tactical.php:100
-#: ../../operation/agentes/tactical.php:103
+#: ../../operation/agentes/tactical.php:88
+#: ../../operation/agentes/tactical.php:91
 msgid "Monitor checks"
 msgstr "Comprobaciones de monitores"
 
-#: ../../operation/agentes/tactical.php:108
-msgid "Monitors good"
-msgstr "Monitores bien"
+#: ../../operation/agentes/tactical.php:96
+msgid "Monitors normal"
+msgstr "Monitores en normal"
 
-#: ../../operation/agentes/tactical.php:123
+#: ../../operation/agentes/tactical.php:101
+msgid "Monitors warning"
+msgstr "Monitores en advertencia"
+
+#: ../../operation/agentes/tactical.php:106
+msgid "Monitors critical"
+msgstr "Monitores en crítico"
+
+#: ../../operation/agentes/tactical.php:111
+msgid "Monitors unknown"
+msgstr "Monitores en desconocido"
+
+#: ../../operation/agentes/tactical.php:116
 msgid "Monitors not init"
-msgstr "Monitores no inic."
+msgstr "Monitores no inicializados"
 
-#: ../../operation/agentes/tactical.php:140
-#: ../../operation/agentes/tactical.php:143
-msgid "Data checks"
-msgstr "Comprobaciones de datos"
-
-#: ../../operation/agentes/tactical.php:148
-msgid "Data good"
-msgstr "Datos bien"
-
-#: ../../operation/agentes/tactical.php:153
-msgid "Data down"
-msgstr "Datos caídos"
-
-#: ../../operation/agentes/tactical.php:158
-msgid "Data unknown"
-msgstr "Datos desconocidos"
-
-#: ../../operation/agentes/tactical.php:163
-msgid "Data not init"
-msgstr "Datos no inic."
-
-#: ../../operation/agentes/tactical.php:183
+#: ../../operation/agentes/tactical.php:136
 msgid "Total Agents"
 msgstr "Total agentes"
 
-#: ../../operation/agentes/tactical.php:188
+#: ../../operation/agentes/tactical.php:141
 msgid "Total Checks"
-msgstr "Total"
+msgstr "Comprobaciones totales"
 
-#: ../../operation/agentes/tactical.php:193
+#: ../../operation/agentes/tactical.php:146
 msgid "Uninitialized modules"
 msgstr "Módulos no inic."
 
-#: ../../operation/agentes/tactical.php:216
+#: ../../operation/agentes/tactical.php:169
 msgid "Tactical server information"
 msgstr "Vista táctica del servidor"
 
-#: ../../operation/agentes/tactical.php:222
+#: ../../operation/agentes/tactical.php:175
 msgid "Lag"
 msgstr "Retraso"
 
@@ -6365,133 +6418,97 @@ msgstr "Máx. horas de antiguedad"
 msgid "User ack."
 msgstr "Validación del usuario"
 
-#: ../../operation/events/events.php:213
+#: ../../operation/events/events.php:214
 msgid "Marquee display"
 msgstr "Marquesina deslizante"
 
-#: ../../operation/events/events.php:215
+#: ../../operation/events/events.php:216
 msgid "RSS Events"
 msgstr "Eventos RSS"
 
-#: ../../operation/events/events.php:298
+#: ../../operation/events/events.php:299
 msgid "Alert Recovered"
 msgstr "Alerta recuperada"
 
-#: ../../operation/events/events.php:301
+#: ../../operation/events/events.php:302
 msgid "Manual Alert Validation"
 msgstr "Validación manual de alerta"
 
-#: ../../operation/events/events.php:304
+#: ../../operation/events/events.php:305
 msgid "Going up Warning"
 msgstr ""
 
-#: ../../operation/events/events.php:307
+#: ../../operation/events/events.php:308
 msgid "Going up Critical"
 msgstr ""
 
-#: ../../operation/events/events.php:310
+#: ../../operation/events/events.php:311
 msgid "Going to Normal"
 msgstr ""
 
-#: ../../operation/events/events.php:313
+#: ../../operation/events/events.php:314
 msgid "Going down Warning"
 msgstr ""
 
-#: ../../operation/events/events.php:317
+#: ../../operation/events/events.php:318
 msgid "Alert Fired"
 msgstr "Alerta disparada"
 
-#: ../../operation/events/events.php:323
+#: ../../operation/events/events.php:324
 msgid "Host Detected (Recon)"
 msgstr "Equipo detectado (Recon)"
 
-#: ../../operation/events/events.php:326
+#: ../../operation/events/events.php:327
 msgid "New Agent"
 msgstr "Agente nuevo"
 
-#: ../../operation/events/events.php:330
+#: ../../operation/events/events.php:331
 msgid "Unknown type"
 msgstr "Tipo desconocido"
 
-#: ../../operation/events/events.php:356
+#: ../../operation/events/events.php:357
 msgid "SNMP"
 msgstr "SNMP"
 
-#: ../../operation/events/events.php:422
+#: ../../operation/events/events.php:423
 msgid "Validated event"
 msgstr "Evento validado"
 
-#: ../../operation/events/events.php:424
+#: ../../operation/events/events.php:425
 msgid "Not validated event"
 msgstr "Evento no validado"
 
-#: ../../operation/events/events.php:428
+#: ../../operation/events/events.php:429
 msgid "Validate event"
 msgstr "Validar evento"
 
-#: ../../operation/events/events.php:430
+#: ../../operation/events/events.php:431
 msgid "Delete event"
 msgstr "Eliminar evento"
 
-#: ../../operation/users/user_statistics.php:26
+#: ../../operation/users/user_statistics.php:24
 msgid "User activity statistics"
 msgstr "Estadísticas de actividad de los usuarios"
 
-#: ../../operation/users/user_edit.php:83 ../../operation/users/user.php:27
-msgid "Pandora users"
-msgstr "Usuarios de Pandora"
+#: ../../operation/users/user_edit.php:55
+msgid "Error updating user info"
+msgstr "Error al actualizar la información del usuario"
 
-#: ../../operation/users/user_edit.php:84
-msgid "User detail editor"
-msgstr "Editor de detalles de usuario"
+#: ../../operation/users/user_edit.php:79
+msgid "Current password"
+msgstr "Contraseña actual"
 
-#: ../../operation/users/user_edit.php:119
-msgid "confirmation"
-msgstr "confirmación"
+#: ../../operation/users/user_edit.php:87
+msgid ""
+"You can not change your password from Pandora FMS under the current "
+"authentication scheme"
+msgstr "No puede cambiar su contraseña desde Pandora FMS bajo el actual esquema de autenticación"
 
-#: ../../operation/users/user.php:31
-msgid "UserID"
-msgstr "ID de usuario"
-
-#: ../../operation/users/user.php:102
-msgid "System incidents reading"
-msgstr "Incidentes activos"
-
-#: ../../operation/users/user.php:105
-msgid "System incidents writing"
-msgstr "Incidentes activos, con comentarios"
-
-#: ../../operation/users/user.php:108
-msgid "System incidents management"
-msgstr "Gestión de incidentes"
-
-#: ../../operation/users/user.php:111
-msgid "Agents reading"
-msgstr "Agentes caídos"
-
-#: ../../operation/users/user.php:114
-msgid "Agents management"
-msgstr "Gestión de agentes"
-
-#: ../../operation/users/user.php:117
-msgid "Alerts edition"
-msgstr "Edición de alertas"
-
-#: ../../operation/users/user.php:120
-msgid "Users management"
-msgstr "Gestión de usuarios"
-
-#: ../../operation/users/user.php:123
-msgid "Database management"
-msgstr "Gestión de la BB. DD."
-
-#: ../../operation/users/user.php:126
-msgid "Alerts management"
-msgstr "Gestión de alertas"
-
-#: ../../operation/users/user.php:129
-msgid "Pandora system management"
-msgstr "Sistema de gestión de Pandora FMS"
+#: ../../operation/users/user_edit.php:104
+msgid ""
+"You can not change your user info from Pandora FMS under the current "
+"authentication scheme"
+msgstr "No puede cambiar su información de usuario desde Pandora FMS bajo el actual esquema de autenticación"
 
 #: ../../operation/messages/message.php:26
 msgid "Message successfully sent"
@@ -6554,3 +6571,4 @@ msgstr "Remitente"
 #: ../../operation/messages/message.php:215
 msgid "No subject"
 msgstr "Sin asunto"
+
diff --git a/pandora_console/include/languages/index.pot b/pandora_console/include/languages/index.pot
index 436fc01098..777318d033 100644
--- a/pandora_console/include/languages/index.pot
+++ b/pandora_console/include/languages/index.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-22 13:20+0100\n"
+"POT-Creation-Date: 2009-01-28 12:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,14 +30,14 @@ msgstr ""
 #: ../../include/functions.php:714
 #: ../../enterprise/include/functions_reporting_pdf.php:269
 #: ../../operation/reporting/reporting_viewer.php:319
-#: ../../operation/reporting/reporting_xml.php:252
+#: ../../operation/reporting/reporting_xml.php:248
 msgid "Max. Value"
 msgstr ""
 
 #: ../../reporting/stat_win.php:139 ../../include/functions.php:713
 #: ../../enterprise/include/functions_reporting_pdf.php:261
 #: ../../operation/reporting/reporting_viewer.php:304
-#: ../../operation/reporting/reporting_xml.php:247
+#: ../../operation/reporting/reporting_xml.php:243
 msgid "Avg. Value"
 msgstr ""
 
@@ -50,7 +50,7 @@ msgstr ""
 #: ../../include/functions.php:715
 #: ../../enterprise/include/functions_reporting_pdf.php:277
 #: ../../operation/reporting/reporting_viewer.php:334
-#: ../../operation/reporting/reporting_xml.php:257
+#: ../../operation/reporting/reporting_xml.php:253
 msgid "Min. Value"
 msgstr ""
 
@@ -90,91 +90,111 @@ msgstr ""
 msgid "Show alerts"
 msgstr ""
 
-#: ../../reporting/fgraph.php:955
+#: ../../reporting/fgraph.php:958
 msgid "Data occurrence for module "
 msgstr ""
 
-#: ../../reporting/fgraph.php:1047 ../../include/functions_incidents.php:26
+#: ../../reporting/fgraph.php:1043 ../../include/functions_incidents.php:26
 msgid "Informative"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1048 ../../include/functions_incidents.php:27
+#: ../../reporting/fgraph.php:1044 ../../include/functions_incidents.php:27
 msgid "Low"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1049 ../../include/functions_incidents.php:28
+#: ../../reporting/fgraph.php:1045 ../../include/functions_incidents.php:28
 msgid "Medium"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1050 ../../include/functions_incidents.php:29
+#: ../../reporting/fgraph.php:1046 ../../include/functions_incidents.php:29
 msgid "Serious"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1051 ../../include/functions_incidents.php:30
+#: ../../reporting/fgraph.php:1047 ../../include/functions_incidents.php:30
 msgid "Very serious"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1052 ../../reporting/fgraph.php:1268
+#: ../../reporting/fgraph.php:1048 ../../reporting/fgraph.php:1187
 #: ../../include/functions_incidents.php:31 ../../include/functions.php:617
 #: ../../include/functions.php:866 ../../include/functions.php:885
 msgid "Maintenance"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1276 ../../include/functions.php:620
+#: ../../reporting/fgraph.php:1095 ../../reporting/fgraph.php:1121
+#: ../../reporting/fgraph.php:1162 ../../reporting/fgraph.php:1284
+msgid "Other"
+msgstr ""
+
+#: ../../reporting/fgraph.php:1098 ../../include/functions_alerts.php:253
+#: ../../include/functions.php:734 ../../include/functions.php:845
+#: ../../include/functions_db.php:1170
+#: ../../enterprise/extensions/cron/functions.php:42
+#: ../../enterprise/include/functions_reporting_pdf.php:187
+#: ../../operation/reporting/reporting_viewer.php:225
+#: ../../operation/reporting/reporting_xml.php:208
+#: ../../operation/agentes/status_monitor.php:74
+msgid "Unknown"
+msgstr ""
+
+#: ../../reporting/fgraph.php:1165 ../../reporting/fgraph.php:1287
+msgid "SYSTEM"
+msgstr ""
+
+#: ../../reporting/fgraph.php:1195 ../../include/functions.php:620
 #: ../../include/functions.php:867 ../../include/functions.php:887
 msgid "Informational"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1283 ../../include/functions.php:623
+#: ../../reporting/fgraph.php:1202 ../../include/functions.php:623
 #: ../../include/functions.php:868 ../../include/functions.php:889
 #: ../../operation/agentes/status_monitor.php:71
 #: ../../operation/agentes/estado_grupo.php:223
 msgid "Normal"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1290 ../../include/functions.php:626
+#: ../../reporting/fgraph.php:1209 ../../include/functions.php:626
 #: ../../include/functions.php:869 ../../include/functions.php:891
 #: ../../operation/agentes/status_monitor.php:72
 #: ../../operation/agentes/estado_grupo.php:225
 msgid "Warning"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1297 ../../include/functions.php:629
+#: ../../reporting/fgraph.php:1216 ../../include/functions.php:629
 #: ../../include/functions.php:870 ../../include/functions.php:893
 #: ../../operation/agentes/status_monitor.php:73
 #: ../../operation/agentes/estado_grupo.php:227
 msgid "Critical"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1476
+#: ../../reporting/fgraph.php:1385
 msgid "Today"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1477
+#: ../../reporting/fgraph.php:1386
 msgid "Week"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1478
+#: ../../reporting/fgraph.php:1387
 msgid "Month"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1479
+#: ../../reporting/fgraph.php:1388
 msgid "Months"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1480
+#: ../../reporting/fgraph.php:1389
 msgid "Older"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1520
+#: ../../reporting/fgraph.php:1429
 msgid "no data"
 msgstr ""
 
-#: ../../reporting/fgraph.php:1587
+#: ../../reporting/fgraph.php:1496
 msgid "Out of limits"
 msgstr ""
 
-#: ../../reporting/fgraph.php:2148 ../../include/functions_reporting.php:378
+#: ../../reporting/fgraph.php:2057 ../../include/functions_reporting.php:380
 #: ../../enterprise/include/functions_reporting_pdf.php:235
 #: ../../operation/agentes/estado_grupo.php:175
 #: ../../operation/agentes/ver_agente.php:116
@@ -182,15 +202,15 @@ msgstr ""
 msgid "Alerts fired"
 msgstr ""
 
-#: ../../reporting/fgraph.php:2149
+#: ../../reporting/fgraph.php:2058
 msgid "Alerts not fired"
 msgstr ""
 
-#: ../../reporting/fgraph.php:2158
+#: ../../reporting/fgraph.php:2067
 msgid "Monitors BAD"
 msgstr ""
 
-#: ../../reporting/fgraph.php:2159
+#: ../../reporting/fgraph.php:2068
 msgid "Monitors OK"
 msgstr ""
 
@@ -233,10 +253,8 @@ msgstr ""
 #: ../../godmode/agentes/module_manager_editor_wmi.php:172
 #: ../../godmode/agentes/module_manager_editor_plugin.php:144
 #: ../../godmode/modules/manage_network_components_form_wmi.php:182
-#: ../../godmode/users/configure_user.php:184
+#: ../../godmode/users/configure_user.php:144
 #: ../../enterprise/godmode/agentes/inventory_manager.php:126
-#: ../../operation/users/user_edit.php:116
-#: ../../operation/users/user_edit.php:120
 msgid "Password"
 msgstr ""
 
@@ -324,7 +342,7 @@ msgstr ""
 #: ../../enterprise/include/functions_reporting_pdf.php:301
 #: ../../enterprise/dashboard/widgets/monitor_health.php:71
 #: ../../operation/reporting/reporting_viewer.php:377
-#: ../../operation/reporting/reporting_xml.php:274
+#: ../../operation/reporting/reporting_xml.php:270
 #: ../../operation/agentes/tactical.php:67
 msgid "Monitor health"
 msgstr ""
@@ -406,14 +424,14 @@ msgstr ""
 #: ../../godmode/admin_access_logs.php:52
 #: ../../godmode/admin_access_logs.php:89
 #: ../../godmode/agentes/agent_template.php:134
-#: ../../godmode/agentes/alert_manager.php:267
+#: ../../godmode/agentes/alert_manager.php:269
 #: ../../godmode/agentes/module_manager.php:83
 #: ../../godmode/modules/manage_network_components.php:189
 #: ../../godmode/modules/manage_network_templates.php:54
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:82
 #: ../../operation/snmpconsole/snmp_view.php:224
 #: ../../operation/snmpconsole/snmp_view.php:390
-#: ../../operation/events/events.php:276 ../../operation/events/events.php:427
+#: ../../operation/events/events.php:277 ../../operation/events/events.php:428
 msgid "Action"
 msgstr ""
 
@@ -431,8 +449,8 @@ msgstr ""
 #: ../../godmode/admin_access_logs.php:92
 #: ../../godmode/modules/manage_network_components_form_wmi.php:200
 #: ../../godmode/modules/manage_network_components_form_network.php:270
-#: ../../godmode/users/configure_user.php:209
-#: ../../operation/users/user_edit.php:130
+#: ../../godmode/users/configure_user.php:175
+#: ../../operation/users/user_edit.php:97
 msgid "Comments"
 msgstr ""
 
@@ -501,7 +519,7 @@ msgid "hour"
 msgstr ""
 
 #: ../../general/header.php:87
-#: ../../godmode/alerts/configure_alert_template.php:432
+#: ../../godmode/alerts/configure_alert_template.php:434
 msgid "Select"
 msgstr ""
 
@@ -527,7 +545,7 @@ msgstr ""
 msgid "the Flexible Monitoring System"
 msgstr ""
 
-#: ../../index.php:249
+#: ../../index.php:247
 msgid "Sorry! I can't find the page!"
 msgstr ""
 
@@ -593,12 +611,12 @@ msgstr ""
 
 #: ../../extensions/update_manager/main.php:80
 #: ../../godmode/setup/news.php:121 ../../include/functions_events.php:210
-#: ../../include/functions_reporting.php:278
+#: ../../include/functions_reporting.php:280
 #: ../../operation/snmpconsole/snmp_view.php:217
-#: ../../operation/agentes/status_monitor.php:210
+#: ../../operation/agentes/status_monitor.php:211
 #: ../../operation/agentes/estado_ultimopaquete.php:59
 #: ../../operation/agentes/datos_agente.php:73
-#: ../../operation/events/events.php:273
+#: ../../operation/events/events.php:274
 #: ../../operation/messages/message.php:191
 msgid "Timestamp"
 msgstr ""
@@ -628,13 +646,13 @@ msgstr ""
 #: ../../godmode/modules/manage_network_templates_form.php:107
 #: ../../godmode/modules/manage_network_templates_form.php:143
 #: ../../godmode/modules/module_list.php:57
-#: ../../godmode/users/user_list.php:67
+#: ../../godmode/users/user_list.php:56
 #: ../../godmode/alerts/configure_alert_command.php:56
-#: ../../godmode/alerts/alert_templates.php:57
-#: ../../godmode/alerts/alert_templates.php:150
-#: ../../godmode/alerts/configure_alert_template.php:426
+#: ../../godmode/alerts/alert_templates.php:52
+#: ../../godmode/alerts/alert_templates.php:145
+#: ../../godmode/alerts/configure_alert_template.php:428
 #: ../../godmode/alerts/alert_commands.php:99
-#: ../../include/functions_reporting.php:530
+#: ../../include/functions_reporting.php:532
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:72
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:177
 #: ../../enterprise/godmode/agentes/inventory_manager.php:161
@@ -657,8 +675,8 @@ msgstr ""
 
 #: ../../extensions/update_manager/main.php:93
 #: ../../extensions/update_manager/settings.php:82
-#: ../../godmode/reporting/map_builder.php:321
-#: ../../godmode/reporting/map_builder.php:550
+#: ../../godmode/reporting/map_builder.php:324
+#: ../../godmode/reporting/map_builder.php:555
 #: ../../godmode/reporting/reporting_builder.php:364
 #: ../../godmode/servers/modificar_server.php:74
 #: ../../godmode/servers/manage_recontask_form.php:141
@@ -684,7 +702,7 @@ msgstr ""
 #: ../../godmode/modules/manage_network_components_form_wmi.php:215
 #: ../../godmode/modules/manage_network_templates_form.php:113
 #: ../../godmode/modules/manage_network_components_form_network.php:284
-#: ../../godmode/users/configure_user.php:246
+#: ../../godmode/users/configure_user.php:189
 #: ../../godmode/alerts/configure_alert_command.php:66
 #: ../../godmode/alerts/configure_alert_action.php:82
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:198
@@ -695,8 +713,8 @@ msgstr ""
 #: ../../operation/reporting/reporting_viewer.php:72
 #: ../../operation/reporting/graph_viewer.php:127
 #: ../../operation/agentes/networkmap.php:322
-#: ../../operation/events/events.php:206
-#: ../../operation/users/user_edit.php:138
+#: ../../operation/events/events.php:207
+#: ../../operation/users/user_edit.php:106
 msgid "Update"
 msgstr ""
 
@@ -752,19 +770,19 @@ msgstr ""
 msgid "Proxy password"
 msgstr ""
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:552
+#: ../../extensions/update_manager/lib/libupdate_manager.php:556
 msgid "Development"
 msgstr ""
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:553
+#: ../../extensions/update_manager/lib/libupdate_manager.php:557
 msgid "Testing"
 msgstr ""
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:554
+#: ../../extensions/update_manager/lib/libupdate_manager.php:558
 msgid "Public"
 msgstr ""
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:555
+#: ../../extensions/update_manager/lib/libupdate_manager.php:559
 #: ../../godmode/groups/group_list.php:128
 #: ../../godmode/agentes/module_manager_editor_wmi.php:136
 #: ../../godmode/agentes/module_manager_editor_data.php:99
@@ -776,12 +794,12 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:563
+#: ../../extensions/update_manager/lib/libupdate_manager.php:567
 #: ../../godmode/setup/setup.php:142
 msgid "Database"
 msgstr ""
 
-#: ../../extensions/update_manager/lib/libupdate_manager.php:564
+#: ../../extensions/update_manager/lib/libupdate_manager.php:568
 msgid "Code / binary directory"
 msgstr ""
 
@@ -798,7 +816,7 @@ msgid "Update manager settings"
 msgstr ""
 
 #: ../../godmode/reporting/map_builder.php:65
-#: ../../godmode/reporting/map_builder.php:167 ../../godmode/setup/news.php:38
+#: ../../godmode/reporting/map_builder.php:170 ../../godmode/setup/news.php:38
 #: ../../godmode/agentes/planned_downtime.php:118
 #: ../../godmode/modules/manage_network_components.php:78
 #: ../../godmode/modules/manage_nc_groups.php:40
@@ -806,7 +824,7 @@ msgid "Created successfully"
 msgstr ""
 
 #: ../../godmode/reporting/map_builder.php:67
-#: ../../godmode/reporting/map_builder.php:169 ../../godmode/setup/news.php:38
+#: ../../godmode/reporting/map_builder.php:172 ../../godmode/setup/news.php:38
 #: ../../godmode/agentes/planned_downtime.php:96
 #: ../../godmode/agentes/planned_downtime.php:116
 #: ../../godmode/modules/manage_network_components.php:76
@@ -846,7 +864,7 @@ msgstr ""
 msgid "Update layout failed"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:244
+#: ../../godmode/reporting/map_builder.php:247
 #: ../../godmode/reporting/reporting_builder.php:190
 #: ../../godmode/setup/news.php:50
 #: ../../godmode/modules/manage_network_components.php:116
@@ -854,7 +872,7 @@ msgstr ""
 msgid "Updated successfully"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:246
+#: ../../godmode/reporting/map_builder.php:249
 #: ../../godmode/reporting/reporting_builder.php:192
 #: ../../godmode/setup/news.php:50
 #: ../../godmode/modules/manage_network_components.php:114
@@ -862,7 +880,7 @@ msgstr ""
 msgid "Not updated. Error updating data"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:259
+#: ../../godmode/reporting/map_builder.php:262
 #: ../../godmode/reporting/graph_builder.php:202
 #: ../../godmode/reporting/reporting_builder.php:250
 #: ../../godmode/reporting/reporting_builder.php:327
@@ -875,16 +893,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:259 ../../godmode/menu.php:112
+#: ../../godmode/reporting/map_builder.php:262 ../../godmode/menu.php:112
 msgid "Map builder"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:267
+#: ../../godmode/reporting/map_builder.php:270
 msgid "Map name"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:268
-#: ../../godmode/reporting/map_builder.php:305
+#: ../../godmode/reporting/map_builder.php:271
+#: ../../godmode/reporting/map_builder.php:308
 #: ../../godmode/reporting/reporting_builder.php:337
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:127
@@ -901,7 +919,7 @@ msgstr ""
 #: ../../enterprise/include/functions_reporting_pdf.php:325
 #: ../../enterprise/operation/inventory/inventory.php:38
 #: ../../operation/reporting/reporting_viewer.php:364
-#: ../../operation/reporting/reporting_xml.php:267
+#: ../../operation/reporting/reporting_xml.php:263
 #: ../../operation/incidents/incident.php:256
 #: ../../operation/incidents/incident_detail.php:256
 #: ../../operation/servers/view_server_detail.php:87
@@ -913,12 +931,12 @@ msgstr ""
 #: ../../operation/agentes/ver_agente.php:224
 #: ../../operation/agentes/estado_agente.php:53
 #: ../../operation/agentes/estado_agente.php:150
-#: ../../operation/events/events.php:122 ../../operation/events/events.php:267
+#: ../../operation/events/events.php:122 ../../operation/events/events.php:268
 msgid "Group"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:269
-#: ../../godmode/reporting/map_builder.php:358
+#: ../../godmode/reporting/map_builder.php:272
+#: ../../godmode/reporting/map_builder.php:363
 #: ../../godmode/reporting/graph_builder.php:218
 #: ../../godmode/reporting/graph_builder.php:242
 #: ../../godmode/reporting/reporting_builder.php:267
@@ -938,8 +956,8 @@ msgstr ""
 #: ../../godmode/modules/manage_network_components.php:232
 #: ../../godmode/modules/manage_nc_groups.php:76
 #: ../../godmode/modules/manage_network_templates_form.php:163
-#: ../../godmode/users/user_list.php:70 ../../godmode/db/db_refine.php:93
-#: ../../godmode/alerts/alert_templates.php:152
+#: ../../godmode/db/db_refine.php:93
+#: ../../godmode/alerts/alert_templates.php:147
 #: ../../godmode/alerts/alert_actions.php:96
 #: ../../godmode/alerts/alert_commands.php:100
 #: ../../enterprise/extensions/cron/main.php:89
@@ -953,14 +971,14 @@ msgstr ""
 #: ../../operation/snmpconsole/snmp_view.php:372
 #: ../../operation/snmpconsole/snmp_view.php:393
 #: ../../operation/agentes/datos_agente.php:70
-#: ../../operation/events/events.php:411
+#: ../../operation/events/events.php:412
 #: ../../operation/messages/message.php:192
 msgid "Delete"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:293
-#: ../../godmode/reporting/map_builder.php:325
-#: ../../godmode/reporting/map_builder.php:423
+#: ../../godmode/reporting/map_builder.php:296
+#: ../../godmode/reporting/map_builder.php:328
+#: ../../godmode/reporting/map_builder.php:428
 #: ../../godmode/reporting/reporting_builder.php:320
 #: ../../godmode/reporting/reporting_builder.php:367
 #: ../../godmode/servers/manage_export.php:96
@@ -984,10 +1002,9 @@ msgstr ""
 #: ../../godmode/modules/manage_nc_groups_form.php:73
 #: ../../godmode/modules/manage_network_templates.php:92
 #: ../../godmode/modules/manage_network_templates_form.php:115
-#: ../../godmode/users/configure_user.php:282
 #: ../../godmode/alerts/configure_alert_command.php:69
 #: ../../godmode/alerts/configure_alert_action.php:85
-#: ../../godmode/alerts/alert_templates.php:184
+#: ../../godmode/alerts/alert_templates.php:179
 #: ../../godmode/alerts/alert_actions.php:124
 #: ../../godmode/alerts/alert_commands.php:135
 #: ../../enterprise/extensions/cron/main.php:138
@@ -997,7 +1014,7 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:303
+#: ../../godmode/reporting/map_builder.php:306
 #: ../../godmode/reporting/graph_builder.php:475
 #: ../../godmode/extensions.php:36 ../../godmode/servers/manage_export.php:102
 #: ../../godmode/servers/modificar_server.php:67
@@ -1014,14 +1031,14 @@ msgstr ""
 #: ../../godmode/modules/manage_network_templates.php:52
 #: ../../godmode/modules/manage_network_templates_form.php:103
 #: ../../godmode/modules/module_list.php:56
-#: ../../godmode/users/user_list.php:64
+#: ../../godmode/users/user_list.php:53
 #: ../../godmode/alerts/configure_alert_command.php:52
 #: ../../godmode/alerts/configure_alert_action.php:56
-#: ../../godmode/alerts/alert_templates.php:149
-#: ../../godmode/alerts/configure_alert_template.php:423
+#: ../../godmode/alerts/alert_templates.php:144
+#: ../../godmode/alerts/configure_alert_template.php:425
 #: ../../godmode/alerts/alert_actions.php:95
 #: ../../godmode/alerts/alert_commands.php:98
-#: ../../include/functions_db.php:1904
+#: ../../include/functions_db.php:1959
 #: ../../enterprise/godmode/agentes/inventory_manager.php:160
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:78
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:55
@@ -1033,51 +1050,51 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:307
+#: ../../godmode/reporting/map_builder.php:310
 msgid "Background"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:311
-#: ../../godmode/reporting/map_builder.php:398
+#: ../../godmode/reporting/map_builder.php:314
+#: ../../godmode/reporting/map_builder.php:403
 #: ../../godmode/reporting/graph_builder.php:304
 msgid "Width"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:313
-#: ../../godmode/reporting/map_builder.php:396
+#: ../../godmode/reporting/map_builder.php:316
+#: ../../godmode/reporting/map_builder.php:401
 #: ../../godmode/reporting/graph_builder.php:322
 msgid "Height"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:333
+#: ../../godmode/reporting/map_builder.php:336
 msgid "preview"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:351
+#: ../../godmode/reporting/map_builder.php:356
 msgid "Map element trash"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:352
+#: ../../godmode/reporting/map_builder.php:357
 msgid "Drag an element here to delete from the map"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:365
+#: ../../godmode/reporting/map_builder.php:370
 msgid "Hour"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:366
-#: ../../godmode/reporting/map_builder.php:367
-#: ../../godmode/reporting/map_builder.php:368
-#: ../../godmode/reporting/map_builder.php:369
+#: ../../godmode/reporting/map_builder.php:371
+#: ../../godmode/reporting/map_builder.php:372
+#: ../../godmode/reporting/map_builder.php:373
+#: ../../godmode/reporting/map_builder.php:374
 msgid "Hours"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:370
+#: ../../godmode/reporting/map_builder.php:375
 #: ../../godmode/reporting/graph_builder.php:390
 msgid "Last day"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:371
+#: ../../godmode/reporting/map_builder.php:376
 #: ../../godmode/servers/manage_recontask_form.php:91
 #: ../../godmode/db/db_main.php:43 ../../godmode/db/db_main.php:44
 #: ../../include/functions.php:507
@@ -1087,47 +1104,47 @@ msgstr ""
 msgid "days"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:372
+#: ../../godmode/reporting/map_builder.php:377
 #: ../../godmode/reporting/graph_builder.php:353
 #: ../../godmode/reporting/graph_builder.php:392
 msgid "Last week"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:373
+#: ../../godmode/reporting/map_builder.php:378
 #: ../../godmode/reporting/graph_builder.php:356
 #: ../../godmode/reporting/graph_builder.php:393
 msgid "15 days"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:374
+#: ../../godmode/reporting/map_builder.php:379
 msgid "Last Month"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:375
+#: ../../godmode/reporting/map_builder.php:380
 msgid "Two Months"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:376
+#: ../../godmode/reporting/map_builder.php:381
 msgid "Six Months"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:381
+#: ../../godmode/reporting/map_builder.php:386
 msgid "Map element editor"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:382
+#: ../../godmode/reporting/map_builder.php:387
 msgid "Drag an element here to edit the properties"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:390
+#: ../../godmode/reporting/map_builder.php:395
 msgid "Label"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:392
+#: ../../godmode/reporting/map_builder.php:397
 msgid "Label color"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:394
+#: ../../godmode/reporting/map_builder.php:399
 #: ../../godmode/reporting/reporting_builder.php:438
 #: ../../godmode/servers/modificar_server.php:87
 #: ../../godmode/agentes/agent_template.php:132
@@ -1135,39 +1152,39 @@ msgstr ""
 #: ../../godmode/modules/manage_network_components.php:183
 #: ../../godmode/modules/manage_network_templates_form.php:141
 #: ../../godmode/alerts/alert_templates.php:43
-#: ../../godmode/alerts/alert_templates.php:151
+#: ../../godmode/alerts/alert_templates.php:146
 #: ../../include/functions_events.php:198
-#: ../../include/functions_reporting.php:529
+#: ../../include/functions_reporting.php:531
 #: ../../operation/servers/view_server.php:58
-#: ../../operation/agentes/status_monitor.php:199
+#: ../../operation/agentes/status_monitor.php:200
 #: ../../operation/agentes/estado_ultimopaquete.php:53
 #: ../../operation/agentes/estado_monitores.php:50
 #: ../../operation/agentes/sla_view.php:45
 #: ../../operation/agentes/sla_view.php:146
-#: ../../operation/events/events.php:255
+#: ../../operation/events/events.php:256
 msgid "Type"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:400
+#: ../../godmode/reporting/map_builder.php:405
 #: ../../godmode/reporting/graph_builder.php:215
 #: ../../godmode/reporting/reporting_builder.php:262
 #: ../../godmode/reporting/reporting_builder.php:300
 #: ../../godmode/reporting/reporting_builder.php:439
-#: ../../include/functions_reporting.php:329
-#: ../../include/functions_reporting.php:463
-#: ../../include/functions_reporting.php:664
+#: ../../include/functions_reporting.php:331
+#: ../../include/functions_reporting.php:465
+#: ../../include/functions_reporting.php:666
 #: ../../enterprise/include/functions_reporting_pdf.php:178
 #: ../../enterprise/operation/inventory/inventory.php:52
 #: ../../operation/reporting/reporting_viewer.php:211
 #: ../../operation/snmpconsole/snmp_view.php:148
-#: ../../operation/agentes/status_monitor.php:197
+#: ../../operation/agentes/status_monitor.php:198
 #: ../../operation/agentes/alerts_status.php:147
 #: ../../operation/agentes/alerts_status.php:173
 #: ../../operation/agentes/estado_agente.php:147
 msgid "Agent"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:402
+#: ../../godmode/reporting/map_builder.php:407
 #: ../../godmode/reporting/graph_builder.php:216
 #: ../../godmode/reporting/reporting_builder.php:263
 #: ../../godmode/reporting/reporting_builder.php:302
@@ -1183,7 +1200,7 @@ msgstr ""
 msgid "Module"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:404
+#: ../../godmode/reporting/map_builder.php:409
 #: ../../godmode/reporting/graph_builder.php:376
 #: ../../godmode/reporting/reporting_builder.php:390
 #: ../../godmode/reporting/reporting_builder.php:441
@@ -1191,11 +1208,11 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:406
+#: ../../godmode/reporting/map_builder.php:411
 msgid "Image"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:409
+#: ../../godmode/reporting/map_builder.php:414
 #: ../../godmode/groups/group_list.php:111
 #: ../../godmode/groups/configure_group.php:79
 #: ../../godmode/agentes/agent_manager.php:97
@@ -1205,20 +1222,20 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:412
+#: ../../godmode/reporting/map_builder.php:417
 msgid "Map linked"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:447
+#: ../../godmode/reporting/map_builder.php:452
 #: ../../operation/reporting/reporting_viewer.php:81
 msgid "Loading"
 msgstr ""
 
-#: ../../godmode/reporting/map_builder.php:455
+#: ../../godmode/reporting/map_builder.php:460
 #: ../../godmode/servers/manage_recontask.php:119
 #: ../../godmode/servers/manage_recontask_form.php:113
 #: ../../godmode/agentes/planned_downtime.php:203
-#: ../../operation/events/events.php:200
+#: ../../operation/events/events.php:201
 msgid "Any"
 msgstr ""
 
@@ -1262,7 +1279,7 @@ msgstr ""
 #: ../../godmode/agentes/manage_config.php:421
 #: ../../godmode/agentes/manage_config.php:430
 #: ../../godmode/agentes/module_manager.php:25
-#: ../../godmode/db/db_refine.php:76 ../../include/functions_reporting.php:665
+#: ../../godmode/db/db_refine.php:76 ../../include/functions_reporting.php:667
 #: ../../enterprise/include/functions_reporting_pdf.php:329
 #: ../../operation/servers/view_server.php:56
 #: ../../operation/agentes/exportdata.php:267
@@ -1285,7 +1302,7 @@ msgstr ""
 #: ../../godmode/reporting/graph_builder.php:483
 #: ../../godmode/servers/manage_recontask.php:117
 #: ../../godmode/servers/manage_recontask_form.php:131
-#: ../../include/functions_db.php:1977
+#: ../../include/functions_db.php:2032
 msgid "Yes"
 msgstr ""
 
@@ -1296,7 +1313,7 @@ msgstr ""
 #: ../../godmode/reporting/graph_builder.php:482
 #: ../../godmode/servers/manage_recontask.php:117
 #: ../../godmode/servers/manage_recontask_form.php:131
-#: ../../include/functions_db.php:1979
+#: ../../include/functions_db.php:2034
 msgid "No"
 msgstr ""
 
@@ -1396,8 +1413,8 @@ msgstr ""
 #: ../../godmode/setup/links.php:138 ../../godmode/setup/news.php:146
 #: ../../godmode/agentes/planned_downtime.php:175
 #: ../../godmode/agentes/planned_downtime.php:212
-#: ../../godmode/agentes/alert_manager.php:283
-#: ../../godmode/agentes/alert_manager.php:352
+#: ../../godmode/agentes/alert_manager.php:285
+#: ../../godmode/agentes/alert_manager.php:354
 #: ../../godmode/modules/manage_network_components_form_wmi.php:217
 #: ../../godmode/modules/manage_network_templates_form.php:216
 #: ../../godmode/modules/manage_network_components_form_network.php:286
@@ -1651,7 +1668,7 @@ msgstr ""
 #: ../../enterprise/godmode/agentes/inventory_manager.php:113
 #: ../../enterprise/godmode/agentes/inventory_manager.php:163
 #: ../../operation/servers/view_server_detail.php:75
-#: ../../operation/agentes/status_monitor.php:204
+#: ../../operation/agentes/status_monitor.php:205
 #: ../../operation/agentes/estado_generalagente.php:78
 #: ../../operation/agentes/estado_monitores.php:54
 #: ../../operation/agentes/sla_view.php:49
@@ -1701,7 +1718,7 @@ msgstr ""
 
 #: ../../godmode/servers/modificar_server.php:87
 #: ../../godmode/agentes/agent_manager.php:142
-#: ../../include/functions_reporting.php:275
+#: ../../include/functions_reporting.php:277
 #: ../../operation/incidents/incident.php:183
 #: ../../operation/incidents/incident.php:253
 #: ../../operation/incidents/incident_detail.php:230
@@ -1709,14 +1726,14 @@ msgstr ""
 #: ../../operation/servers/view_server.php:54
 #: ../../operation/snmpconsole/snmp_view.php:199
 #: ../../operation/snmpconsole/snmp_view.php:378
-#: ../../operation/agentes/status_monitor.php:207
+#: ../../operation/agentes/status_monitor.php:208
 #: ../../operation/agentes/alerts_status.php:140
 #: ../../operation/agentes/estado_monitores.php:53
 #: ../../operation/agentes/sla_view.php:48
 #: ../../operation/agentes/sla_view.php:149
 #: ../../operation/agentes/estado_agente.php:152
 #: ../../operation/agentes/tactical.php:173
-#: ../../operation/events/events.php:421
+#: ../../operation/events/events.php:422
 msgid "Status"
 msgstr ""
 
@@ -1872,12 +1889,13 @@ msgstr ""
 #: ../../godmode/agentes/module_manager_editor_data.php:144
 #: ../../godmode/agentes/module_manager_editor_plugin.php:122
 #: ../../godmode/agentes/module_manager_editor_plugin.php:233
-#: ../../godmode/agentes/alert_manager.php:265
-#: ../../godmode/agentes/alert_manager.php:271
+#: ../../godmode/agentes/alert_manager.php:267
+#: ../../godmode/agentes/alert_manager.php:273
 #: ../../godmode/agentes/module_manager_editor_prediction.php:152
 #: ../../godmode/agentes/module_manager_editor_network.php:285
 #: ../../godmode/agentes/agent_manager.php:98
-#: ../../godmode/users/configure_user.php:224
+#: ../../godmode/users/configure_user.php:181
+#: ../../godmode/users/configure_user.php:185
 #: ../../godmode/alerts/configure_alert_action.php:61
 #: ../../godmode/alerts/configure_alert_template.php:357
 #: ../../include/functions.php:651
@@ -2012,9 +2030,9 @@ msgstr ""
 #: ../../godmode/groups/configure_group.php:90
 #: ../../godmode/agentes/configurar_agente.php:222
 #: ../../godmode/agentes/alert_manager.php:27
-#: ../../godmode/agentes/alert_manager.php:160
+#: ../../godmode/agentes/alert_manager.php:161
 #: ../../godmode/agentes/manage_config.php:433
-#: ../../include/functions_reporting.php:674
+#: ../../include/functions_reporting.php:676
 #: ../../enterprise/include/functions_reporting_pdf.php:335
 #: ../../operation/agentes/estado_grupo.php:233
 #: ../../operation/agentes/alerts_status.php:87
@@ -2033,18 +2051,16 @@ msgstr ""
 #: ../../godmode/profiles/profile_list.php:274
 #: ../../godmode/agentes/agent_template.php:150
 #: ../../godmode/agentes/manage_config_remote.php:144
-#: ../../godmode/agentes/alert_manager.php:390
+#: ../../godmode/agentes/alert_manager.php:392
 #: ../../godmode/agentes/manage_config.php:458
 #: ../../godmode/agentes/modificar_agente.php:194
 #: ../../godmode/agentes/module_manager.php:146
 #: ../../godmode/agentes/module_manager.php:157
 #: ../../godmode/modules/manage_nc_groups.php:98
 #: ../../godmode/modules/manage_network_templates.php:75
-#: ../../godmode/users/user_list.php:103
-#: ../../godmode/users/configure_user.php:268
 #: ../../godmode/db/db_purge.php:221 ../../godmode/db/db_audit.php:106
 #: ../../godmode/db/db_refine.php:93 ../../godmode/db/db_event.php:86
-#: ../../godmode/alerts/alert_templates.php:174
+#: ../../godmode/alerts/alert_templates.php:169
 #: ../../godmode/alerts/alert_actions.php:114
 #: ../../godmode/alerts/alert_commands.php:125
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:193
@@ -2302,7 +2318,7 @@ msgid "Other value"
 msgstr ""
 
 #: ../../godmode/snmpconsole/snmp_alert.php:238
-#: ../../include/functions_reporting.php:332
+#: ../../include/functions_reporting.php:334
 #: ../../operation/incidents/incident.php:189
 #: ../../operation/incidents/incident.php:255
 #: ../../operation/incidents/incident_detail.php:265
@@ -2327,7 +2343,7 @@ msgid "Times fired"
 msgstr ""
 
 #: ../../godmode/snmpconsole/snmp_alert.php:290
-#: ../../include/functions_reporting.php:533
+#: ../../include/functions_reporting.php:535
 #: ../../operation/agentes/alerts_status.php:139
 msgid "Last fired"
 msgstr ""
@@ -2336,12 +2352,12 @@ msgstr ""
 #: ../../godmode/snmpconsole/snmp_alert.php:301
 #: ../../godmode/snmpconsole/snmp_alert.php:302
 #: ../../godmode/snmpconsole/snmp_alert.php:303
-#: ../../godmode/agentes/alert_manager.php:131 ../../include/functions.php:687
+#: ../../godmode/agentes/alert_manager.php:132 ../../include/functions.php:687
 #: ../../include/functions.php:692 ../../include/functions.php:695
-#: ../../include/functions_db.php:1957
-#: ../../include/functions_reporting.php:593
-#: ../../include/functions_reporting.php:631
-#: ../../include/functions_reporting.php:660
+#: ../../include/functions_db.php:2012
+#: ../../include/functions_reporting.php:595
+#: ../../include/functions_reporting.php:633
+#: ../../include/functions_reporting.php:662
 #: ../../operation/snmpconsole/snmp_view.php:294
 #: ../../operation/snmpconsole/snmp_view.php:306
 #: ../../operation/snmpconsole/snmp_view.php:315
@@ -2500,8 +2516,8 @@ msgstr ""
 
 #: ../../godmode/setup/setup.php:141 ../../include/functions_events.php:245
 #: ../../include/functions_events.php:268 ../../include/functions.php:853
-#: ../../operation/events/events.php:163 ../../operation/events/events.php:320
-#: ../../operation/events/events.php:344 ../../operation/events/events.php:373
+#: ../../operation/events/events.php:163 ../../operation/events/events.php:321
+#: ../../operation/events/events.php:345 ../../operation/events/events.php:374
 msgid "System"
 msgstr ""
 
@@ -2566,8 +2582,8 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: ../../godmode/setup/news.php:104 ../../include/functions_db.php:1963
-#: ../../include/functions_db.php:1985
+#: ../../godmode/setup/news.php:104 ../../include/functions_db.php:2018
+#: ../../include/functions_db.php:2040
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:70
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:176
 msgid "Text"
@@ -2579,15 +2595,18 @@ msgid "Author"
 msgstr ""
 
 #: ../../godmode/profiles/profile_list.php:33
-#: ../../operation/users/user.php:83
+#: ../../godmode/users/user_list.php:122 ../../operation/users/user.php:88
 msgid "Profiles defined in Pandora"
 msgstr ""
 
 #: ../../godmode/profiles/profile_list.php:47
+#: ../../godmode/users/user_list.php:38
 msgid "There was a problem deleting the profile"
 msgstr ""
 
 #: ../../godmode/profiles/profile_list.php:49
+#: ../../godmode/users/user_list.php:38
+#: ../../godmode/users/configure_user.php:118
 msgid "Profile successfully deleted"
 msgstr ""
 
@@ -2625,6 +2644,7 @@ msgid "Update profile"
 msgstr ""
 
 #: ../../godmode/profiles/profile_list.php:172
+#: ../../godmode/users/configure_user.php:204
 msgid "Profile name"
 msgstr ""
 
@@ -2662,8 +2682,9 @@ msgid "Pandora management"
 msgstr ""
 
 #: ../../godmode/profiles/profile_list.php:230
-#: ../../godmode/users/configure_user.php:233
-#: ../../operation/users/user.php:94
+#: ../../godmode/users/user_list.php:134
+#: ../../godmode/users/configure_user.php:183
+#: ../../operation/users/user.php:99
 msgid "Profiles"
 msgstr ""
 
@@ -2947,9 +2968,9 @@ msgstr ""
 #: ../../godmode/agentes/module_manager_editor_plugin.php:179
 #: ../../godmode/agentes/module_manager_editor_network.php:252
 #: ../../godmode/agentes/module_manager_editor_network.php:257
-#: ../../godmode/alerts/configure_alert_template.php:454
+#: ../../godmode/alerts/configure_alert_template.php:456
 #: ../../include/functions_alerts.php:243
-#: ../../include/functions_reporting.php:561
+#: ../../include/functions_reporting.php:563
 msgid "Min."
 msgstr ""
 
@@ -2961,9 +2982,9 @@ msgstr ""
 #: ../../godmode/agentes/module_manager_editor_plugin.php:180
 #: ../../godmode/agentes/module_manager_editor_network.php:253
 #: ../../godmode/agentes/module_manager_editor_network.php:258
-#: ../../godmode/alerts/configure_alert_template.php:457
+#: ../../godmode/alerts/configure_alert_template.php:459
 #: ../../include/functions_alerts.php:242
-#: ../../include/functions_reporting.php:562
+#: ../../include/functions_reporting.php:564
 msgid "Max."
 msgstr ""
 
@@ -3027,7 +3048,7 @@ msgid "Available templates"
 msgstr ""
 
 #: ../../godmode/agentes/agent_template.php:107
-#: ../../godmode/agentes/alert_manager.php:261
+#: ../../godmode/agentes/alert_manager.php:263
 #: ../../operation/agentes/alerts_status.php:138
 msgid "Template"
 msgstr ""
@@ -3115,7 +3136,7 @@ msgid "Agents planned for this downtime"
 msgstr ""
 
 #: ../../godmode/agentes/planned_downtime.php:225
-#: ../../godmode/users/user_list.php:58
+#: ../../godmode/users/user_list.php:54
 #: ../../operation/agentes/estado_generalagente.php:98
 #: ../../operation/agentes/estado_monitores.php:55
 #: ../../operation/agentes/ver_agente.php:56
@@ -3143,9 +3164,9 @@ msgid "Name #Ag."
 msgstr ""
 
 #: ../../godmode/agentes/planned_downtime.php:269
-#: ../../godmode/agentes/alert_manager.php:216
-#: ../../godmode/agentes/alert_manager.php:275
-#: ../../godmode/alerts/alert_templates.php:96
+#: ../../godmode/agentes/alert_manager.php:217
+#: ../../godmode/agentes/alert_manager.php:277
+#: ../../godmode/alerts/alert_templates.php:91
 #: ../../operation/messages/message.php:64
 #: ../../operation/messages/message.php:105
 #: ../../operation/messages/message.php:139
@@ -3198,7 +3219,7 @@ msgstr ""
 
 #: ../../godmode/agentes/alert_manager.php:61
 #: ../../godmode/agentes/alert_manager.php:86
-#: ../../godmode/alerts/alert_templates.php:142
+#: ../../godmode/alerts/alert_templates.php:137
 #: ../../godmode/alerts/alert_actions.php:88
 #: ../../godmode/alerts/alert_commands.php:91
 msgid "Successfully deleted"
@@ -3206,7 +3227,7 @@ msgstr ""
 
 #: ../../godmode/agentes/alert_manager.php:62
 #: ../../godmode/agentes/alert_manager.php:87
-#: ../../godmode/alerts/alert_templates.php:143
+#: ../../godmode/alerts/alert_templates.php:138
 #: ../../godmode/alerts/alert_actions.php:89
 #: ../../godmode/alerts/alert_commands.php:92
 msgid "Could not be deleted"
@@ -3240,51 +3261,51 @@ msgstr ""
 msgid "Modules defined"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:136
+#: ../../godmode/agentes/alert_manager.php:137
 msgid "Latest value"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:143
+#: ../../godmode/agentes/alert_manager.php:144
 msgid "Add alert"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:209
+#: ../../godmode/agentes/alert_manager.php:210
 msgid "Always"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:211
+#: ../../godmode/agentes/alert_manager.php:212
 msgid "On"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:214
+#: ../../godmode/agentes/alert_manager.php:215
 msgid "Until"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:217
-#: ../../godmode/agentes/alert_manager.php:277
-#: ../../godmode/alerts/alert_templates.php:98
+#: ../../godmode/agentes/alert_manager.php:218
+#: ../../godmode/agentes/alert_manager.php:279
+#: ../../godmode/alerts/alert_templates.php:93
 #: ../../operation/agentes/exportdata.php:118
 #: ../../operation/agentes/exportdata.php:138
 msgid "to"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:238
+#: ../../godmode/agentes/alert_manager.php:239
 msgid "Add action"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:273
+#: ../../godmode/agentes/alert_manager.php:275
 msgid "Advanced options"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:279
+#: ../../godmode/agentes/alert_manager.php:281
 msgid "matches of the alert"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:395
+#: ../../godmode/agentes/alert_manager.php:397
 msgid "Disable"
 msgstr ""
 
-#: ../../godmode/agentes/alert_manager.php:403
+#: ../../godmode/agentes/alert_manager.php:405
 msgid "Enable"
 msgstr ""
 
@@ -3453,7 +3474,7 @@ msgstr ""
 #: ../../include/functions_events.php:204
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:58
 #: ../../operation/agentes/estado_generalagente.php:58
-#: ../../operation/events/events.php:261
+#: ../../operation/events/events.php:262
 msgid "Agent name"
 msgstr ""
 
@@ -3711,130 +3732,257 @@ msgstr ""
 msgid "Defined modules"
 msgstr ""
 
-#: ../../godmode/users/user_list.php:38
-msgid "There was a problem deleting user"
-msgstr ""
-
-#: ../../godmode/users/user_list.php:40
+#: ../../godmode/users/user_list.php:34
 msgid "User successfully deleted"
 msgstr ""
 
-#: ../../godmode/users/user_list.php:44
-#: ../../godmode/users/configure_user.php:157
+#: ../../godmode/users/user_list.php:34
+msgid "There was a problem deleting the user"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:41
 msgid "User management"
 msgstr ""
 
-#: ../../godmode/users/user_list.php:44
-#: ../../operation/users/user_statistics.php:25
+#: ../../godmode/users/user_list.php:41
+#: ../../operation/users/user_statistics.php:24
 #: ../../operation/users/user.php:25
 msgid "Users defined in Pandora"
 msgstr ""
 
-#: ../../godmode/users/user_list.php:56
-#: ../../godmode/users/configure_user.php:177
+#: ../../godmode/users/user_list.php:52
+#: ../../godmode/users/configure_user.php:131
 #: ../../include/functions_events.php:206
-#: ../../include/functions_reporting.php:277
+#: ../../include/functions_reporting.php:279
 #: ../../operation/snmpconsole/snmp_view.php:214
-#: ../../operation/events/events.php:270
-#: ../../operation/users/user_edit.php:110 ../../operation/users/user.php:35
+#: ../../operation/events/events.php:271
+#: ../../operation/users/user_edit.php:65 ../../operation/users/user.php:35
 msgid "User ID"
 msgstr ""
 
-#: ../../godmode/users/user_list.php:61 ../../operation/users/user.php:38
+#: ../../godmode/users/user_list.php:55 ../../operation/users/user.php:38
 msgid "Profile"
 msgstr ""
 
-#: ../../godmode/users/user_list.php:89
-#: ../../godmode/users/configure_user.php:272
-#: ../../operation/users/user_edit.php:161
-msgid "This user doesn't have any assigned profile/group"
+#: ../../godmode/users/user_list.php:70
+#: ../../godmode/users/configure_user.php:138
+#: ../../operation/users/user_edit.php:72 ../../operation/users/user.php:54
+msgid "First name"
 msgstr ""
 
-#: ../../godmode/users/user_list.php:112
-#: ../../godmode/users/configure_user.php:160
+#: ../../godmode/users/user_list.php:71
+#: ../../godmode/users/configure_user.php:141
+#: ../../operation/users/user_edit.php:75 ../../operation/users/user.php:55
+msgid "Last name"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:72 ../../operation/users/user.php:56
+msgid "Phone"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:73
+#: ../../godmode/users/configure_user.php:169
+#: ../../operation/users/user_edit.php:91 ../../operation/users/user.php:57
+msgid "E-mail"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:93 ../../operation/users/user.php:77
+msgid "The user doesn't have any assigned profile/group"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:115
 msgid "Create user"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:57
-msgid "There was a problem loading user"
+#: ../../godmode/users/user_list.php:118
+#: ../../godmode/users/configure_user.php:52
+msgid ""
+"The current authentication scheme doesn't support creating users from "
+"Pandora FMS"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:82
-#: ../../godmode/users/configure_user.php:136
-#: ../../operation/users/user_edit.php:58
-#: ../../operation/users/user_edit.php:81
-msgid "Passwords don't match. Please repeat again"
+#: ../../godmode/users/user_list.php:136 ../../operation/users/user.php:101
+msgid "System incidents reading"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:137 ../../operation/users/user.php:102
+msgid "System incidents writing"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:138 ../../operation/users/user.php:103
+msgid "System incidents management"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:139 ../../operation/users/user.php:104
+msgid "Agents reading"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:140 ../../operation/users/user.php:105
+msgid "Agents management"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:141 ../../operation/users/user.php:106
+msgid "Alerts editing"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:142 ../../operation/users/user.php:107
+msgid "Users management"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:143 ../../operation/users/user.php:108
+msgid "Database management"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:144 ../../operation/users/user.php:109
+msgid "Alerts management"
+msgstr ""
+
+#: ../../godmode/users/user_list.php:145 ../../operation/users/user.php:110
+msgid "Systems management"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:73
+msgid "Passwords didn\\t match"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:84
+msgid "User successfully created"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:84
+msgid "Error creating user"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:93
+#: ../../operation/users/user_edit.php:55
+msgid "User info successfully updated"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:93
+msgid "Error updating user info (no change?)"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:101
+#: ../../operation/users/user_edit.php:49
+msgid "Password successfully updated"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:101
+#: ../../operation/users/user_edit.php:49
+msgid "Error updating passwords"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:103
+#: ../../operation/users/user_edit.php:51
+msgid ""
+"Passwords didn't match or other problem encountered while updating passwords"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:108
+msgid "User admin status succesfully update"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:108
+msgid "Error updating admin status"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:113
+msgid "User profile succesfully created"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:113
+msgid "Error creating user profile"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:118
+msgid "Error deleting profile"
 msgstr ""
 
 #: ../../godmode/users/configure_user.php:121
-#: ../../operation/users/user_edit.php:60
-msgid "User successfully updated"
+#: ../../operation/users/user_edit.php:59 ../../operation/users/user.php:25
+msgid "Pandora users"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:124
-msgid "There was a problem updating user"
+#: ../../godmode/users/configure_user.php:121
+#: ../../operation/users/user_edit.php:59
+msgid "User detail editor"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:148
-msgid "User creation failed"
+#: ../../godmode/users/configure_user.php:135
+#: ../../operation/users/user_edit.php:69
+msgid "Full (display) name"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:150
-msgid "User created successfully"
+#: ../../godmode/users/configure_user.php:149
+#: ../../operation/users/user_edit.php:82
+msgid "New Password"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:164
-msgid "Update user"
-msgstr ""
-
-#: ../../godmode/users/configure_user.php:179
-#: ../../operation/users/user_edit.php:113
-msgid "Real name"
-msgstr ""
-
-#: ../../godmode/users/configure_user.php:188
+#: ../../godmode/users/configure_user.php:151
+#: ../../operation/users/user_edit.php:84
 msgid "Password confirmation"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:194
-#: ../../operation/users/user_edit.php:128
-msgid "Telephone"
+#: ../../godmode/users/configure_user.php:154
+msgid ""
+"You can not change passwords from Pandora FMS under the current "
+"authentication scheme"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:196
+#: ../../godmode/users/configure_user.php:157
 msgid "Global Profile"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:201
+#: ../../godmode/users/configure_user.php:159
 msgid "Administrator"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:203
+#: ../../godmode/users/configure_user.php:161
 msgid ""
 "This user has permissions to manage all. This is admin user and overwrites "
 "all permissions given in profiles/groups"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:204
+#: ../../godmode/users/configure_user.php:162
 msgid "Standard user"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:206
+#: ../../godmode/users/configure_user.php:164
 msgid ""
 "This user has separated permissions to view data in his group agents, create "
 "incidents belong to his groups, add notes in another incidents, create "
 "personal assignments or reviews and other tasks, on different profiles"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:221
+#: ../../godmode/users/configure_user.php:166
+msgid ""
+"You can not change admin status from Pandora FMS under the current "
+"authentication scheme"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:172
+#: ../../operation/users/user_edit.php:94
+msgid "Phone number"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:178
 msgid "Group(s) available"
 msgstr ""
 
-#: ../../godmode/users/configure_user.php:251
-#: ../../operation/users/user_edit.php:141
+#: ../../godmode/users/configure_user.php:193
+#: ../../operation/users/user_edit.php:111
 msgid "Profiles/Groups assigned to this user"
 msgstr ""
 
+#: ../../godmode/users/configure_user.php:205
+msgid "Group name"
+msgstr ""
+
+#: ../../godmode/users/configure_user.php:230
+#: ../../operation/users/user_edit.php:134
+msgid "This user doesn't have any assigned profile/group"
+msgstr ""
+
 #: ../../godmode/db/db_info.php:42 ../../godmode/db/db_purge.php:41
 #: ../../godmode/db/db_main.php:40 ../../godmode/db/db_audit.php:72
 #: ../../godmode/db/db_refine.php:32 ../../godmode/db/db_event.php:45
@@ -4197,69 +4345,69 @@ msgstr ""
 msgid "Command preview"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:68
+#: ../../godmode/alerts/alert_templates.php:63
 msgid "Everyday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:70
+#: ../../godmode/alerts/alert_templates.php:65
 #: ../../operation/agentes/exportdata.php:54
 msgid "Monday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:71
+#: ../../godmode/alerts/alert_templates.php:66
 #: ../../operation/agentes/exportdata.php:54
 msgid "Tuesday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:72
+#: ../../godmode/alerts/alert_templates.php:67
 #: ../../operation/agentes/exportdata.php:54
 msgid "Wednesday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:73
+#: ../../godmode/alerts/alert_templates.php:68
 msgid "Thursday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:74
+#: ../../godmode/alerts/alert_templates.php:69
 #: ../../operation/agentes/exportdata.php:54
 msgid "Friday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:75
+#: ../../godmode/alerts/alert_templates.php:70
 #: ../../operation/agentes/exportdata.php:54
 msgid "Saturday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:76
+#: ../../godmode/alerts/alert_templates.php:71
 #: ../../operation/agentes/exportdata.php:54
 msgid "Sunday"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:78
-#: ../../include/functions_db.php:1914
+#: ../../godmode/alerts/alert_templates.php:73
+#: ../../include/functions_db.php:1969
 msgid "Days"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:78
+#: ../../godmode/alerts/alert_templates.php:73
 msgid "Every"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:88
+#: ../../godmode/alerts/alert_templates.php:83
 msgid "and"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:110
+#: ../../godmode/alerts/alert_templates.php:105
 msgid "Alert templates"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:126
+#: ../../godmode/alerts/alert_templates.php:121
 #: ../../godmode/alerts/configure_alert_template.php:239
 #: ../../godmode/alerts/alert_actions.php:79
 #: ../../godmode/alerts/alert_commands.php:74
 msgid "Successfully updated"
 msgstr ""
 
-#: ../../godmode/alerts/alert_templates.php:127
+#: ../../godmode/alerts/alert_templates.php:122
 #: ../../godmode/alerts/configure_alert_template.php:240
 #: ../../godmode/alerts/alert_actions.php:80
 #: ../../godmode/alerts/alert_commands.php:75
@@ -4282,13 +4430,13 @@ msgstr ""
 
 #: ../../godmode/alerts/configure_alert_template.php:55
 #: ../../godmode/alerts/configure_alert_template.php:58
-#: ../../include/functions_db.php:1908
+#: ../../include/functions_db.php:1963
 msgid "Firing"
 msgstr ""
 
 #: ../../godmode/alerts/configure_alert_template.php:70
 #: ../../godmode/alerts/configure_alert_template.php:73
-#: ../../include/functions_db.php:1912
+#: ../../include/functions_db.php:1967
 msgid "Recovery"
 msgstr ""
 
@@ -4351,79 +4499,79 @@ msgstr ""
 msgid "Alert recovery"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:430
+#: ../../godmode/alerts/configure_alert_template.php:432
 msgid "Condition type"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:435
+#: ../../godmode/alerts/configure_alert_template.php:437
 msgid "Trigger when matches the value"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:439
-#: ../../include/functions_reporting.php:531
+#: ../../godmode/alerts/configure_alert_template.php:441
+#: ../../include/functions_reporting.php:533
 #: ../../operation/snmpconsole/snmp_view.php:208
 msgid "Value"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:446
+#: ../../godmode/alerts/configure_alert_template.php:448
 msgid "The regular expression is valid"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:450
+#: ../../godmode/alerts/configure_alert_template.php:452
 msgid "The regular expression is not valid"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:481
+#: ../../godmode/alerts/configure_alert_template.php:483
 msgid "Finish"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:484
+#: ../../godmode/alerts/configure_alert_template.php:486
 msgid "Next"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:498
+#: ../../godmode/alerts/configure_alert_template.php:500
 msgid ""
 "The alert would fire when the value matches <span id=\\\"value\\\"></span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:499
+#: ../../godmode/alerts/configure_alert_template.php:501
 msgid ""
 "The alert would fire when the value doesn't match <span id=\\\"value\\\"></"
 "span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:500
+#: ../../godmode/alerts/configure_alert_template.php:502
 msgid "The alert would fire when the value is <span id=\\\"value\\\"></span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:501
+#: ../../godmode/alerts/configure_alert_template.php:503
 msgid ""
 "The alert would fire when the value is not <span id=\\\"value\\\"></span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:502
+#: ../../godmode/alerts/configure_alert_template.php:504
 msgid ""
 "The alert would fire when the value is between <span id=\\\"min\\\"></span> "
 "and <span id=\\\"max\\\"></span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:503
+#: ../../godmode/alerts/configure_alert_template.php:505
 msgid ""
 "The alert would fire when the value is not between <span id=\\\"min\\\"></"
 "span> and <span id=\\\"max\\\"></span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:504
+#: ../../godmode/alerts/configure_alert_template.php:506
 msgid ""
 "The alert would fire when the value is under <span id=\\\"min\\\"></span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:505
+#: ../../godmode/alerts/configure_alert_template.php:507
 msgid ""
 "The alert would fire when the value is over <span id=\\\"max\\\"></span>"
 msgstr ""
 
-#: ../../godmode/alerts/configure_alert_template.php:544
+#: ../../godmode/alerts/configure_alert_template.php:546
 msgid "Empty"
 msgstr ""
 
@@ -4456,7 +4604,7 @@ msgid "Closed incidents"
 msgstr ""
 
 #: ../../include/functions_events.php:177
-#: ../../operation/events/events.php:415
+#: ../../operation/events/events.php:416
 msgid "No events"
 msgstr ""
 
@@ -4469,8 +4617,8 @@ msgid "St"
 msgstr ""
 
 #: ../../include/functions_events.php:202
-#: ../../include/functions_reporting.php:276
-#: ../../operation/events/events.php:259
+#: ../../include/functions_reporting.php:278
+#: ../../operation/events/events.php:260
 msgid "Event name"
 msgstr ""
 
@@ -4491,7 +4639,7 @@ msgid "Monitor down"
 msgstr ""
 
 #: ../../include/functions_events.php:242 ../../include/functions.php:848
-#: ../../include/functions_db.php:1997 ../../include/functions_ui.php:279
+#: ../../include/functions_db.php:2052 ../../include/functions_ui.php:279
 #: ../../operation/snmpconsole/snmp_view.php:335
 #: ../../operation/agentes/alerts_status.php:111
 #: ../../operation/agentes/bulbs.php:29
@@ -4507,15 +4655,15 @@ msgstr ""
 #: ../../operation/snmpconsole/snmp_view.php:156
 #: ../../operation/snmpconsole/snmp_view.php:221
 #: ../../operation/snmpconsole/snmp_view.php:384
-#: ../../operation/events/events.php:356
+#: ../../operation/events/events.php:357
 msgid "Alert"
 msgstr ""
 
-#: ../../include/functions_visual_map.php:166
+#: ../../include/functions_visual_map.php:213
 msgid "Static graph"
 msgstr ""
 
-#: ../../include/functions_visual_map.php:167
+#: ../../include/functions_visual_map.php:214
 #: ../../enterprise/include/functions_reporting_pdf.php:127
 msgid "Module graph"
 msgstr ""
@@ -4536,16 +4684,6 @@ msgstr ""
 msgid "Not equal to"
 msgstr ""
 
-#: ../../include/functions_alerts.php:253 ../../include/functions.php:734
-#: ../../include/functions.php:845 ../../include/functions_db.php:1135
-#: ../../enterprise/extensions/cron/functions.php:42
-#: ../../enterprise/include/functions_reporting_pdf.php:187
-#: ../../operation/reporting/reporting_viewer.php:225
-#: ../../operation/reporting/reporting_xml.php:212
-#: ../../operation/agentes/status_monitor.php:74
-msgid "Unknown"
-msgstr ""
-
 #: ../../include/functions.php:194
 msgid "You don't have access"
 msgstr ""
@@ -4572,52 +4710,52 @@ msgstr ""
 
 #: ../../include/functions.php:707
 #: ../../operation/reporting/reporting_viewer.php:147
-#: ../../operation/reporting/reporting_xml.php:169
+#: ../../operation/reporting/reporting_xml.php:165
 msgid "Simple graph"
 msgstr ""
 
 #: ../../include/functions.php:708
 #: ../../enterprise/include/functions_reporting_pdf.php:151
 #: ../../operation/reporting/reporting_viewer.php:161
-#: ../../operation/reporting/reporting_xml.php:175
+#: ../../operation/reporting/reporting_xml.php:171
 msgid "Custom graph"
 msgstr ""
 
 #: ../../include/functions.php:709
 #: ../../enterprise/include/functions_reporting_pdf.php:164
 #: ../../operation/reporting/reporting_viewer.php:192
-#: ../../operation/reporting/reporting_xml.php:193
+#: ../../operation/reporting/reporting_xml.php:189
 #: ../../operation/agentes/ver_agente.php:217
 #: ../../operation/agentes/sla_view.php:47
 #: ../../operation/agentes/sla_view.php:148
-msgid "S.L.A"
+msgid "S.L.A."
 msgstr ""
 
 #: ../../include/functions.php:710
 #: ../../enterprise/include/functions_reporting_pdf.php:215
 #: ../../operation/reporting/reporting_viewer.php:256
-#: ../../operation/reporting/reporting_xml.php:225
+#: ../../operation/reporting/reporting_xml.php:221
 msgid "Event report"
 msgstr ""
 
 #: ../../include/functions.php:711
 #: ../../enterprise/include/functions_reporting_pdf.php:226
 #: ../../operation/reporting/reporting_viewer.php:272
-#: ../../operation/reporting/reporting_xml.php:233
+#: ../../operation/reporting/reporting_xml.php:229
 msgid "Alert report"
 msgstr ""
 
 #: ../../include/functions.php:712
 #: ../../enterprise/include/functions_reporting_pdf.php:249
 #: ../../operation/reporting/reporting_viewer.php:286
-#: ../../operation/reporting/reporting_xml.php:240
+#: ../../operation/reporting/reporting_xml.php:236
 msgid "Monitor report"
 msgstr ""
 
 #: ../../include/functions.php:716
 #: ../../enterprise/include/functions_reporting_pdf.php:285
 #: ../../operation/reporting/reporting_viewer.php:349
-#: ../../operation/reporting/reporting_xml.php:262
+#: ../../operation/reporting/reporting_xml.php:258
 msgid "Sumatory"
 msgstr ""
 
@@ -4628,7 +4766,7 @@ msgstr ""
 #: ../../include/functions.php:719
 #: ../../enterprise/include/functions_reporting_pdf.php:324
 #: ../../operation/reporting/reporting_viewer.php:391
-#: ../../operation/reporting/reporting_xml.php:281
+#: ../../operation/reporting/reporting_xml.php:277
 msgid "Agents detailed view"
 msgstr ""
 
@@ -4644,52 +4782,52 @@ msgstr ""
 msgid "Recon host detected"
 msgstr ""
 
-#: ../../include/functions_db.php:1123
+#: ../../include/functions_db.php:1158
 msgid "Software agent data"
 msgstr ""
 
-#: ../../include/functions_db.php:1126
+#: ../../include/functions_db.php:1161
 msgid "Software agent monitor"
 msgstr ""
 
-#: ../../include/functions_db.php:1129
+#: ../../include/functions_db.php:1164
 msgid "Network agent data"
 msgstr ""
 
-#: ../../include/functions_db.php:1132
+#: ../../include/functions_db.php:1167
 msgid "Network agent monitor"
 msgstr ""
 
-#: ../../include/functions_db.php:1794
+#: ../../include/functions_db.php:1849
 msgid "Wrong module type"
 msgstr ""
 
-#: ../../include/functions_db.php:1905
+#: ../../include/functions_db.php:1960
 msgid "Oper"
 msgstr ""
 
-#: ../../include/functions_db.php:1907
+#: ../../include/functions_db.php:1962
 msgid "Tt"
 msgstr ""
 
-#: ../../include/functions_db.php:1909
+#: ../../include/functions_db.php:1964
 msgid "Time"
 msgstr ""
 
-#: ../../include/functions_db.php:1911
+#: ../../include/functions_db.php:1966
 msgid "Desc"
 msgstr ""
 
-#: ../../include/functions_db.php:1913
+#: ../../include/functions_db.php:1968
 msgid "MinMax.Al"
 msgstr ""
 
-#: ../../include/functions_db.php:1915
+#: ../../include/functions_db.php:1970
 #: ../../operation/snmpconsole/snmp_view.php:385
 msgid "Fired"
 msgstr ""
 
-#: ../../include/functions_db.php:1999 ../../include/functions_ui.php:285
+#: ../../include/functions_db.php:2054 ../../include/functions_ui.php:285
 #: ../../operation/snmpconsole/snmp_view.php:337
 #: ../../operation/agentes/alerts_status.php:112
 #: ../../operation/agentes/bulbs.php:37
@@ -4697,49 +4835,49 @@ msgstr ""
 msgid "Alert not fired"
 msgstr ""
 
-#: ../../include/functions_reporting.php:330
+#: ../../include/functions_reporting.php:332
 msgid "Alert description"
 msgstr ""
 
-#: ../../include/functions_reporting.php:331
-#: ../../include/functions_reporting.php:534
+#: ../../include/functions_reporting.php:333
+#: ../../include/functions_reporting.php:536
 msgid "Times Fired"
 msgstr ""
 
-#: ../../include/functions_reporting.php:379
+#: ../../include/functions_reporting.php:381
 #: ../../enterprise/include/functions_reporting_pdf.php:236
 msgid "Total alerts monitored"
 msgstr ""
 
-#: ../../include/functions_reporting.php:428
+#: ../../include/functions_reporting.php:430
 #: ../../enterprise/include/functions_reporting_pdf.php:311
 msgid "Total monitors"
 msgstr ""
 
-#: ../../include/functions_reporting.php:429
+#: ../../include/functions_reporting.php:431
 #: ../../enterprise/include/functions_reporting_pdf.php:312
 msgid "Monitors down on period"
 msgstr ""
 
-#: ../../include/functions_reporting.php:464
-#: ../../include/functions_reporting.php:595
+#: ../../include/functions_reporting.php:466
+#: ../../include/functions_reporting.php:597
 msgid "Monitor"
 msgstr ""
 
-#: ../../include/functions_reporting.php:509
+#: ../../include/functions_reporting.php:511
 #: ../../enterprise/include/functions_reporting_pdf.php:293
 msgid "Agents in group"
 msgstr ""
 
-#: ../../include/functions_reporting.php:532
+#: ../../include/functions_reporting.php:534
 msgid "Threshold"
 msgstr ""
 
-#: ../../include/functions_reporting.php:596
+#: ../../include/functions_reporting.php:598
 msgid "Last failure"
 msgstr ""
 
-#: ../../include/functions_reporting.php:691
+#: ../../include/functions_reporting.php:693
 #: ../../enterprise/include/functions_reporting_pdf.php:342
 msgid "Monitors"
 msgstr ""
@@ -4761,40 +4899,40 @@ msgstr ""
 msgid "Alert disabled"
 msgstr ""
 
-#: ../../include/functions_ui.php:333
+#: ../../include/functions_ui.php:331
 msgid "The alert would fire when the value is <span id=\"value\"></span>"
 msgstr ""
 
-#: ../../include/functions_ui.php:337
+#: ../../include/functions_ui.php:335
 msgid "The alert would fire when the value is not <span id=\"value\"></span>"
 msgstr ""
 
-#: ../../include/functions_ui.php:342
+#: ../../include/functions_ui.php:340
 msgid "The alert would fire when the value matches <span id=\"value\"></span>"
 msgstr ""
 
-#: ../../include/functions_ui.php:345
+#: ../../include/functions_ui.php:343
 msgid ""
 "The alert would fire when the value doesn't match <span id=\"value\"></span>"
 msgstr ""
 
-#: ../../include/functions_ui.php:351
+#: ../../include/functions_ui.php:349
 msgid ""
 "The alert would fire when the value is between <span id=\"min\"></span> and "
 "<span id=\"max\"></span>"
 msgstr ""
 
-#: ../../include/functions_ui.php:354
+#: ../../include/functions_ui.php:352
 msgid ""
 "The alert would fire when the value is not between <span id=\"min\"></span> "
 "and <span id=\"max\"></span>"
 msgstr ""
 
-#: ../../include/functions_ui.php:358
+#: ../../include/functions_ui.php:356
 msgid "The alert would fire when the value is over <span id=\"max\"></span>"
 msgstr ""
 
-#: ../../include/functions_ui.php:363
+#: ../../include/functions_ui.php:361
 msgid "The alert would fire when the value is under <span id=\"min\"></span>"
 msgstr ""
 
@@ -5084,7 +5222,7 @@ msgstr ""
 
 #: ../../enterprise/include/functions_reporting_pdf.php:169
 #: ../../operation/reporting/reporting_viewer.php:201
-#: ../../operation/reporting/reporting_xml.php:197
+#: ../../operation/reporting/reporting_xml.php:193
 msgid "There are no SLAs defined"
 msgstr ""
 
@@ -5323,7 +5461,7 @@ msgstr ""
 
 #: ../../operation/incidents/incident.php:258
 #: ../../operation/incidents/incident_detail.php:239
-#: ../../operation/events/events.php:264
+#: ../../operation/events/events.php:265
 msgid "Source"
 msgstr ""
 
@@ -5342,7 +5480,7 @@ msgstr ""
 
 #: ../../operation/incidents/incident.php:317
 #: ../../operation/incidents/incident_detail.php:206
-#: ../../operation/events/events.php:432
+#: ../../operation/events/events.php:433
 msgid "Create incident"
 msgstr ""
 
@@ -5703,7 +5841,7 @@ msgstr ""
 #: ../../operation/snmpconsole/snmp_view.php:391
 #: ../../operation/agentes/alerts_status.php:141
 #: ../../operation/agentes/alerts_status.php:194
-#: ../../operation/events/events.php:408
+#: ../../operation/events/events.php:409
 msgid "Validate"
 msgstr ""
 
@@ -5779,11 +5917,11 @@ msgstr ""
 msgid "Free text"
 msgstr ""
 
-#: ../../operation/agentes/status_monitor.php:202
+#: ../../operation/agentes/status_monitor.php:203
 msgid "Module Name"
 msgstr ""
 
-#: ../../operation/agentes/status_monitor.php:258
+#: ../../operation/agentes/status_monitor.php:259
 msgid "This group doesn't have any monitor"
 msgstr ""
 
@@ -6186,132 +6324,96 @@ msgstr ""
 msgid "User ack."
 msgstr ""
 
-#: ../../operation/events/events.php:213
+#: ../../operation/events/events.php:214
 msgid "Marquee display"
 msgstr ""
 
-#: ../../operation/events/events.php:215
+#: ../../operation/events/events.php:216
 msgid "RSS Events"
 msgstr ""
 
-#: ../../operation/events/events.php:298
+#: ../../operation/events/events.php:299
 msgid "Alert Recovered"
 msgstr ""
 
-#: ../../operation/events/events.php:301
+#: ../../operation/events/events.php:302
 msgid "Manual Alert Validation"
 msgstr ""
 
-#: ../../operation/events/events.php:304
+#: ../../operation/events/events.php:305
 msgid "Going up Warning"
 msgstr ""
 
-#: ../../operation/events/events.php:307
+#: ../../operation/events/events.php:308
 msgid "Going up Critical"
 msgstr ""
 
-#: ../../operation/events/events.php:310
+#: ../../operation/events/events.php:311
 msgid "Going to Normal"
 msgstr ""
 
-#: ../../operation/events/events.php:313
+#: ../../operation/events/events.php:314
 msgid "Going down Warning"
 msgstr ""
 
-#: ../../operation/events/events.php:317
+#: ../../operation/events/events.php:318
 msgid "Alert Fired"
 msgstr ""
 
-#: ../../operation/events/events.php:323
+#: ../../operation/events/events.php:324
 msgid "Host Detected (Recon)"
 msgstr ""
 
-#: ../../operation/events/events.php:326
+#: ../../operation/events/events.php:327
 msgid "New Agent"
 msgstr ""
 
-#: ../../operation/events/events.php:330
+#: ../../operation/events/events.php:331
 msgid "Unknown type"
 msgstr ""
 
-#: ../../operation/events/events.php:356
+#: ../../operation/events/events.php:357
 msgid "SNMP"
 msgstr ""
 
-#: ../../operation/events/events.php:422
+#: ../../operation/events/events.php:423
 msgid "Validated event"
 msgstr ""
 
-#: ../../operation/events/events.php:424
+#: ../../operation/events/events.php:425
 msgid "Not validated event"
 msgstr ""
 
-#: ../../operation/events/events.php:428
+#: ../../operation/events/events.php:429
 msgid "Validate event"
 msgstr ""
 
-#: ../../operation/events/events.php:430
+#: ../../operation/events/events.php:431
 msgid "Delete event"
 msgstr ""
 
-#: ../../operation/users/user_statistics.php:26
+#: ../../operation/users/user_statistics.php:24
 msgid "User activity statistics"
 msgstr ""
 
-#: ../../operation/users/user_edit.php:84 ../../operation/users/user.php:25
-msgid "Pandora users"
+#: ../../operation/users/user_edit.php:55
+msgid "Error updating user info"
 msgstr ""
 
-#: ../../operation/users/user_edit.php:85
-msgid "User detail editor"
+#: ../../operation/users/user_edit.php:79
+msgid "Current password"
 msgstr ""
 
-#: ../../operation/users/user_edit.php:120
-msgid "confirmation"
+#: ../../operation/users/user_edit.php:87
+msgid ""
+"You can not change your password from Pandora FMS under the current "
+"authentication scheme"
 msgstr ""
 
-#: ../../operation/users/user.php:72
-msgid "The user doesn't have any assigned profile/group"
-msgstr ""
-
-#: ../../operation/users/user.php:96
-msgid "System incidents reading"
-msgstr ""
-
-#: ../../operation/users/user.php:97
-msgid "System incidents writing"
-msgstr ""
-
-#: ../../operation/users/user.php:98
-msgid "System incidents management"
-msgstr ""
-
-#: ../../operation/users/user.php:99
-msgid "Agents reading"
-msgstr ""
-
-#: ../../operation/users/user.php:100
-msgid "Agents management"
-msgstr ""
-
-#: ../../operation/users/user.php:101
-msgid "Alerts editing"
-msgstr ""
-
-#: ../../operation/users/user.php:102
-msgid "Users management"
-msgstr ""
-
-#: ../../operation/users/user.php:103
-msgid "Database management"
-msgstr ""
-
-#: ../../operation/users/user.php:104
-msgid "Alerts management"
-msgstr ""
-
-#: ../../operation/users/user.php:105
-msgid "Systems management"
+#: ../../operation/users/user_edit.php:104
+msgid ""
+"You can not change your user info from Pandora FMS under the current "
+"authentication scheme"
 msgstr ""
 
 #: ../../operation/messages/message.php:26
diff --git a/pandora_console/include/languages/pt_BR.mo b/pandora_console/include/languages/pt_BR.mo
index 7fe887b6f2..0c94209579 100644
Binary files a/pandora_console/include/languages/pt_BR.mo and b/pandora_console/include/languages/pt_BR.mo differ
diff --git a/pandora_console/include/languages/pt_BR.po b/pandora_console/include/languages/pt_BR.po
index bbbe193565..c48266f10e 100644
--- a/pandora_console/include/languages/pt_BR.po
+++ b/pandora_console/include/languages/pt_BR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-18 12:34+0100\n"
-"PO-Revision-Date: 2008-10-28 17:00+0000\n"
-"Last-Translator: Cleber Paiva de Souza <cleberps@gmail.com>\n"
+"POT-Creation-Date: 2009-01-12 16:53+0100\n"
+"PO-Revision-Date: 2009-01-22 20:33+0000\n"
+"Last-Translator: Eri <bastos.eri@gmail.com>\n"
 "Language-Team: pt_br <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-12-22 09:09+0000\n"
+"X-Launchpad-Export-Date: 2009-01-23 08:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../../reporting/stat_win.php:46
@@ -26,7 +26,7 @@ msgstr "Houve um erro ao localizar a fonte do gráfico"
 #: ../../godmode/reporting/graph_builder.php:329
 #: ../../godmode/reporting/graph_builder.php:385
 #: ../../godmode/reporting/reporting_builder.php:392
-#: ../../operation/reporting/graph_viewer.php:124
+#: ../../include/functions_custom_graphs.php:101
 msgid "1 hour"
 msgstr "1 hora"
 
@@ -52,7 +52,7 @@ msgstr "12 horas"
 #: ../../godmode/reporting/graph_builder.php:344
 #: ../../godmode/reporting/graph_builder.php:371
 #: ../../godmode/reporting/reporting_builder.php:397
-#: ../../operation/reporting/graph_viewer.php:129
+#: ../../include/functions_custom_graphs.php:106
 msgid "1 day"
 msgstr "1 dia"
 
@@ -60,7 +60,7 @@ msgstr "1 dia"
 #: ../../godmode/reporting/graph_builder.php:347
 #: ../../godmode/reporting/graph_builder.php:391
 #: ../../godmode/reporting/reporting_builder.php:398
-#: ../../operation/reporting/graph_viewer.php:130
+#: ../../include/functions_custom_graphs.php:107
 msgid "2 days"
 msgstr "2 dias"
 
@@ -70,7 +70,7 @@ msgstr "5 dias"
 
 #: ../../reporting/stat_win.php:67 ../../reporting/stat_win.php:225
 #: ../../godmode/reporting/reporting_builder.php:399
-#: ../../operation/reporting/graph_viewer.php:131
+#: ../../include/functions_custom_graphs.php:108
 msgid "1 week"
 msgstr "1 semana"
 
@@ -83,7 +83,7 @@ msgstr "15 dias"
 
 #: ../../reporting/stat_win.php:71 ../../reporting/stat_win.php:227
 #: ../../godmode/reporting/reporting_builder.php:401
-#: ../../operation/reporting/graph_viewer.php:132
+#: ../../include/functions_custom_graphs.php:109
 msgid "1 month"
 msgstr "1 mês"
 
@@ -97,39 +97,39 @@ msgstr "2 meses"
 #: ../../godmode/reporting/graph_builder.php:365
 #: ../../godmode/reporting/graph_builder.php:396
 #: ../../godmode/reporting/reporting_builder.php:402
-#: ../../operation/reporting/graph_viewer.php:133
+#: ../../include/functions_custom_graphs.php:110
 msgid "6 months"
 msgstr "6 meses"
 
 #: ../../reporting/stat_win.php:114
 #: ../../godmode/agentes/module_manager_editor_wmi.php:217
-#: ../../godmode/agentes/module_manager_editor_data.php:144
-#: ../../godmode/agentes/module_manager_editor_plugin.php:184
-#: ../../godmode/agentes/module_manager_editor_network.php:239
-#: ../../godmode/agentes/alert_manager_editor.php:121
-#: ../../include/functions.php:919
+#: ../../godmode/agentes/module_manager_editor_data.php:147
+#: ../../godmode/agentes/module_manager_editor_plugin.php:186
+#: ../../godmode/agentes/module_manager_editor_network.php:245
+#: ../../godmode/agentes/alert_manager_editor.php:123
+#: ../../godmode/alerts/alert_templates.php:59 ../../include/functions.php:906
 #: ../../enterprise/include/functions_reporting_pdf.php:269
-#: ../../operation/reporting/reporting_viewer.php:320
+#: ../../operation/reporting/reporting_viewer.php:319
 #: ../../operation/reporting/reporting_xml.php:252
 msgid "Max. Value"
 msgstr "Valor Máximo"
 
-#: ../../reporting/stat_win.php:116 ../../include/functions.php:918
+#: ../../reporting/stat_win.php:116 ../../include/functions.php:905
 #: ../../enterprise/include/functions_reporting_pdf.php:261
-#: ../../operation/reporting/reporting_viewer.php:305
+#: ../../operation/reporting/reporting_viewer.php:304
 #: ../../operation/reporting/reporting_xml.php:247
 msgid "Avg. Value"
 msgstr "Valor médio"
 
 #: ../../reporting/stat_win.php:118
 #: ../../godmode/agentes/module_manager_editor_wmi.php:215
-#: ../../godmode/agentes/module_manager_editor_data.php:141
-#: ../../godmode/agentes/module_manager_editor_plugin.php:182
-#: ../../godmode/agentes/module_manager_editor_network.php:237
-#: ../../godmode/agentes/alert_manager_editor.php:116
-#: ../../include/functions.php:920
+#: ../../godmode/agentes/module_manager_editor_data.php:144
+#: ../../godmode/agentes/module_manager_editor_plugin.php:184
+#: ../../godmode/agentes/module_manager_editor_network.php:243
+#: ../../godmode/agentes/alert_manager_editor.php:118
+#: ../../godmode/alerts/alert_templates.php:67 ../../include/functions.php:907
 #: ../../enterprise/include/functions_reporting_pdf.php:277
-#: ../../operation/reporting/reporting_viewer.php:335
+#: ../../operation/reporting/reporting_viewer.php:334
 #: ../../operation/reporting/reporting_xml.php:257
 msgid "Min. Value"
 msgstr "Valor Mínimo"
@@ -162,88 +162,91 @@ msgstr "Mostrar eventos"
 msgid "Show alert"
 msgstr "Mostrar alertas"
 
-#: ../../reporting/fgraph.php:948
+#: ../../reporting/fgraph.php:946
 msgid "Data occurrence for module "
 msgstr "Ocorrência de dados para o módulo "
 
-#: ../../reporting/fgraph.php:1040 ../../include/functions_incidents.php:26
+#: ../../reporting/fgraph.php:1038 ../../include/functions_incidents.php:26
 msgid "Informative"
 msgstr "Informativo"
 
-#: ../../reporting/fgraph.php:1041 ../../include/functions_incidents.php:27
+#: ../../reporting/fgraph.php:1039 ../../include/functions_incidents.php:27
 msgid "Low"
 msgstr "Baixa"
 
-#: ../../reporting/fgraph.php:1042 ../../include/functions_incidents.php:28
+#: ../../reporting/fgraph.php:1040 ../../include/functions_incidents.php:28
 msgid "Medium"
 msgstr "Média"
 
-#: ../../reporting/fgraph.php:1043 ../../include/functions_incidents.php:29
+#: ../../reporting/fgraph.php:1041 ../../include/functions_incidents.php:29
 msgid "Serious"
 msgstr "Grave"
 
-#: ../../reporting/fgraph.php:1044 ../../include/functions_incidents.php:30
+#: ../../reporting/fgraph.php:1042 ../../include/functions_incidents.php:30
 msgid "Very serious"
 msgstr "Muito sério"
 
-#: ../../reporting/fgraph.php:1045 ../../reporting/fgraph.php:1265
-#: ../../include/functions_incidents.php:31 ../../include/functions.php:585
-#: ../../include/functions.php:1069 ../../include/functions.php:1088
+#: ../../reporting/fgraph.php:1043 ../../reporting/fgraph.php:1259
+#: ../../include/functions_incidents.php:31 ../../include/functions.php:617
+#: ../../include/functions.php:1058 ../../include/functions.php:1077
 msgid "Maintenance"
 msgstr "Manutenção"
 
-#: ../../reporting/fgraph.php:1273 ../../include/functions.php:588
-#: ../../include/functions.php:1070 ../../include/functions.php:1090
+#: ../../reporting/fgraph.php:1267 ../../include/functions.php:620
+#: ../../include/functions.php:1059 ../../include/functions.php:1079
 msgid "Informational"
 msgstr "Informação"
 
-#: ../../reporting/fgraph.php:1280 ../../include/functions.php:591
-#: ../../include/functions.php:1071 ../../include/functions.php:1092
+#: ../../reporting/fgraph.php:1274 ../../include/functions.php:623
+#: ../../include/functions.php:1060 ../../include/functions.php:1081
+#: ../../operation/agentes/estado_grupo.php:223
 msgid "Normal"
 msgstr "Normal"
 
-#: ../../reporting/fgraph.php:1287 ../../include/functions.php:594
-#: ../../include/functions.php:1072 ../../include/functions.php:1094
+#: ../../reporting/fgraph.php:1281 ../../include/functions.php:626
+#: ../../include/functions.php:1061 ../../include/functions.php:1083
+#: ../../operation/agentes/estado_grupo.php:225
 msgid "Warning"
 msgstr "Atenção"
 
-#: ../../reporting/fgraph.php:1294 ../../include/functions.php:597
-#: ../../include/functions.php:1073 ../../include/functions.php:1096
+#: ../../reporting/fgraph.php:1288 ../../include/functions.php:629
+#: ../../include/functions.php:1062 ../../include/functions.php:1085
+#: ../../operation/agentes/estado_grupo.php:227
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../../reporting/fgraph.php:1470
+#: ../../reporting/fgraph.php:1467
 msgid "Today"
 msgstr "Hoje"
 
-#: ../../reporting/fgraph.php:1471
+#: ../../reporting/fgraph.php:1468
 msgid "Week"
 msgstr "Semana"
 
-#: ../../reporting/fgraph.php:1472
+#: ../../reporting/fgraph.php:1469
 msgid "Month"
 msgstr "Mês"
 
-#: ../../reporting/fgraph.php:1473
+#: ../../reporting/fgraph.php:1470
 msgid "Months"
 msgstr "Meses"
 
-#: ../../reporting/fgraph.php:1474
+#: ../../reporting/fgraph.php:1471
 msgid "Older"
 msgstr "Anterior"
 
-#: ../../reporting/fgraph.php:1514
+#: ../../reporting/fgraph.php:1511
 msgid "no data"
 msgstr "sem dados"
 
-#: ../../reporting/fgraph.php:1581
+#: ../../reporting/fgraph.php:1578
 msgid "Out of limits"
 msgstr "Fora dos limites"
 
-#: ../../reporting/fgraph.php:2139 ../../include/functions_reporting.php:397
+#: ../../reporting/fgraph.php:2139 ../../include/functions_reporting.php:395
 #: ../../enterprise/include/functions_reporting_pdf.php:235
-#: ../../operation/agentes/estado_grupo.php:173
-#: ../../operation/agentes/ver_agente.php:109
+#: ../../operation/agentes/estado_grupo.php:175
+#: ../../operation/agentes/ver_agente.php:108
 #: ../../operation/agentes/tactical.php:133
 #: ../../operation/agentes/tactical.php:173
 msgid "Alerts fired"
@@ -281,22 +284,26 @@ msgstr ""
 msgid "Pandora FMS Help System"
 msgstr "Sistema de Ajuda do Pandora FMS"
 
-#: ../../general/login_page.php:32
+#: ../../general/login_page.php:28
 msgid "Pandora FMS Web Console"
 msgstr "Console Web do Pandora FMS"
 
-#: ../../general/login_page.php:38
+#: ../../general/login_page.php:35
+msgid "Login failed"
+msgstr "Falha na autenticação"
+
+#: ../../general/login_page.php:58
 msgid "Build"
 msgstr "Construir"
 
-#: ../../general/login_page.php:40
+#: ../../general/login_page.php:63
 msgid "Login"
 msgstr "Login"
 
-#: ../../general/login_page.php:43
+#: ../../general/login_page.php:66
 #: ../../godmode/servers/manage_export_form.php:107
 #: ../../godmode/agentes/module_manager_editor_wmi.php:166
-#: ../../godmode/agentes/module_manager_editor_plugin.php:136
+#: ../../godmode/agentes/module_manager_editor_plugin.php:138
 #: ../../godmode/modules/manage_network_components_form_wmi.php:182
 #: ../../godmode/users/configure_user.php:184
 #: ../../enterprise/godmode/agentes/inventory_manager.php:126
@@ -305,11 +312,15 @@ msgstr "Login"
 msgid "Password"
 msgstr "Senha"
 
-#: ../../general/footer.php:31
+#: ../../general/login_page.php:74
+msgid "Your IP"
+msgstr "Seu IP"
+
+#: ../../general/footer.php:27
 msgid "Page generated at"
 msgstr "Página gerada em"
 
-#: ../../general/footer.php:37
+#: ../../general/footer.php:33
 msgid "Pandora FMS console is best viewed with Firefox web browser"
 msgstr "O console do Pandora FMS é melhor visualizado no navegador Firefox"
 
@@ -325,10 +336,19 @@ msgstr ""
 "A sessão foi finalizada. Feche a janela do navegador para encerrar a sessão "
 "do Pandora.<br><br>"
 
-#: ../../general/links_menu.php:22 ../../godmode/menu.php:255
+#: ../../general/links_menu.php:21 ../../godmode/menu.php:148
 msgid "Links"
 msgstr "Links"
 
+#: ../../general/main_menu.php:98
+#: ../../godmode/agentes/alert_manager_editor.php:343
+msgid "Operation"
+msgstr "Operação"
+
+#: ../../general/main_menu.php:103
+msgid "Administration"
+msgstr "Administração"
+
 #: ../../general/noaccess.php:22
 msgid "You don't have access to this page"
 msgstr "Você não tem permissão para acessar esta página"
@@ -365,7 +385,7 @@ msgstr "Tem "
 msgid " unread message(s)."
 msgstr " mensagem(ns) não lidas."
 
-#: ../../general/logon_ok.php:47 ../../godmode/menu.php:263
+#: ../../general/logon_ok.php:47 ../../godmode/menu.php:150
 msgid "Site news"
 msgstr "Notícias do sistema"
 
@@ -375,16 +395,16 @@ msgstr "por"
 
 #: ../../general/logon_ok.php:54
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #: ../../general/logon_ok.php:61
 msgid "No news articles at this moment"
-msgstr ""
+msgstr "Sem novos artigos neste momento"
 
-#: ../../general/logon_ok.php:76 ../../include/functions.php:923
+#: ../../general/logon_ok.php:76 ../../include/functions.php:910
 #: ../../enterprise/include/functions_reporting_pdf.php:301
 #: ../../enterprise/dashboard/widgets/monitor_health.php:71
-#: ../../operation/reporting/reporting_viewer.php:378
+#: ../../operation/reporting/reporting_viewer.php:377
 #: ../../operation/reporting/reporting_xml.php:274
 #: ../../operation/agentes/tactical.php:67
 msgid "Monitor health"
@@ -423,7 +443,7 @@ msgstr "Sanidade do módulo"
 
 #: ../../general/logon_ok.php:86 ../../operation/agentes/tactical.php:88
 msgid "of total modules inited"
-msgstr ""
+msgstr "sobre o total de módulos iniciados"
 
 #: ../../general/logon_ok.php:88
 #: ../../enterprise/dashboard/widgets/monitor_health.php:79
@@ -449,7 +469,7 @@ msgstr "Total de verificações"
 
 #: ../../general/logon_ok.php:108
 msgid "Modules Down"
-msgstr ""
+msgstr "Módulos não sendo executados"
 
 #: ../../general/logon_ok.php:113 ../../operation/agentes/tactical.php:128
 #: ../../operation/agentes/tactical.php:168
@@ -458,7 +478,7 @@ msgstr "Alertas definidos"
 
 #: ../../general/logon_ok.php:118
 msgid "Users defined"
-msgstr ""
+msgstr "Usuários definidos"
 
 #: ../../general/logon_ok.php:137
 msgid "This is your last activity in Pandora FMS console"
@@ -476,22 +496,21 @@ msgstr "Usuário"
 #: ../../godmode/snmpconsole/snmp_alert.php:292
 #: ../../godmode/admin_access_logs.php:52
 #: ../../godmode/admin_access_logs.php:89
-#: ../../godmode/agentes/agent_template.php:159
-#: ../../godmode/agentes/alert_manager.php:115
-#: ../../godmode/agentes/alert_manager.php:191
-#: ../../godmode/agentes/module_manager.php:89
-#: ../../godmode/agentes/alert_manager_editor.php:371
+#: ../../godmode/agentes/agent_template.php:134
+#: ../../godmode/agentes/alert_manager.php:206
+#: ../../godmode/agentes/module_manager.php:83
+#: ../../godmode/agentes/alert_manager_editor.php:373
 #: ../../godmode/modules/manage_network_components.php:189
 #: ../../godmode/modules/manage_network_templates.php:54
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:82
 #: ../../operation/snmpconsole/snmp_view.php:224
 #: ../../operation/snmpconsole/snmp_view.php:390
-#: ../../operation/events/events.php:258 ../../operation/events/events.php:398
+#: ../../operation/events/events.php:276 ../../operation/events/events.php:427
 msgid "Action"
 msgstr "Ação"
 
 #: ../../general/logon_ok.php:147 ../../godmode/admin_access_logs.php:90
-#: ../../operation/reporting/reporting_viewer.php:70
+#: ../../operation/reporting/reporting_viewer.php:69
 msgid "Date"
 msgstr "Data"
 
@@ -509,43 +528,43 @@ msgstr "IP Origem"
 msgid "Comments"
 msgstr "Comentários"
 
-#: ../../general/header.php:31
+#: ../../general/header.php:36
 msgid "You are"
 msgstr "Você está"
 
-#: ../../general/header.php:35
+#: ../../general/header.php:40
 msgid "Logout"
 msgstr "Sair"
 
-#: ../../general/header.php:39
+#: ../../general/header.php:44
 msgid "General information"
 msgstr "Informação geral"
 
-#: ../../general/header.php:49 ../../general/header.php:55
+#: ../../general/header.php:54 ../../general/header.php:60
 msgid "All systems"
 msgstr "Todos os sistemas"
 
-#: ../../general/header.php:49
+#: ../../general/header.php:54
 #: ../../godmode/reporting/reporting_builder.php:469
 #: ../../enterprise/include/functions_reporting_pdf.php:254
-#: ../../operation/agentes/estado_grupo.php:225
+#: ../../operation/agentes/estado_grupo.php:230
 msgid "Down"
 msgstr "Sem atividade"
 
-#: ../../general/header.php:52
+#: ../../general/header.php:57
 msgid "servers down"
 msgstr "servidores parados"
 
-#: ../../general/header.php:55
+#: ../../general/header.php:60
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../../general/header.php:65 ../../general/header.php:67
+#: ../../general/header.php:70 ../../general/header.php:72
 msgid "Autorefresh"
 msgstr "Auto atualização"
 
-#: ../../general/header.php:72 ../../operation/events/event_statistics.php:32
-#: ../../operation/events/events.php:96
+#: ../../general/header.php:77 ../../operation/events/event_statistics.php:31
+#: ../../operation/events/events.php:103
 msgid "Events"
 msgstr "Eventos"
 
@@ -567,11 +586,11 @@ msgstr ""
 "logs do Pandora e podem ser revisadas para cada usuário. Comunique ao "
 "Administrador qualquer incidente ou falha."
 
-#: ../../index.php:111
+#: ../../index.php:109
 msgid "the Flexible Monitoring System"
 msgstr "Sistema Livre de Monitoramento"
 
-#: ../../index.php:256
+#: ../../index.php:231
 msgid "Sorry! I can't find the page!"
 msgstr "Desculpe! Não foi possível encontrar a página!"
 
@@ -610,6 +629,9 @@ msgid ""
 "Enterprise version, for more information visit <a "
 "href=\"http://pandorafms.com\">http://pandorafms.com</a>."
 msgstr ""
+"O Gerenciador de Atualizações é um dos recursos mais avançados da versão "
+"Enterprise do Pandora FMS 2.0, para maiores informações visite <a "
+"href=\"http://pandorafms.com\">http://pandorafms.com</a>."
 
 #: ../../extensions/update_manager/main.php:46
 msgid ""
@@ -617,6 +639,14 @@ msgid ""
 "of agents and modules running). To disable it, just delete extension or "
 "remove remote server address from Update Manager plugin setup."
 msgstr ""
+"O Gerenciador de Atualizações envia informações anônimas sobre o uso do "
+"Pandora FMS (número de agentes e módulos em execução). Para desabilitar "
+"isso, apenas exclua a extensão ou remova o endereço do servidor remoto do "
+"configurador de plugins do Gerenciador de Atualizações."
+
+#: ../../extensions/update_manager/main.php:54
+msgid "Updating"
+msgstr "Atualizando"
 
 #: ../../extensions/update_manager/main.php:66
 msgid "Your system is up-to-date"
@@ -632,20 +662,20 @@ msgstr "A autorização do servidor foi rejeitada"
 
 #: ../../extensions/update_manager/main.php:72
 msgid "There's a new update for Pandora FMS"
-msgstr ""
+msgstr "Existe uma nova atualização para o Pandora FMS"
 
 #: ../../extensions/update_manager/main.php:77
 msgid "Id"
 msgstr "Id"
 
 #: ../../extensions/update_manager/main.php:80
-#: ../../godmode/setup/news.php:121 ../../include/functions_events.php:193
-#: ../../include/functions_reporting.php:306
+#: ../../godmode/setup/news.php:121 ../../include/functions_events.php:210
+#: ../../include/functions_reporting.php:301
 #: ../../operation/snmpconsole/snmp_view.php:217
 #: ../../operation/agentes/status_monitor.php:184
 #: ../../operation/agentes/estado_ultimopaquete.php:59
 #: ../../operation/agentes/datos_agente.php:73
-#: ../../operation/events/events.php:255
+#: ../../operation/events/events.php:273
 #: ../../operation/messages/message.php:191
 msgid "Timestamp"
 msgstr "Data/Hora"
@@ -660,43 +690,44 @@ msgstr "Data/Hora"
 #: ../../godmode/snmpconsole/snmp_alert.php:174
 #: ../../godmode/snmpconsole/snmp_alert.php:284
 #: ../../godmode/agentes/module_manager_editor_wmi.php:244
-#: ../../godmode/agentes/agent_template.php:158
-#: ../../godmode/agentes/module_manager_editor_data.php:175
-#: ../../godmode/agentes/planned_downtime.php:149
-#: ../../godmode/agentes/planned_downtime.php:272
-#: ../../godmode/agentes/module_manager_editor_plugin.php:211
-#: ../../godmode/agentes/alert_manager.php:113
-#: ../../godmode/agentes/alert_manager.php:189
-#: ../../godmode/agentes/module_manager_editor_prediction.php:170
-#: ../../godmode/agentes/module_manager_editor_network.php:282
-#: ../../godmode/agentes/modificar_agente.php:224
-#: ../../godmode/agentes/agent_manager.php:135
-#: ../../godmode/agentes/module_manager.php:87
-#: ../../godmode/agentes/alert_manager_editor.php:111
-#: ../../godmode/agentes/alert_manager_editor.php:369
+#: ../../godmode/agentes/agent_template.php:133
+#: ../../godmode/agentes/module_manager_editor_data.php:178
+#: ../../godmode/agentes/planned_downtime.php:145
+#: ../../godmode/agentes/planned_downtime.php:268
+#: ../../godmode/agentes/module_manager_editor_plugin.php:213
+#: ../../godmode/agentes/module_manager_editor_prediction.php:159
+#: ../../godmode/agentes/module_manager_editor_network.php:311
+#: ../../godmode/agentes/modificar_agente.php:144
+#: ../../godmode/agentes/agent_manager.php:132
+#: ../../godmode/agentes/module_manager.php:81
+#: ../../godmode/agentes/alert_manager_editor.php:113
+#: ../../godmode/agentes/alert_manager_editor.php:371
 #: ../../godmode/modules/manage_network_components.php:185
 #: ../../godmode/modules/manage_network_templates.php:53
 #: ../../godmode/modules/manage_network_templates_form.php:107
 #: ../../godmode/modules/manage_network_templates_form.php:143
 #: ../../godmode/modules/module_list.php:57
 #: ../../godmode/users/user_list.php:70
-#: ../../godmode/alerts/modify_alert.php:85
+#: ../../godmode/alerts/configure_alert_command.php:56
+#: ../../godmode/alerts/alert_templates.php:73
+#: ../../godmode/alerts/alert_templates.php:166
+#: ../../godmode/alerts/configure_alert_template.php:411
 #: ../../godmode/alerts/configure_alert.php:88
-#: ../../include/functions_reporting.php:545
+#: ../../godmode/alerts/alert_commands.php:99
+#: ../../include/functions_reporting.php:547
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:72
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:177
 #: ../../enterprise/godmode/agentes/inventory_manager.php:161
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:79
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:57
-#: ../../operation/reporting/graph_viewer.php:168
+#: ../../operation/reporting/graph_viewer.php:143
 #: ../../operation/reporting/custom_reporting.php:44
 #: ../../operation/incidents/incident_detail.php:361
 #: ../../operation/incidents/incident_detail.php:401
 #: ../../operation/agentes/estado_generalagente.php:82
 #: ../../operation/agentes/estado_ultimopaquete.php:55
-#: ../../operation/agentes/estado_monitores.php:51
-#: ../../operation/agentes/estado_alertas.php:59
-#: ../../operation/agentes/estado_alertas.php:163
+#: ../../operation/agentes/estado_monitores.php:52
+#: ../../operation/agentes/estado_alertas.php:121
 #: ../../operation/users/user.php:35
 msgid "Description"
 msgstr "Descrição"
@@ -714,42 +745,41 @@ msgstr "Sobreescrever alterações locais"
 #: ../../godmode/servers/manage_recontask_form.php:141
 #: ../../godmode/servers/manage_export_form.php:126
 #: ../../godmode/servers/plugin.php:186
-#: ../../godmode/groups/configure_group.php:97
+#: ../../godmode/groups/configure_group.php:102
 #: ../../godmode/snmpconsole/snmp_alert.php:244
 #: ../../godmode/snmpconsole/snmp_alert.php:331
-#: ../../godmode/setup/setup.php:146 ../../godmode/setup/links.php:110
+#: ../../godmode/setup/setup.php:148 ../../godmode/setup/links.php:109
 #: ../../godmode/setup/news.php:113
 #: ../../godmode/profiles/profile_list.php:206
-#: ../../godmode/agentes/module_manager_editor_wmi.php:255
-#: ../../godmode/agentes/agent_template.php:193
-#: ../../godmode/agentes/module_manager_editor_data.php:187
-#: ../../godmode/agentes/planned_downtime.php:176
-#: ../../godmode/agentes/planned_downtime.php:298
-#: ../../godmode/agentes/module_manager_editor_plugin.php:222
-#: ../../godmode/agentes/alert_manager.php:99
-#: ../../godmode/agentes/alert_manager.php:147
-#: ../../godmode/agentes/alert_manager.php:174
-#: ../../godmode/agentes/module_manager_editor_prediction.php:181
-#: ../../godmode/agentes/module_manager_editor_network.php:293
-#: ../../godmode/agentes/agent_manager.php:168
-#: ../../godmode/agentes/module_manager.php:157
-#: ../../godmode/agentes/alert_manager_editor.php:290
-#: ../../godmode/agentes/alert_manager_editor.php:402
+#: ../../godmode/agentes/module_manager_editor_wmi.php:262
+#: ../../godmode/agentes/agent_template.php:151
+#: ../../godmode/agentes/module_manager_editor_data.php:197
+#: ../../godmode/agentes/planned_downtime.php:172
+#: ../../godmode/agentes/planned_downtime.php:294
+#: ../../godmode/agentes/module_manager_editor_plugin.php:231
+#: ../../godmode/agentes/module_manager_editor_prediction.php:178
+#: ../../godmode/agentes/module_manager_editor_network.php:329
+#: ../../godmode/agentes/agent_manager.php:165
+#: ../../godmode/agentes/module_manager.php:151
+#: ../../godmode/agentes/alert_manager_editor.php:292
+#: ../../godmode/agentes/alert_manager_editor.php:404
 #: ../../godmode/modules/manage_nc_groups_form.php:75
 #: ../../godmode/modules/manage_network_components_form_wmi.php:215
 #: ../../godmode/modules/manage_network_templates_form.php:113
 #: ../../godmode/modules/manage_network_components_form_network.php:284
 #: ../../godmode/users/configure_user.php:246
+#: ../../godmode/alerts/configure_alert_command.php:66
+#: ../../godmode/alerts/configure_alert_action.php:82
 #: ../../godmode/alerts/configure_alert.php:100
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:198
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:80
 #: ../../enterprise/godmode/agentes/inventory_manager.php:137
 #: ../../enterprise/godmode/agentes/inventory_manager.php:178
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:108
-#: ../../operation/reporting/reporting_viewer.php:73
-#: ../../operation/reporting/graph_viewer.php:153
-#: ../../operation/agentes/networkmap.php:318
-#: ../../operation/events/events.php:188
+#: ../../operation/reporting/reporting_viewer.php:72
+#: ../../operation/reporting/graph_viewer.php:127
+#: ../../operation/agentes/networkmap.php:316
+#: ../../operation/events/events.php:206
 #: ../../operation/users/user_edit.php:137
 msgid "Update"
 msgstr "Atualizar"
@@ -819,22 +849,24 @@ msgid "Public"
 msgstr "Público"
 
 #: ../../extensions/update_manager/lib/libupdate_manager.php:555
-#: ../../godmode/groups/group_list.php:125
+#: ../../godmode/groups/group_list.php:128
 #: ../../godmode/agentes/module_manager_editor_wmi.php:130
-#: ../../godmode/agentes/module_manager_editor_data.php:90
-#: ../../godmode/agentes/module_manager_editor_plugin.php:99
-#: ../../godmode/agentes/module_manager_editor_prediction.php:100
-#: ../../godmode/agentes/module_manager_editor_network.php:132
-#: ../../godmode/agentes/agent_manager.php:145
-#: ../../godmode/agentes/alert_manager_editor.php:102
-#: ../../godmode/agentes/alert_manager_editor.php:106
-#: ../../godmode/agentes/alert_manager_editor.php:271
+#: ../../godmode/agentes/module_manager_editor_data.php:93
+#: ../../godmode/agentes/module_manager_editor_plugin.php:101
+#: ../../godmode/agentes/module_manager_editor_prediction.php:101
+#: ../../godmode/agentes/module_manager_editor_network.php:138
+#: ../../godmode/agentes/agent_manager.php:142
+#: ../../godmode/agentes/alert_manager_editor.php:104
+#: ../../godmode/agentes/alert_manager_editor.php:108
 #: ../../godmode/agentes/alert_manager_editor.php:273
-#: ../../include/functions.php:684
+#: ../../godmode/agentes/alert_manager_editor.php:275
+#: ../../godmode/alerts/configure_alert_template.php:368
+#: ../../include/functions.php:709
 msgid "Disabled"
 msgstr "Desativado"
 
 #: ../../extensions/update_manager/lib/libupdate_manager.php:563
+#: ../../godmode/setup/setup.php:136
 msgid "Database"
 msgstr "Banco de Dados"
 
@@ -856,7 +888,7 @@ msgstr "Configurações do gerenciador de atualizações"
 
 #: ../../godmode/reporting/map_builder.php:65
 #: ../../godmode/reporting/map_builder.php:164 ../../godmode/setup/news.php:38
-#: ../../godmode/agentes/planned_downtime.php:122
+#: ../../godmode/agentes/planned_downtime.php:118
 #: ../../godmode/modules/manage_network_components.php:78
 #: ../../godmode/modules/manage_nc_groups.php:40
 msgid "Created successfully"
@@ -864,8 +896,8 @@ msgstr "Criado satisfatoriamente"
 
 #: ../../godmode/reporting/map_builder.php:67
 #: ../../godmode/reporting/map_builder.php:166 ../../godmode/setup/news.php:38
-#: ../../godmode/agentes/planned_downtime.php:100
-#: ../../godmode/agentes/planned_downtime.php:120
+#: ../../godmode/agentes/planned_downtime.php:96
+#: ../../godmode/agentes/planned_downtime.php:116
 #: ../../godmode/modules/manage_network_components.php:76
 #: ../../godmode/modules/manage_nc_groups.php:38
 msgid "Not created. Error inserting data"
@@ -874,24 +906,24 @@ msgstr "Não foi possível criar. Erro ao inserir os dados na Base de Dados"
 #: ../../godmode/reporting/map_builder.php:80
 #: ../../godmode/reporting/reporting_builder.php:80
 #: ../../godmode/setup/news.php:60
-#: ../../godmode/agentes/planned_downtime.php:87
+#: ../../godmode/agentes/planned_downtime.php:83
 #: ../../godmode/modules/manage_network_components.php:129
 #: ../../godmode/modules/manage_nc_groups.php:66
 #: ../../godmode/modules/manage_network_templates.php:39
-#: ../../operation/reporting/graph_viewer.php:33
-#: ../../operation/reporting/graph_viewer.php:38
+#: ../../operation/reporting/graph_viewer.php:35
+#: ../../operation/reporting/graph_viewer.php:40
 msgid "Deleted successfully"
 msgstr "Apagado corretamente"
 
 #: ../../godmode/reporting/map_builder.php:82
 #: ../../godmode/reporting/reporting_builder.php:82
 #: ../../godmode/setup/news.php:60
-#: ../../godmode/agentes/planned_downtime.php:85
+#: ../../godmode/agentes/planned_downtime.php:81
 #: ../../godmode/modules/manage_network_components.php:127
 #: ../../godmode/modules/manage_nc_groups.php:64
 #: ../../godmode/modules/manage_network_templates.php:37
-#: ../../operation/reporting/graph_viewer.php:35
-#: ../../operation/reporting/graph_viewer.php:40
+#: ../../operation/reporting/graph_viewer.php:37
+#: ../../operation/reporting/graph_viewer.php:42
 msgid "Not deleted. Error deleting data"
 msgstr "Não foi possível apagar. Erro ao apagar os dados na Base de Dados"
 
@@ -925,15 +957,15 @@ msgstr ""
 #: ../../godmode/reporting/reporting_builder.php:250
 #: ../../godmode/reporting/reporting_builder.php:327
 #: ../../godmode/reporting/reporting_builder.php:494
-#: ../../operation/reporting/reporting_viewer.php:53
-#: ../../operation/reporting/graph_viewer.php:109
-#: ../../operation/reporting/graph_viewer.php:158
+#: ../../operation/reporting/reporting_viewer.php:52
+#: ../../operation/reporting/graph_viewer.php:94
+#: ../../operation/reporting/graph_viewer.php:132
 #: ../../operation/reporting/custom_reporting.php:31
-#: ../../operation/menu.php:265
+#: ../../operation/menu.php:170
 msgid "Reporting"
 msgstr "Relatórios"
 
-#: ../../godmode/reporting/map_builder.php:253 ../../godmode/menu.php:186
+#: ../../godmode/reporting/map_builder.php:253 ../../godmode/menu.php:112
 msgid "Map builder"
 msgstr "Gerador de mapas"
 
@@ -946,10 +978,10 @@ msgstr "Nome do mapa"
 #: ../../godmode/reporting/reporting_builder.php:337
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:127
-#: ../../godmode/agentes/planned_downtime.php:227
-#: ../../godmode/agentes/modificar_agente.php:146
-#: ../../godmode/agentes/modificar_agente.php:223
-#: ../../godmode/agentes/agent_manager.php:107
+#: ../../godmode/agentes/planned_downtime.php:223
+#: ../../godmode/agentes/modificar_agente.php:66
+#: ../../godmode/agentes/modificar_agente.php:143
+#: ../../godmode/agentes/agent_manager.php:100
 #: ../../godmode/modules/manage_network_components.php:152
 #: ../../godmode/modules/manage_network_components_form_wmi.php:109
 #: ../../godmode/modules/manage_network_templates_form.php:144
@@ -958,7 +990,7 @@ msgstr "Nome do mapa"
 #: ../../enterprise/include/functions_reporting_pdf.php:292
 #: ../../enterprise/include/functions_reporting_pdf.php:325
 #: ../../enterprise/operation/inventory/inventory.php:38
-#: ../../operation/reporting/reporting_viewer.php:365
+#: ../../operation/reporting/reporting_viewer.php:364
 #: ../../operation/reporting/reporting_xml.php:267
 #: ../../operation/incidents/incident.php:256
 #: ../../operation/incidents/incident_detail.php:256
@@ -966,11 +998,12 @@ msgstr "Nome do mapa"
 #: ../../operation/visual_console/index.php:36
 #: ../../operation/agentes/status_monitor.php:58
 #: ../../operation/agentes/estado_generalagente.php:86
-#: ../../operation/agentes/ver_agente.php:53
+#: ../../operation/agentes/ver_agente.php:52
+#: ../../operation/agentes/ver_agente.php:230
 #: ../../operation/agentes/estado_agente.php:53
 #: ../../operation/agentes/estado_agente.php:151
-#: ../../operation/agentes/estado_alertas.php:134
-#: ../../operation/events/events.php:117 ../../operation/events/events.php:249
+#: ../../operation/agentes/estado_alertas.php:95
+#: ../../operation/events/events.php:122 ../../operation/events/events.php:267
 msgid "Group"
 msgstr "Grupo"
 
@@ -983,36 +1016,35 @@ msgstr "Grupo"
 #: ../../godmode/reporting/reporting_builder.php:508
 #: ../../godmode/servers/modificar_server.php:87
 #: ../../godmode/servers/plugin.php:200
-#: ../../godmode/groups/group_list.php:110
+#: ../../godmode/groups/group_list.php:113
 #: ../../godmode/snmpconsole/snmp_alert.php:329
-#: ../../godmode/setup/links.php:119 ../../godmode/setup/news.php:122
+#: ../../godmode/setup/links.php:118 ../../godmode/setup/news.php:122
 #: ../../godmode/profiles/profile_list.php:241
-#: ../../godmode/agentes/agent_template.php:186
-#: ../../godmode/agentes/planned_downtime.php:255
-#: ../../godmode/agentes/planned_downtime.php:296
-#: ../../godmode/agentes/alert_manager.php:95
-#: ../../godmode/agentes/alert_manager.php:145
-#: ../../godmode/agentes/alert_manager.php:172
-#: ../../godmode/agentes/modificar_agente.php:225
-#: ../../godmode/agentes/module_manager.php:153
-#: ../../godmode/agentes/alert_manager_editor.php:400
+#: ../../godmode/agentes/agent_template.php:150
+#: ../../godmode/agentes/planned_downtime.php:251
+#: ../../godmode/agentes/planned_downtime.php:292
+#: ../../godmode/agentes/modificar_agente.php:145
+#: ../../godmode/agentes/module_manager.php:147
+#: ../../godmode/agentes/alert_manager_editor.php:402
 #: ../../godmode/modules/manage_network_components.php:232
 #: ../../godmode/modules/manage_nc_groups.php:76
 #: ../../godmode/modules/manage_network_templates_form.php:163
-#: ../../godmode/users/user_list.php:73 ../../godmode/db/db_refine.php:110
-#: ../../godmode/alerts/modify_alert.php:86
+#: ../../godmode/users/user_list.php:73 ../../godmode/db/db_refine.php:93
+#: ../../godmode/alerts/alert_templates.php:168
+#: ../../godmode/alerts/alert_actions.php:96
+#: ../../godmode/alerts/alert_commands.php:100
 #: ../../enterprise/extensions/cron/main.php:89
 #: ../../enterprise/extensions/cron/main.php:105
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:194
 #: ../../enterprise/godmode/agentes/inventory_manager.php:174
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:104
-#: ../../operation/reporting/graph_viewer.php:171
+#: ../../operation/reporting/graph_viewer.php:145
 #: ../../operation/incidents/incident_detail.php:363
 #: ../../operation/snmpconsole/snmp_view.php:349
 #: ../../operation/snmpconsole/snmp_view.php:372
 #: ../../operation/snmpconsole/snmp_view.php:393
 #: ../../operation/agentes/datos_agente.php:70
-#: ../../operation/events/events.php:383
+#: ../../operation/events/events.php:411
 #: ../../operation/messages/message.php:192
 msgid "Delete"
 msgstr "Apagar"
@@ -1026,26 +1058,30 @@ msgstr "Apagar"
 #: ../../godmode/servers/manage_export.php:128
 #: ../../godmode/servers/manage_recontask.php:136
 #: ../../godmode/servers/plugin.php:184 ../../godmode/servers/plugin.php:229
-#: ../../godmode/groups/configure_group.php:100
+#: ../../godmode/groups/configure_group.php:105
 #: ../../godmode/snmpconsole/snmp_alert.php:246
 #: ../../godmode/snmpconsole/snmp_alert.php:346
 #: ../../godmode/profiles/profile_list.php:201
-#: ../../godmode/agentes/module_manager_editor_wmi.php:253
-#: ../../godmode/agentes/module_manager_editor_data.php:185
-#: ../../godmode/agentes/planned_downtime.php:313
-#: ../../godmode/agentes/module_manager_editor_plugin.php:220
-#: ../../godmode/agentes/alert_manager.php:47
-#: ../../godmode/agentes/module_manager_editor_prediction.php:179
-#: ../../godmode/agentes/module_manager_editor_network.php:291
-#: ../../godmode/agentes/agent_manager.php:165
-#: ../../godmode/agentes/module_manager.php:68
+#: ../../godmode/agentes/module_manager_editor_wmi.php:260
+#: ../../godmode/agentes/module_manager_editor_data.php:195
+#: ../../godmode/agentes/planned_downtime.php:309
+#: ../../godmode/agentes/module_manager_editor_plugin.php:229
+#: ../../godmode/agentes/module_manager_editor_prediction.php:176
+#: ../../godmode/agentes/module_manager_editor_network.php:327
+#: ../../godmode/agentes/agent_manager.php:162
+#: ../../godmode/agentes/module_manager.php:62
 #: ../../godmode/modules/manage_network_components.php:169
 #: ../../godmode/modules/manage_nc_groups.php:109
 #: ../../godmode/modules/manage_nc_groups_form.php:73
 #: ../../godmode/modules/manage_network_templates.php:92
 #: ../../godmode/modules/manage_network_templates_form.php:115
 #: ../../godmode/users/configure_user.php:282
+#: ../../godmode/alerts/configure_alert_command.php:69
+#: ../../godmode/alerts/configure_alert_action.php:85
+#: ../../godmode/alerts/alert_templates.php:200
+#: ../../godmode/alerts/alert_actions.php:124
 #: ../../godmode/alerts/configure_alert.php:98
+#: ../../godmode/alerts/alert_commands.php:135
 #: ../../enterprise/extensions/cron/main.php:138
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:213
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:117
@@ -1061,18 +1097,23 @@ msgstr "Criar"
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_export_form.php:73
 #: ../../godmode/servers/plugin.php:145 ../../godmode/servers/plugin.php:198
-#: ../../godmode/groups/group_list.php:107
-#: ../../godmode/groups/configure_group.php:65
-#: ../../godmode/agentes/planned_downtime.php:147
-#: ../../godmode/agentes/planned_downtime.php:226
-#: ../../godmode/agentes/alert_manager.php:106
-#: ../../godmode/agentes/alert_manager.php:182
+#: ../../godmode/groups/group_list.php:110
+#: ../../godmode/groups/configure_group.php:67
+#: ../../godmode/agentes/planned_downtime.php:143
+#: ../../godmode/agentes/planned_downtime.php:222
 #: ../../godmode/modules/manage_nc_groups.php:74
 #: ../../godmode/modules/manage_nc_groups_form.php:54
 #: ../../godmode/modules/manage_network_templates.php:52
 #: ../../godmode/modules/manage_network_templates_form.php:103
 #: ../../godmode/modules/module_list.php:56
-#: ../../godmode/users/user_list.php:67 ../../include/functions_db.php:1857
+#: ../../godmode/users/user_list.php:67
+#: ../../godmode/alerts/configure_alert_command.php:52
+#: ../../godmode/alerts/configure_alert_action.php:56
+#: ../../godmode/alerts/alert_templates.php:165
+#: ../../godmode/alerts/configure_alert_template.php:408
+#: ../../godmode/alerts/alert_actions.php:95
+#: ../../godmode/alerts/alert_commands.php:98
+#: ../../include/functions_db.php:1970
 #: ../../enterprise/godmode/agentes/inventory_manager.php:160
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:78
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:55
@@ -1080,7 +1121,6 @@ msgstr "Criar"
 #: ../../operation/extensions.php:36
 #: ../../operation/servers/view_server.php:53
 #: ../../operation/visual_console/index.php:35
-#: ../../operation/agentes/estado_alertas.php:58
 #: ../../operation/agentes/tactical.php:219 ../../operation/users/user.php:34
 msgid "Name"
 msgstr "Nome"
@@ -1107,7 +1147,7 @@ msgstr "visualizar"
 
 #: ../../godmode/reporting/map_builder.php:345
 msgid "Map element trash"
-msgstr ""
+msgstr "Lixo de elementos do mapa"
 
 #: ../../godmode/reporting/map_builder.php:346
 msgid "Drag an element here to delete from the map"
@@ -1132,7 +1172,7 @@ msgstr "Último dia"
 #: ../../godmode/reporting/map_builder.php:365
 #: ../../godmode/servers/manage_recontask_form.php:91
 #: ../../godmode/db/db_main.php:43 ../../godmode/db/db_main.php:44
-#: ../../include/functions.php:465
+#: ../../include/functions.php:507
 #: ../../enterprise/godmode/agentes/inventory_manager.php:119
 #: ../../enterprise/godmode/agentes/inventory_manager.php:120
 #: ../../enterprise/godmode/agentes/inventory_manager.php:121
@@ -1176,24 +1216,23 @@ msgstr "Cor do rótulo"
 #: ../../godmode/reporting/map_builder.php:388
 #: ../../godmode/reporting/reporting_builder.php:438
 #: ../../godmode/servers/modificar_server.php:87
-#: ../../godmode/agentes/agent_template.php:157
-#: ../../godmode/agentes/alert_manager.php:107
-#: ../../godmode/agentes/alert_manager.php:183
-#: ../../godmode/agentes/module_manager.php:85
-#: ../../godmode/agentes/alert_manager_editor.php:363
+#: ../../godmode/agentes/agent_template.php:132
+#: ../../godmode/agentes/module_manager.php:79
+#: ../../godmode/agentes/alert_manager_editor.php:365
 #: ../../godmode/modules/manage_network_components.php:183
 #: ../../godmode/modules/manage_network_templates_form.php:141
-#: ../../include/functions_events.php:181
-#: ../../include/functions_reporting.php:544
+#: ../../godmode/alerts/alert_templates.php:43
+#: ../../godmode/alerts/alert_templates.php:167
+#: ../../include/functions_events.php:198
+#: ../../include/functions_reporting.php:546
 #: ../../operation/servers/view_server.php:58
 #: ../../operation/agentes/status_monitor.php:173
 #: ../../operation/agentes/estado_ultimopaquete.php:53
-#: ../../operation/agentes/estado_monitores.php:49
+#: ../../operation/agentes/estado_monitores.php:50
 #: ../../operation/agentes/sla_view.php:45
 #: ../../operation/agentes/sla_view.php:146
-#: ../../operation/agentes/estado_alertas.php:57
-#: ../../operation/agentes/estado_alertas.php:162
-#: ../../operation/events/events.php:237
+#: ../../operation/agentes/estado_alertas.php:119
+#: ../../operation/events/events.php:255
 msgid "Type"
 msgstr "Tipo"
 
@@ -1202,17 +1241,16 @@ msgstr "Tipo"
 #: ../../godmode/reporting/reporting_builder.php:262
 #: ../../godmode/reporting/reporting_builder.php:300
 #: ../../godmode/reporting/reporting_builder.php:439
-#: ../../godmode/agentes/alert_manager_editor.php:361
-#: ../../include/functions_reporting.php:352
+#: ../../godmode/agentes/alert_manager_editor.php:363
+#: ../../include/functions_reporting.php:348
 #: ../../include/functions_reporting.php:480
-#: ../../include/functions_reporting.php:652
+#: ../../include/functions_reporting.php:656
 #: ../../enterprise/include/functions_reporting_pdf.php:178
 #: ../../enterprise/operation/inventory/inventory.php:52
-#: ../../operation/reporting/reporting_viewer.php:212
+#: ../../operation/reporting/reporting_viewer.php:211
 #: ../../operation/snmpconsole/snmp_view.php:148
 #: ../../operation/agentes/status_monitor.php:171
 #: ../../operation/agentes/estado_agente.php:148
-#: ../../operation/agentes/estado_alertas.php:160
 msgid "Agent"
 msgstr "Agente"
 
@@ -1222,12 +1260,13 @@ msgstr "Agente"
 #: ../../godmode/reporting/reporting_builder.php:302
 #: ../../godmode/reporting/reporting_builder.php:408
 #: ../../godmode/reporting/reporting_builder.php:440
-#: ../../godmode/agentes/alert_manager_editor.php:362
+#: ../../godmode/agentes/alert_manager.php:78
+#: ../../godmode/agentes/alert_manager_editor.php:364
 #: ../../enterprise/godmode/agentes/inventory_manager.php:104
 #: ../../enterprise/include/functions_reporting_pdf.php:179
 #: ../../enterprise/operation/agentes/agent_inventory.php:43
 #: ../../enterprise/operation/inventory/inventory.php:43
-#: ../../operation/reporting/reporting_viewer.php:214
+#: ../../operation/reporting/reporting_viewer.php:213
 #: ../../operation/agentes/exportdata.php:174
 msgid "Module"
 msgstr "Módulo"
@@ -1236,7 +1275,7 @@ msgstr "Módulo"
 #: ../../godmode/reporting/graph_builder.php:376
 #: ../../godmode/reporting/reporting_builder.php:390
 #: ../../godmode/reporting/reporting_builder.php:441
-#: ../../operation/reporting/graph_viewer.php:121
+#: ../../operation/reporting/graph_viewer.php:104
 msgid "Period"
 msgstr "Período"
 
@@ -1245,9 +1284,9 @@ msgid "Image"
 msgstr "Imagem"
 
 #: ../../godmode/reporting/map_builder.php:403
-#: ../../godmode/groups/group_list.php:108
-#: ../../godmode/groups/configure_group.php:77
-#: ../../godmode/agentes/agent_manager.php:104
+#: ../../godmode/groups/group_list.php:111
+#: ../../godmode/groups/configure_group.php:79
+#: ../../godmode/agentes/agent_manager.php:97
 #: ../../godmode/modules/manage_nc_groups.php:75
 #: ../../godmode/modules/manage_nc_groups_form.php:58
 #: ../../operation/agentes/estado_generalagente.php:74
@@ -1259,7 +1298,7 @@ msgid "Map linked"
 msgstr "Mapa linkado"
 
 #: ../../godmode/reporting/map_builder.php:441
-#: ../../operation/reporting/reporting_viewer.php:82
+#: ../../operation/reporting/reporting_viewer.php:81
 msgid "Loading"
 msgstr "Carregando"
 
@@ -1281,32 +1320,32 @@ msgid "Weight"
 msgstr "Peso"
 
 #: ../../godmode/reporting/graph_builder.php:252
-#: ../../operation/reporting/graph_viewer.php:110
+#: ../../operation/reporting/graph_viewer.php:95
 msgid "Combined image render"
 msgstr "Visualização de imagens combinadas"
 
-#: ../../godmode/reporting/graph_builder.php:264 ../../godmode/menu.php:176
+#: ../../godmode/reporting/graph_builder.php:264 ../../godmode/menu.php:109
 msgid "Graph builder"
 msgstr "Construtor de gráficos"
 
 #: ../../godmode/reporting/graph_builder.php:272
 #: ../../godmode/reporting/reporting_builder.php:405
-#: ../../godmode/agentes/manage_config_remote.php:99
-#: ../../godmode/agentes/manage_config.php:386
-#: ../../godmode/db/db_refine.php:73
-#: ../../operation/agentes/exportdata.php:241
+#: ../../godmode/agentes/manage_config_remote.php:97
+#: ../../godmode/agentes/manage_config.php:382
+#: ../../godmode/db/db_refine.php:64
+#: ../../operation/agentes/exportdata.php:240
 msgid "Source agent"
 msgstr "Agente de origem"
 
 #: ../../godmode/reporting/graph_builder.php:285
-#: ../../godmode/agentes/configurar_agente.php:212
-#: ../../godmode/agentes/manage_config.php:436
-#: ../../godmode/agentes/manage_config.php:445
-#: ../../godmode/agentes/module_manager.php:31
-#: ../../godmode/db/db_refine.php:91 ../../include/functions_reporting.php:653
+#: ../../godmode/agentes/configurar_agente.php:214
+#: ../../godmode/agentes/manage_config.php:432
+#: ../../godmode/agentes/manage_config.php:441
+#: ../../godmode/agentes/module_manager.php:25
+#: ../../godmode/db/db_refine.php:76 ../../include/functions_reporting.php:657
 #: ../../enterprise/include/functions_reporting_pdf.php:329
 #: ../../operation/servers/view_server.php:56
-#: ../../operation/agentes/exportdata.php:268
+#: ../../operation/agentes/exportdata.php:267
 #: ../../operation/agentes/estado_agente.php:152
 msgid "Modules"
 msgstr "Módulos"
@@ -1326,8 +1365,8 @@ msgstr "Ver agora"
 #: ../../godmode/reporting/graph_builder.php:483
 #: ../../godmode/servers/manage_recontask.php:117
 #: ../../godmode/servers/manage_recontask_form.php:131
-#: ../../include/functions.php:739 ../../include/functions.php:823
-#: ../../include/functions_db.php:1930
+#: ../../include/functions.php:764 ../../include/functions.php:850
+#: ../../include/functions_db.php:2043
 msgid "Yes"
 msgstr "Sim"
 
@@ -1338,8 +1377,8 @@ msgstr "Sim"
 #: ../../godmode/reporting/graph_builder.php:482
 #: ../../godmode/servers/manage_recontask.php:117
 #: ../../godmode/servers/manage_recontask_form.php:131
-#: ../../include/functions.php:741 ../../include/functions.php:825
-#: ../../include/functions_db.php:1932
+#: ../../include/functions.php:766 ../../include/functions.php:850
+#: ../../include/functions_db.php:2045
 msgid "No"
 msgstr "Não"
 
@@ -1361,7 +1400,7 @@ msgstr "Último mês"
 msgid "1 year"
 msgstr "1 ano"
 
-#: ../../godmode/reporting/graph_builder.php:400 ../../operation/menu.php:172
+#: ../../godmode/reporting/graph_builder.php:400 ../../operation/menu.php:111
 msgid "View events"
 msgstr "Ver eventos"
 
@@ -1370,17 +1409,17 @@ msgid "Stacked"
 msgstr "Empilhado"
 
 #: ../../godmode/reporting/graph_builder.php:418
-#: ../../operation/reporting/graph_viewer.php:139
+#: ../../operation/reporting/graph_viewer.php:113
 msgid "Area"
 msgstr "Área"
 
 #: ../../godmode/reporting/graph_builder.php:419
-#: ../../operation/reporting/graph_viewer.php:140
+#: ../../operation/reporting/graph_viewer.php:114
 msgid "Stacked area"
 msgstr "Área empilhada"
 
 #: ../../godmode/reporting/graph_builder.php:420
-#: ../../operation/reporting/graph_viewer.php:141
+#: ../../operation/reporting/graph_viewer.php:115
 msgid "Line"
 msgstr "Linha"
 
@@ -1388,11 +1427,13 @@ msgstr "Linha"
 #: ../../godmode/reporting/reporting_builder.php:425
 #: ../../godmode/servers/manage_recontask_form.php:143
 #: ../../godmode/servers/manage_export_form.php:128
-#: ../../godmode/setup/links.php:139 ../../godmode/setup/news.php:146
-#: ../../godmode/agentes/planned_downtime.php:179
-#: ../../godmode/agentes/planned_downtime.php:216
-#: ../../godmode/agentes/alert_manager_editor.php:292
-#: ../../godmode/agentes/alert_manager_editor.php:355
+#: ../../godmode/setup/links.php:138 ../../godmode/setup/news.php:146
+#: ../../godmode/agentes/planned_downtime.php:175
+#: ../../godmode/agentes/planned_downtime.php:212
+#: ../../godmode/agentes/alert_manager.php:221
+#: ../../godmode/agentes/alert_manager.php:288
+#: ../../godmode/agentes/alert_manager_editor.php:294
+#: ../../godmode/agentes/alert_manager_editor.php:357
 #: ../../godmode/modules/manage_network_components_form_wmi.php:217
 #: ../../godmode/modules/manage_network_templates_form.php:216
 #: ../../godmode/modules/manage_network_components_form_network.php:286
@@ -1443,7 +1484,7 @@ msgstr "O SLA foi criado com sucesso"
 
 #: ../../godmode/reporting/reporting_builder.php:231
 msgid "There was a problem creating SLA"
-msgstr ""
+msgstr "Houve um problema durante a criação do SLA"
 
 #: ../../godmode/reporting/reporting_builder.php:234
 msgid "Module is not set"
@@ -1469,14 +1510,14 @@ msgstr "SLAs definidos"
 #: ../../godmode/reporting/reporting_builder.php:264
 #: ../../godmode/reporting/reporting_builder.php:304
 #: ../../enterprise/include/functions_reporting_pdf.php:181
-#: ../../operation/reporting/reporting_viewer.php:218
+#: ../../operation/reporting/reporting_viewer.php:217
 msgid "SLA Min. (value)"
 msgstr "Valor mínimo para o SLA"
 
 #: ../../godmode/reporting/reporting_builder.php:265
 #: ../../godmode/reporting/reporting_builder.php:306
 #: ../../enterprise/include/functions_reporting_pdf.php:180
-#: ../../operation/reporting/reporting_viewer.php:216
+#: ../../operation/reporting/reporting_viewer.php:215
 msgid "SLA Max. (value)"
 msgstr "Valor máximo para o SLA"
 
@@ -1510,14 +1551,16 @@ msgstr "Tipo de relatório"
 #: ../../godmode/servers/manage_recontask_form.php:87
 #: ../../godmode/servers/manage_recontask_form.php:88
 #: ../../godmode/servers/manage_recontask_form.php:89
-#: ../../include/functions.php:462
+#: ../../include/functions_alerts.php:506
+#: ../../include/functions_alerts.php:507
+#: ../../include/functions_alerts.php:508 ../../include/functions.php:504
+#: ../../include/functions_custom_graphs.php:102
+#: ../../include/functions_custom_graphs.php:103
+#: ../../include/functions_custom_graphs.php:104
+#: ../../include/functions_custom_graphs.php:105
 #: ../../enterprise/godmode/agentes/inventory_manager.php:115
 #: ../../enterprise/godmode/agentes/inventory_manager.php:116
 #: ../../enterprise/godmode/agentes/inventory_manager.php:117
-#: ../../operation/reporting/graph_viewer.php:125
-#: ../../operation/reporting/graph_viewer.php:126
-#: ../../operation/reporting/graph_viewer.php:127
-#: ../../operation/reporting/graph_viewer.php:128
 msgid "hours"
 msgstr "horas"
 
@@ -1547,14 +1590,14 @@ msgid "Up"
 msgstr "Ativo"
 
 #: ../../godmode/reporting/reporting_builder.php:495
-#: ../../operation/reporting/reporting_viewer.php:54
+#: ../../operation/reporting/reporting_viewer.php:53
 #: ../../operation/reporting/custom_reporting.php:32
-#: ../../operation/menu.php:276
+#: ../../operation/menu.php:175
 msgid "Custom reporting"
 msgstr "Relatórios personalizados"
 
 #: ../../godmode/reporting/reporting_builder.php:525
-#: ../../operation/reporting/graph_viewer.php:199
+#: ../../operation/reporting/graph_viewer.php:165
 #: ../../operation/reporting/custom_reporting.php:37
 msgid "There are no defined reportings"
 msgstr "Não mais relatórios definidos"
@@ -1577,23 +1620,23 @@ msgstr ""
 
 #: ../../godmode/servers/manage_export.php:58
 msgid "Successfully updated export target"
-msgstr ""
+msgstr "Erro atualizando exportação do destino"
 
 #: ../../godmode/servers/manage_export.php:66
 msgid "Error deleting export target"
-msgstr ""
+msgstr "Erro removendo exportação do destino"
 
 #: ../../godmode/servers/manage_export.php:68
 msgid "Succesfully deleted export target"
-msgstr ""
+msgstr "Remoção do destino executada com sucesso"
 
 #: ../../godmode/servers/manage_export.php:82
 msgid "Error creating export target"
-msgstr ""
+msgstr "Erro criando exportação do destino"
 
 #: ../../godmode/servers/manage_export.php:84
 msgid "Successfully created export target"
-msgstr ""
+msgstr "Exportação do destino criada com sucesso"
 
 #: ../../godmode/servers/manage_export.php:89
 #: ../../godmode/servers/modificar_server.php:56
@@ -1601,42 +1644,42 @@ msgstr ""
 #: ../../godmode/servers/manage_recontask.php:95
 #: ../../godmode/servers/manage_recontask_form.php:56
 #: ../../godmode/servers/manage_export_form.php:61
-#: ../../operation/servers/view_server.php:36 ../../operation/menu.php:132
+#: ../../operation/servers/view_server.php:36 ../../operation/menu.php:84
 msgid "Pandora servers"
 msgstr "Servidores Pandora"
 
 #: ../../godmode/servers/manage_export.php:89
 #: ../../godmode/servers/manage_export_form.php:61
 msgid "export targets"
-msgstr ""
+msgstr "exportar destinos"
 
 #: ../../godmode/servers/manage_export.php:93
 msgid "There are no export targets configured"
-msgstr ""
+msgstr "Não existem destinos a exportar configurados"
 
 #: ../../godmode/servers/manage_export.php:102
 #: ../../godmode/servers/manage_export_form.php:82
 msgid "Preffix"
-msgstr ""
+msgstr "Prefixo"
 
 #: ../../godmode/servers/manage_export.php:102
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:97
 #: ../../godmode/servers/manage_export_form.php:86
 #: ../../godmode/agentes/module_manager_editor_wmi.php:198
-#: ../../godmode/agentes/module_manager_editor_data.php:151
-#: ../../godmode/agentes/module_manager_editor_plugin.php:165
-#: ../../godmode/agentes/module_manager_editor_prediction.php:137
-#: ../../godmode/agentes/module_manager_editor_network.php:172
-#: ../../godmode/agentes/agent_manager.php:110
-#: ../../godmode/agentes/module_manager.php:86
+#: ../../godmode/agentes/module_manager_editor_data.php:154
+#: ../../godmode/agentes/module_manager_editor_plugin.php:167
+#: ../../godmode/agentes/module_manager_editor_prediction.php:138
+#: ../../godmode/agentes/module_manager_editor_network.php:178
+#: ../../godmode/agentes/agent_manager.php:103
+#: ../../godmode/agentes/module_manager.php:80
 #: ../../godmode/modules/manage_network_components.php:184
 #: ../../enterprise/godmode/agentes/inventory_manager.php:113
 #: ../../enterprise/godmode/agentes/inventory_manager.php:163
 #: ../../operation/servers/view_server_detail.php:74
 #: ../../operation/agentes/status_monitor.php:178
 #: ../../operation/agentes/estado_generalagente.php:78
-#: ../../operation/agentes/estado_monitores.php:53
+#: ../../operation/agentes/estado_monitores.php:54
 #: ../../operation/agentes/sla_view.php:49
 #: ../../operation/agentes/estado_agente.php:150
 msgid "Interval"
@@ -1673,18 +1716,18 @@ msgstr "Atualizar servidor"
 
 #: ../../godmode/servers/modificar_server.php:68
 #: ../../godmode/servers/modificar_server.php:87
-#: ../../godmode/agentes/agent_manager.php:89
+#: ../../godmode/agentes/agent_manager.php:82
 #: ../../operation/agentes/estado_generalagente.php:64
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: ../../godmode/servers/modificar_server.php:79 ../../godmode/menu.php:205
+#: ../../godmode/servers/modificar_server.php:79 ../../godmode/menu.php:122
 msgid "Manage servers"
 msgstr "Gestão de servidores"
 
 #: ../../godmode/servers/modificar_server.php:87
-#: ../../godmode/agentes/agent_manager.php:144
-#: ../../include/functions_reporting.php:303
+#: ../../godmode/agentes/agent_manager.php:141
+#: ../../include/functions_reporting.php:298
 #: ../../operation/incidents/incident.php:183
 #: ../../operation/incidents/incident.php:253
 #: ../../operation/incidents/incident_detail.php:230
@@ -1693,14 +1736,13 @@ msgstr "Gestão de servidores"
 #: ../../operation/snmpconsole/snmp_view.php:199
 #: ../../operation/snmpconsole/snmp_view.php:378
 #: ../../operation/agentes/status_monitor.php:181
-#: ../../operation/agentes/estado_monitores.php:52
+#: ../../operation/agentes/estado_monitores.php:53
 #: ../../operation/agentes/sla_view.php:48
 #: ../../operation/agentes/sla_view.php:149
 #: ../../operation/agentes/estado_agente.php:153
-#: ../../operation/agentes/estado_alertas.php:66
-#: ../../operation/agentes/estado_alertas.php:161
+#: ../../operation/agentes/estado_alertas.php:125
 #: ../../operation/agentes/tactical.php:220
-#: ../../operation/events/events.php:392
+#: ../../operation/events/events.php:421
 msgid "Status"
 msgstr "Estado"
 
@@ -1715,7 +1757,7 @@ msgid "Updated"
 msgstr "Atualizado"
 
 #: ../../godmode/servers/modificar_server.php:124
-#: ../../godmode/agentes/agent_manager.php:117
+#: ../../godmode/agentes/agent_manager.php:110
 #: ../../operation/servers/view_server.php:94
 msgid "Network Server"
 msgstr "Servidor de rede"
@@ -1745,31 +1787,31 @@ msgstr "Não há nenhum servidor configurado na base de dados"
 
 #: ../../godmode/servers/manage_recontask.php:40
 msgid "Succesfully deleted recon task"
-msgstr ""
+msgstr "Tarefa de reconhecimento removida com sucesso"
 
 #: ../../godmode/servers/manage_recontask.php:42
 msgid "Error deleting recon task"
-msgstr ""
+msgstr "Erro removendo tarefa de reconhecimento"
 
 #: ../../godmode/servers/manage_recontask.php:71
 msgid "Successfully updated recon task"
-msgstr ""
+msgstr "Tarefa de reconhecimento atualizada com sucesso"
 
 #: ../../godmode/servers/manage_recontask.php:73
 msgid "Error updating recon task"
-msgstr ""
+msgstr "Erro atualizando tarefa de reconhecimento"
 
 #: ../../godmode/servers/manage_recontask.php:86
 msgid "Successfully created recon task"
-msgstr ""
+msgstr "Tarefa de reconhecimento criada com sucesso"
 
 #: ../../godmode/servers/manage_recontask.php:88
 msgid "Error creating recon task"
-msgstr ""
+msgstr "Erro criando tarefa de reconhecimento"
 
 #: ../../godmode/servers/manage_recontask.php:95
 #: ../../godmode/servers/manage_recontask_form.php:56
-#: ../../godmode/menu.php:212
+#: ../../godmode/menu.php:127
 msgid "Manage recontask"
 msgstr "Gestão recontask"
 
@@ -1794,9 +1836,9 @@ msgstr "Incidente"
 
 #: ../../godmode/servers/manage_recontask.php:100
 #: ../../godmode/servers/manage_recontask_form.php:118
-#: ../../godmode/agentes/planned_downtime.php:228
-#: ../../godmode/agentes/modificar_agente.php:222
-#: ../../godmode/agentes/agent_manager.php:113
+#: ../../godmode/agentes/planned_downtime.php:224
+#: ../../godmode/agentes/modificar_agente.php:142
+#: ../../godmode/agentes/agent_manager.php:106
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:80
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:59
 #: ../../operation/servers/view_server_detail.php:89
@@ -1807,9 +1849,10 @@ msgstr "SO"
 
 #: ../../godmode/servers/manage_recontask.php:119
 #: ../../godmode/servers/manage_recontask_form.php:113
-#: ../../godmode/agentes/planned_downtime.php:207
+#: ../../godmode/agentes/planned_downtime.php:203
+#: ../../operation/events/events.php:200
 msgid "Any"
-msgstr ""
+msgstr "Qualquer"
 
 #: ../../godmode/servers/manage_recontask.php:131
 msgid "There are no recon task configured"
@@ -1830,19 +1873,24 @@ msgid ""
 "You must select a Recon Server for the Task, otherwise the Recon Task will "
 "never run"
 msgstr ""
+"Você deve selecionar um servidor de reconhecimento, do contrário a tarefa "
+"nunca será executada"
 
 #: ../../godmode/servers/manage_recontask_form.php:86
+#: ../../include/functions_alerts.php:505
 #: ../../enterprise/godmode/agentes/inventory_manager.php:114
 msgid "hour"
-msgstr ""
+msgstr "hora"
 
 #: ../../godmode/servers/manage_recontask_form.php:90
+#: ../../include/functions_alerts.php:509
 #: ../../enterprise/godmode/agentes/inventory_manager.php:118
 #: ../../operation/agentes/exportdata.php:61
 msgid "day"
 msgstr "dia"
 
 #: ../../godmode/servers/manage_recontask_form.php:92
+#: ../../include/functions_alerts.php:510
 msgid "week"
 msgstr "semana"
 
@@ -1858,67 +1906,73 @@ msgstr "mês"
 #: ../../godmode/servers/manage_export_form.php:77
 #: ../../operation/servers/view_server.php:106
 msgid "Export server"
-msgstr ""
+msgstr "Exportar servidor"
 
 #: ../../godmode/servers/manage_export_form.php:79
 #: ../../godmode/agentes/module_manager_editor_wmi.php:233
-#: ../../godmode/agentes/module_manager_editor_data.php:135
-#: ../../godmode/agentes/module_manager_editor_plugin.php:114
-#: ../../godmode/agentes/module_manager_editor_plugin.php:200
-#: ../../godmode/agentes/module_manager_editor_prediction.php:159
-#: ../../godmode/agentes/module_manager_editor_network.php:255
-#: ../../godmode/users/configure_user.php:224 ../../include/functions.php:619
+#: ../../godmode/agentes/module_manager_editor_data.php:138
+#: ../../godmode/agentes/module_manager_editor_plugin.php:116
+#: ../../godmode/agentes/module_manager_editor_plugin.php:202
+#: ../../godmode/agentes/alert_manager.php:204
+#: ../../godmode/agentes/alert_manager.php:210
+#: ../../godmode/agentes/module_manager_editor_prediction.php:152
+#: ../../godmode/agentes/module_manager_editor_network.php:284
+#: ../../godmode/agentes/agent_manager.php:98
+#: ../../godmode/users/configure_user.php:224
+#: ../../godmode/alerts/configure_alert_action.php:61
+#: ../../godmode/alerts/configure_alert_template.php:345
+#: ../../include/functions.php:651
 msgid "None"
 msgstr "Nenhum"
 
 #: ../../godmode/servers/manage_export_form.php:94
 msgid "Transfer mode"
-msgstr ""
+msgstr "Modo de transferência"
 
 #: ../../godmode/servers/manage_export_form.php:111
-#: ../../godmode/agentes/module_manager_editor_plugin.php:129
+#: ../../godmode/agentes/module_manager_editor_plugin.php:131
 msgid "Port"
-msgstr ""
+msgstr "Porta"
 
 #: ../../godmode/servers/manage_export_form.php:115
 msgid "Target directory"
-msgstr ""
+msgstr "Diretório destino"
 
 #: ../../godmode/servers/manage_export_form.php:119
 msgid "Extra options"
-msgstr ""
+msgstr "Opções extra"
 
 #: ../../godmode/servers/plugin.php:56
 msgid "Problem updating plugin"
-msgstr ""
+msgstr "Erro atualizando o plugin"
 
 #: ../../godmode/servers/plugin.php:58
 msgid "Plugin updated successfully"
-msgstr ""
+msgstr "Plugin atualizado com sucesso"
 
 #: ../../godmode/servers/plugin.php:75
 msgid "Problem creating plugin"
-msgstr ""
+msgstr "Erro criando o plugin"
 
 #: ../../godmode/servers/plugin.php:78
 msgid "Plugin created successfully"
-msgstr ""
+msgstr "Plugin criado com sucesso"
 
 #: ../../godmode/servers/plugin.php:87
 msgid "Problem deleting plugin"
-msgstr ""
+msgstr "Erro removendo o plugin"
 
 #: ../../godmode/servers/plugin.php:89
 msgid "Plugin deleted successfully"
-msgstr ""
+msgstr "Plugin removido com sucesso"
 
 #: ../../godmode/servers/plugin.php:130
 msgid "Plugin creation"
-msgstr ""
+msgstr "Criação de plugin"
 
 #: ../../godmode/servers/plugin.php:132
 msgid "Plugin update"
-msgstr ""
+msgstr "Atualização de Plugin"
 
 #: ../../godmode/servers/plugin.php:149
 msgid "Plugin command"
@@ -1926,304 +1980,319 @@ msgstr ""
 
 #: ../../godmode/servers/plugin.php:153
 msgid "Max.Timeout"
-msgstr ""
+msgstr "Tempo máximo de expiração"
 
 #: ../../godmode/servers/plugin.php:157
 msgid "IP address option"
-msgstr ""
+msgstr "Opção de endereçamento IP"
 
 #: ../../godmode/servers/plugin.php:161
 msgid "Port option"
-msgstr ""
+msgstr "Opção de porta"
 
 #: ../../godmode/servers/plugin.php:166
 msgid "User option"
-msgstr ""
+msgstr "Opção de usuário"
 
 #: ../../godmode/servers/plugin.php:170
 msgid "Password option"
-msgstr ""
+msgstr "Opção de senha"
 
 #: ../../godmode/servers/plugin.php:192
 msgid "Plugins registered in Pandora FMS"
-msgstr ""
+msgstr "Plugins registrados no Pandora FMS"
 
 #: ../../godmode/servers/plugin.php:199
 msgid "execute"
-msgstr ""
+msgstr "executar"
 
 #: ../../godmode/servers/plugin.php:223
 msgid "There are no plugins in the system"
-msgstr ""
+msgstr "Não existem plugins no sistema"
 
-#: ../../godmode/groups/group_list.php:63
+#: ../../godmode/groups/group_list.php:64
 msgid "Group successfully created"
 msgstr "Grupo criado com êxito"
 
-#: ../../godmode/groups/group_list.php:65
+#: ../../godmode/groups/group_list.php:66
 msgid "There was a problem creating group"
 msgstr "Houve um problema ao criar o grupo"
 
-#: ../../godmode/groups/group_list.php:81
+#: ../../godmode/groups/group_list.php:84
 msgid "Group successfully updated"
 msgstr "Grupo atualizado corretamente"
 
-#: ../../godmode/groups/group_list.php:83
+#: ../../godmode/groups/group_list.php:86
 msgid "There was a problem modifying group"
 msgstr "Houve um problema ao modificar o grupo"
 
-#: ../../godmode/groups/group_list.php:96
+#: ../../godmode/groups/group_list.php:99
 msgid "There was a problem deleting group"
 msgstr "Houve um problema ao apagar o grupo"
 
-#: ../../godmode/groups/group_list.php:98
+#: ../../godmode/groups/group_list.php:101
 msgid "Group successfully deleted"
 msgstr "Grupo eliminado corretamente"
 
-#: ../../godmode/groups/group_list.php:101
-#: ../../godmode/groups/configure_group.php:55
+#: ../../godmode/groups/group_list.php:104
+#: ../../godmode/groups/configure_group.php:57
 msgid "Group management"
 msgstr "Gerenciamento de grupos"
 
-#: ../../godmode/groups/group_list.php:102
+#: ../../godmode/groups/group_list.php:105
 msgid "Groups defined in Pandora"
 msgstr "Grupos definidos no Pandora"
 
-#: ../../godmode/groups/group_list.php:106
-#: ../../godmode/groups/configure_group.php:68
+#: ../../godmode/groups/group_list.php:109
+#: ../../godmode/groups/configure_group.php:70
 #: ../../godmode/modules/module_list.php:55
 msgid "Icon"
 msgstr "ícone"
 
-#: ../../godmode/groups/group_list.php:109
-#: ../../godmode/groups/configure_group.php:88
-#: ../../godmode/agentes/configurar_agente.php:220
-#: ../../godmode/agentes/alert_manager.php:33
-#: ../../godmode/agentes/manage_config.php:448
-#: ../../include/functions_reporting.php:662
+#: ../../godmode/groups/group_list.php:112
+#: ../../godmode/groups/configure_group.php:90
+#: ../../godmode/agentes/configurar_agente.php:222
+#: ../../godmode/agentes/alert_manager.php:27
+#: ../../godmode/agentes/alert_manager.php:124
+#: ../../godmode/agentes/manage_config.php:444
+#: ../../include/functions_reporting.php:666
 #: ../../enterprise/include/functions_reporting_pdf.php:335
-#: ../../operation/agentes/estado_grupo.php:230
-#: ../../operation/agentes/ver_agente.php:226
+#: ../../operation/agentes/estado_grupo.php:233
+#: ../../operation/agentes/ver_agente.php:214
 #: ../../operation/agentes/estado_agente.php:154
 msgid "Alerts"
 msgstr "Alertas"
 
-#: ../../godmode/groups/group_list.php:125
-#: ../../godmode/agentes/alert_manager_editor.php:103
+#: ../../godmode/groups/group_list.php:128
 #: ../../godmode/agentes/alert_manager_editor.php:105
-#: ../../godmode/agentes/alert_manager_editor.php:270
-#: ../../godmode/agentes/alert_manager_editor.php:274
+#: ../../godmode/agentes/alert_manager_editor.php:107
+#: ../../godmode/agentes/alert_manager_editor.php:272
+#: ../../godmode/agentes/alert_manager_editor.php:276
+#: ../../godmode/alerts/configure_alert_template.php:368
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../../godmode/groups/group_list.php:126 ../../godmode/setup/links.php:133
+#: ../../godmode/groups/group_list.php:129 ../../godmode/setup/links.php:132
 #: ../../godmode/setup/news.php:140
 #: ../../godmode/profiles/profile_list.php:274
-#: ../../godmode/agentes/manage_config_remote.php:146
-#: ../../godmode/agentes/manage_config.php:473
-#: ../../godmode/agentes/modificar_agente.php:274
-#: ../../godmode/agentes/module_manager.php:152
-#: ../../godmode/agentes/module_manager.php:163
+#: ../../godmode/agentes/agent_template.php:150
+#: ../../godmode/agentes/manage_config_remote.php:144
+#: ../../godmode/agentes/manage_config.php:469
+#: ../../godmode/agentes/modificar_agente.php:194
+#: ../../godmode/agentes/module_manager.php:146
+#: ../../godmode/agentes/module_manager.php:157
 #: ../../godmode/modules/manage_nc_groups.php:98
 #: ../../godmode/modules/manage_network_templates.php:75
 #: ../../godmode/users/user_list.php:106
 #: ../../godmode/users/configure_user.php:268
 #: ../../godmode/db/db_purge.php:221 ../../godmode/db/db_audit.php:106
-#: ../../godmode/db/db_refine.php:110 ../../godmode/db/db_event.php:86
-#: ../../godmode/alerts/modify_alert.php:102
+#: ../../godmode/db/db_refine.php:93 ../../godmode/db/db_event.php:86
+#: ../../godmode/alerts/alert_templates.php:190
+#: ../../godmode/alerts/alert_actions.php:114
+#: ../../godmode/alerts/alert_commands.php:125
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:193
 #: ../../enterprise/godmode/agentes/inventory_manager.php:173
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:103
-#: ../../operation/reporting/graph_viewer.php:192
+#: ../../operation/reporting/graph_viewer.php:157
 #: ../../operation/incidents/incident_detail.php:332
 #: ../../operation/incidents/incident_detail.php:373
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: ../../godmode/groups/group_list.php:135
-#: ../../godmode/groups/configure_group.php:59
-#: ../../operation/agentes/estado_grupo.php:130
+#: ../../godmode/groups/group_list.php:138
+#: ../../godmode/groups/configure_group.php:61
+#: ../../operation/agentes/estado_grupo.php:128
 msgid "Create group"
 msgstr "Criar Grupo"
 
-#: ../../godmode/groups/configure_group.php:48
+#: ../../godmode/groups/configure_group.php:50
 msgid "There was a problem loading group"
 msgstr "Houve um erro ao carregar a configuração do grupo"
 
-#: ../../godmode/groups/configure_group.php:57
+#: ../../godmode/groups/configure_group.php:59
 msgid "Update group"
 msgstr "Atualizar grupo"
 
-#: ../../godmode/menu.php:30
-msgid "Administration"
-msgstr "Administração"
+#: ../../godmode/groups/configure_group.php:93
+#: ../../godmode/agentes/module_manager_editor_wmi.php:250
+#: ../../godmode/agentes/module_manager_editor_data.php:185
+#: ../../godmode/agentes/module_manager_editor_plugin.php:219
+#: ../../godmode/agentes/module_manager_editor_prediction.php:166
+#: ../../godmode/agentes/module_manager_editor_network.php:317
+#: ../../godmode/agentes/agent_manager.php:128
+msgid "Custom ID"
+msgstr ""
 
-#: ../../godmode/menu.php:40
+#: ../../godmode/menu.php:28
 msgid "Manage agents"
 msgstr "Gestão de agentes"
 
-#: ../../godmode/menu.php:48
-msgid "Manage config."
-msgstr "Gerenciar conf."
+#: ../../godmode/menu.php:33
+msgid "Manage config"
+msgstr "Gerenciar configuração"
 
-#: ../../godmode/menu.php:55
+#: ../../godmode/menu.php:35
 msgid "Duplicate config"
-msgstr ""
+msgstr "Duplicar configuração"
 
-#: ../../godmode/menu.php:64
+#: ../../godmode/menu.php:38
 msgid "Manage groups"
 msgstr "Gestão de grupos"
 
-#: ../../godmode/menu.php:74
+#: ../../godmode/menu.php:41
 msgid "Scheduled downtime"
-msgstr ""
+msgstr "Indisponibilidade agendada"
 
-#: ../../godmode/menu.php:84
+#: ../../godmode/menu.php:46
 msgid "Manage modules"
 msgstr "Gerenciar módulos"
 
-#: ../../godmode/menu.php:91
+#: ../../godmode/menu.php:51 ../../godmode/menu.php:91
 msgid "Component groups"
 msgstr "Grupos de componentes de rede"
 
-#: ../../godmode/menu.php:99
+#: ../../godmode/menu.php:53
 msgid "Module components"
 msgstr "Componentes de rede"
 
-#: ../../godmode/menu.php:107 ../../godmode/agentes/agent_template.php:119
+#: ../../godmode/menu.php:55 ../../godmode/agentes/agent_template.php:88
 msgid "Module templates"
 msgstr "Modelos de rede"
 
-#: ../../godmode/menu.php:119 ../../godmode/profiles/profile_list.php:186
+#: ../../godmode/menu.php:63 ../../godmode/profiles/profile_list.php:186
 msgid "Manage alerts"
 msgstr "Gestão de alertas"
 
-#: ../../godmode/menu.php:127 ../../godmode/profiles/profile_list.php:188
+#: ../../godmode/menu.php:68
+msgid "Templates"
+msgstr "Modelos"
+
+#: ../../godmode/menu.php:70
+#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:178
+#: ../../enterprise/godmode/agentes/inventory_manager.php:164
+msgid "Actions"
+msgstr "Ações"
+
+#: ../../godmode/menu.php:72
+msgid "Commands"
+msgstr "Comandos"
+
+#: ../../godmode/menu.php:78 ../../godmode/profiles/profile_list.php:188
 msgid "Manage users"
 msgstr "Gestão de usuários"
 
-#: ../../godmode/menu.php:137
+#: ../../godmode/menu.php:85
 msgid "Manage SNMP console"
-msgstr ""
+msgstr "Gerenciar console SNMP"
 
-#: ../../godmode/menu.php:146
-msgid "SNMP alerts"
-msgstr "Alertas SNMP"
-
-#: ../../godmode/menu.php:157
+#: ../../godmode/menu.php:100
 msgid "Manage reports"
 msgstr "Gerenciar relatórios"
 
-#: ../../godmode/menu.php:166
+#: ../../godmode/menu.php:106
 msgid "Report builder"
 msgstr "Gerador de relatórios"
 
-#: ../../godmode/menu.php:197
+#: ../../godmode/menu.php:117
 msgid "Manage profiles"
 msgstr "Gestão de perfis"
 
-#: ../../godmode/menu.php:221
+#: ../../godmode/menu.php:129
 msgid "Manage plugins"
-msgstr ""
+msgstr "Gerenciar Plugins"
 
-#: ../../godmode/menu.php:228
+#: ../../godmode/menu.php:131
 msgid "Export targets"
-msgstr ""
+msgstr "Exportar destinos"
 
-#: ../../godmode/menu.php:240
-msgid "System Audit Log"
-msgstr "Auditoria do sistema"
+#: ../../godmode/menu.php:138
+msgid "System audit log"
+msgstr "Log de auditoria do sistema"
 
-#: ../../godmode/menu.php:248 ../../godmode/setup/setup.php:79
-#: ../../godmode/setup/links.php:87 ../../godmode/setup/links.php:115
-#: ../../godmode/setup/news.php:87 ../../godmode/setup/news.php:116
-msgid "Pandora Setup"
+#: ../../godmode/menu.php:143 ../../godmode/setup/setup.php:78
+msgid "Setup"
 msgstr "Configuração"
 
-#: ../../godmode/menu.php:272
+#: ../../godmode/menu.php:156
 msgid "DB Maintenance"
 msgstr "Manutenção do BD"
 
-#: ../../godmode/menu.php:280
+#: ../../godmode/menu.php:161
 msgid "DB Information"
 msgstr "Informação do BD"
 
-#: ../../godmode/menu.php:287 ../../godmode/db/db_purge.php:41
+#: ../../godmode/menu.php:163 ../../godmode/db/db_purge.php:41
 msgid "Database purge"
 msgstr "Banco de dados apagado"
 
-#: ../../godmode/menu.php:294 ../../godmode/db/db_refine.php:69
+#: ../../godmode/menu.php:165 ../../godmode/db/db_refine.php:32
 msgid "Database debug"
 msgstr "Depurar o Banco de Dados"
 
-#: ../../godmode/menu.php:301
+#: ../../godmode/menu.php:167
 msgid "Database audit"
 msgstr "BD de auditoria"
 
-#: ../../godmode/menu.php:308
+#: ../../godmode/menu.php:169
 msgid "Database event"
 msgstr "BD de eventos"
 
-#: ../../godmode/menu.php:315
+#: ../../godmode/menu.php:171
 msgid "Database sanity"
 msgstr ""
 
-#: ../../godmode/menu.php:328 ../../operation/menu.php:300
+#: ../../godmode/menu.php:177 ../../operation/menu.php:183
 msgid "Extensions"
-msgstr ""
+msgstr "Extensões"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:37
-#: ../../godmode/agentes/configurar_agente.php:283
+#: ../../godmode/agentes/configurar_agente.php:285
 msgid "There was a problem deleting the alert"
-msgstr ""
+msgstr "Houve um problema ao deletar o alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:39
-#: ../../godmode/agentes/configurar_agente.php:285
-#: ../../godmode/agentes/configurar_agente.php:301
-#: ../../godmode/alerts/modify_alert.php:75
+#: ../../godmode/agentes/configurar_agente.php:287
+#: ../../godmode/agentes/configurar_agente.php:303
 msgid "Alert successfully deleted"
 msgstr "Alerta eliminado corretamente"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:76
 msgid "There was a problem creating the alert"
-msgstr ""
+msgstr "Houve um problema ao criar o alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:78
-#: ../../godmode/agentes/configurar_agente.php:382
-#: ../../godmode/alerts/modify_alert.php:60
+#: ../../godmode/agentes/configurar_agente.php:384
 msgid "Alert successfully created"
 msgstr "Alerta criado corretamente"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:91
 msgid "There was a problem updating the alert"
-msgstr ""
+msgstr "Houve um problema ao atualizar o alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:93
-#: ../../godmode/agentes/configurar_agente.php:482
-#: ../../godmode/alerts/modify_alert.php:47
+#: ../../godmode/agentes/configurar_agente.php:484
 msgid "Alert successfully updated"
 msgstr "Agente atualizado corretamente"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:139
 msgid "Update alert"
-msgstr ""
+msgstr "Atualizar alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:141
-#: ../../godmode/alerts/modify_alert.php:113
 #: ../../godmode/alerts/configure_alert.php:60
 msgid "Create alert"
 msgstr "Criar alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:147
 #: ../../godmode/snmpconsole/snmp_alert.php:269
-#: ../../godmode/agentes/alert_manager_editor.php:82
+#: ../../godmode/agentes/alert_manager_editor.php:84
 msgid "Alert type"
 msgstr "Tipo de alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:163
 #: ../../godmode/snmpconsole/snmp_alert.php:271
 msgid "Alert trigger"
-msgstr ""
+msgstr "Disparar alerta"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:179
 #: ../../godmode/snmpconsole/snmp_alert.php:184
@@ -2238,7 +2307,7 @@ msgstr "OID"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:184
 msgid "Custom Value"
-msgstr ""
+msgstr "Valor customizado"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:189
 #: ../../godmode/snmpconsole/snmp_alert.php:274
@@ -2248,49 +2317,54 @@ msgid "SNMP Agent"
 msgstr "Agente SNMP"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:194
-#: ../../godmode/agentes/alert_manager_editor.php:183
+#: ../../godmode/agentes/alert_manager_editor.php:185
 msgid "Field #1 (Alias, name)"
 msgstr "Campo #1 (Alias, nome)"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:198
-#: ../../godmode/agentes/alert_manager_editor.php:189
+#: ../../godmode/agentes/alert_manager_editor.php:191
 msgid "Field #2 (Single Line)"
 msgstr "Campo #2 (Linha simples)"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:202
-#: ../../godmode/agentes/alert_manager_editor.php:196
+#: ../../godmode/agentes/alert_manager_editor.php:198
 msgid "Field #3 (Full Text)"
 msgstr "Campo #3 (Texto completo)"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:207
-#: ../../godmode/agentes/alert_manager_editor.php:163
+#: ../../godmode/agentes/alert_manager_editor.php:165
+#: ../../godmode/alerts/configure_alert_template.php:336
 msgid "Min. number of alerts"
 msgstr "Número mínimo de alertas"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:210
-#: ../../godmode/agentes/alert_manager_editor.php:173
+#: ../../godmode/agentes/alert_manager_editor.php:175
+#: ../../godmode/alerts/configure_alert_template.php:339
 msgid "Max. number of alerts"
 msgstr "Número máximo de alertas"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:215
-#: ../../godmode/agentes/alert_manager_editor.php:135
-#: ../../operation/agentes/estado_alertas.php:63
+#: ../../godmode/agentes/alert_manager_editor.php:137
+#: ../../godmode/alerts/configure_alert_template.php:328
 msgid "Time threshold"
 msgstr "Marco inicial de tempo"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:229
+#: ../../godmode/alerts/configure_alert_template.php:331
+#: ../../include/functions_alerts.php:511
 msgid "Other value"
-msgstr ""
+msgstr "Outro valor"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:234
-#: ../../include/functions.php:450
+#: ../../godmode/alerts/configure_alert_template.php:334
+#: ../../include/functions.php:492
 msgid "seconds"
-msgstr ""
+msgstr "segundos"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:237
-#: ../../godmode/agentes/alert_manager_editor.php:73
-#: ../../include/functions.php:767 ../../include/functions.php:849
-#: ../../include/functions_reporting.php:355
+#: ../../godmode/agentes/alert_manager_editor.php:75
+#: ../../include/functions.php:792 ../../include/functions.php:851
+#: ../../include/functions_reporting.php:351
 #: ../../operation/incidents/incident.php:189
 #: ../../operation/incidents/incident.php:255
 #: ../../operation/incidents/incident_detail.php:265
@@ -2299,7 +2373,7 @@ msgstr "Prioridade"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:252
 msgid "Alert Overview"
-msgstr ""
+msgstr "Resumo de alertas"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:257
 msgid "There are no SNMP alerts"
@@ -2308,16 +2382,15 @@ msgstr "Não foi definido nenhum alerta SNMP"
 #: ../../godmode/snmpconsole/snmp_alert.php:281
 #: ../../godmode/snmpconsole/snmp_alert.php:310
 msgid "Custom Value/OID"
-msgstr ""
+msgstr "Valor/OID customizado"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:286
 msgid "Times fired"
-msgstr ""
+msgstr "Número de vezes disparado"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:289
-#: ../../include/functions_reporting.php:549
-#: ../../operation/agentes/estado_alertas.php:64
-#: ../../operation/agentes/estado_alertas.php:164
+#: ../../include/functions_reporting.php:551
+#: ../../operation/agentes/estado_alertas.php:124
 msgid "Last fired"
 msgstr "Lançada pela última vez"
 
@@ -2325,36 +2398,36 @@ msgstr "Lançada pela última vez"
 #: ../../godmode/snmpconsole/snmp_alert.php:300
 #: ../../godmode/snmpconsole/snmp_alert.php:301
 #: ../../godmode/snmpconsole/snmp_alert.php:302
-#: ../../godmode/agentes/alert_manager_editor.php:70
-#: ../../include/functions.php:655 ../../include/functions.php:660
-#: ../../include/functions.php:663 ../../include/functions_db.php:1910
-#: ../../include/functions_reporting.php:583
-#: ../../include/functions_reporting.php:621
-#: ../../include/functions_reporting.php:648
+#: ../../godmode/agentes/alert_manager.php:97
+#: ../../godmode/agentes/alert_manager_editor.php:72
+#: ../../include/functions.php:687 ../../include/functions.php:692
+#: ../../include/functions.php:695 ../../include/functions_db.php:2023
+#: ../../include/functions_reporting.php:585
+#: ../../include/functions_reporting.php:623
+#: ../../include/functions_reporting.php:652
 #: ../../operation/snmpconsole/snmp_view.php:294
 #: ../../operation/snmpconsole/snmp_view.php:306
 #: ../../operation/snmpconsole/snmp_view.php:315
-#: ../../operation/agentes/exportdata.php:282
+#: ../../operation/agentes/exportdata.php:281
 #: ../../operation/agentes/sla_view.php:99
 #: ../../operation/agentes/sla_view.php:180
 msgid "N/A"
 msgstr "N/A"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:325
-#: ../../include/functions_html.php:783 ../../include/functions_html.php:784
-#: ../../include/functions.php:446 ../../include/functions.php:884
+#: ../../include/functions.php:488 ../../include/functions_ui.php:97
+#: ../../include/functions_ui.php:98
 #: ../../enterprise/extensions/cron/main.php:102
-#: ../../operation/agentes/estado_generalagente.php:106
-#: ../../operation/agentes/estado_ultimopaquete.php:192
+#: ../../operation/agentes/estado_generalagente.php:104
+#: ../../operation/agentes/estado_ultimopaquete.php:201
 #: ../../operation/agentes/sla_view.php:126
-#: ../../operation/agentes/estado_alertas.php:197
 msgid "Never"
 msgstr "Nunca"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:350
 #: ../../operation/snmpconsole/snmp_view.php:396
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #: ../../godmode/admin_access_logs.php:31
 msgid "Pandora audit"
@@ -2362,11 +2435,11 @@ msgstr "Revisar logs de auditoria do Pandora"
 
 #: ../../godmode/admin_access_logs.php:31
 msgid "Review Logs"
-msgstr ""
+msgstr "Verificar logs"
 
 #: ../../godmode/admin_access_logs.php:36
-#: ../../godmode/agentes/manage_config_remote.php:95
-#: ../../godmode/agentes/manage_config.php:382
+#: ../../godmode/agentes/manage_config_remote.php:93
+#: ../../godmode/agentes/manage_config.php:378
 #: ../../godmode/modules/manage_network_templates_form.php:194
 #: ../../operation/incidents/incident.php:172
 msgid "Filter"
@@ -2375,7 +2448,7 @@ msgstr "Filtro"
 #: ../../godmode/admin_access_logs.php:53
 #: ../../godmode/modules/manage_network_components.php:157
 #: ../../godmode/modules/manage_network_templates_form.php:192
-#: ../../include/functions.php:617 ../../include/functions.php:1098
+#: ../../include/functions.php:649 ../../include/functions.php:1087
 #: ../../enterprise/operation/snmpconsole/snmp_view.php:26
 #: ../../enterprise/operation/agentes/agent_inventory.php:46
 #: ../../operation/incidents/incident_search.php:37
@@ -2386,53 +2459,57 @@ msgstr "Filtro"
 #: ../../operation/snmpconsole/snmp_view.php:227
 #: ../../operation/agentes/status_monitor.php:71
 #: ../../operation/agentes/status_monitor.php:86
-#: ../../operation/events/events.php:123 ../../operation/events/events.php:128
-#: ../../operation/events/events.php:155
+#: ../../operation/events/events.php:128 ../../operation/events/events.php:133
+#: ../../operation/events/events.php:160
 msgid "All"
 msgstr "Tudo"
 
 #: ../../godmode/admin_access_logs.php:54
-#: ../../godmode/agentes/modificar_agente.php:161
+#: ../../godmode/agentes/modificar_agente.php:81
 #: ../../operation/incidents/incident.php:181
 #: ../../operation/incidents/incident.php:203
 #: ../../operation/incidents/incident.php:209
 #: ../../operation/agentes/status_monitor.php:93
 #: ../../operation/agentes/estado_agente.php:62
-#: ../../operation/agentes/estado_alertas.php:139
+#: ../../operation/agentes/estado_alertas.php:102
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../../godmode/setup/setup.php:80
+#: ../../godmode/setup/setup.php:79
 msgid "General configuration"
 msgstr "Configuração geral"
 
-#: ../../godmode/setup/setup.php:86
-msgid "Language Code for Pandora"
+#: ../../godmode/setup/setup.php:85
+msgid "Language code for Pandora"
 msgstr "Código de linguagem para o Pandora"
 
-#: ../../godmode/setup/setup.php:89
+#: ../../godmode/setup/setup.php:88
 msgid "Date format string"
-msgstr ""
+msgstr "Formato da data"
+
+#: ../../godmode/setup/setup.php:89
+msgid "Example"
+msgstr "Exemplo"
 
 #: ../../godmode/setup/setup.php:92
 msgid "Remote config directory"
-msgstr ""
+msgstr "Diretório de configuração remota"
 
 #: ../../godmode/setup/setup.php:95
 msgid "Graph color (min)"
-msgstr ""
+msgstr "Cor do gráfico (min)"
 
 #: ../../godmode/setup/setup.php:98
 msgid "Graph color (avg)"
-msgstr ""
+msgstr "Cor do gráfico (med)"
 
 #: ../../godmode/setup/setup.php:101
 msgid "Graph color (max)"
-msgstr ""
+msgstr "Cor do gráfico (max)"
 
 #: ../../godmode/setup/setup.php:104
 msgid "SLA period (seconds)"
-msgstr ""
+msgstr "Período do SLA (segundos)"
 
 #: ../../godmode/setup/setup.php:107
 msgid "Max. days before compact data"
@@ -2451,76 +2528,88 @@ msgid "Compact interpolation in hours (1 Fine-20 bad)"
 msgstr "Interpolação da compactação (Horas: 1 bom, 10 médio, 20 ruim)"
 
 #: ../../godmode/setup/setup.php:119
-msgid "Show unknown modules in global view"
-msgstr "Mostrar módulos desconhecidos em visão global"
-
-#: ../../godmode/setup/setup.php:122
-msgid "Show last fired alerts in global view"
-msgstr "Mostrar alertas disparados na visão global"
-
-#: ../../godmode/setup/setup.php:125
 msgid "Style template"
 msgstr "Modelo de estilo"
 
-#: ../../godmode/setup/setup.php:128
+#: ../../godmode/setup/setup.php:122
 #: ../../operation/snmpconsole/snmp_view.php:164
-#: ../../operation/events/events.php:174
+#: ../../operation/events/events.php:179
 msgid "Block size for pagination"
 msgstr "Tamanho do bloco para a paginação"
 
-#: ../../godmode/setup/setup.php:131
-msgid "Timestamp or time comparation"
-msgstr ""
+#: ../../godmode/setup/setup.php:125
+msgid "Default hours for event view"
+msgstr "Número de horas para visualização de evento"
 
-#: ../../godmode/setup/setup.php:132
+#: ../../godmode/setup/setup.php:128
+msgid "Timestamp or time comparation"
+msgstr "Timbre de hora para comparação de tempo"
+
+#: ../../godmode/setup/setup.php:129
 msgid "Comparation in rollover"
 msgstr ""
 
-#: ../../godmode/setup/setup.php:134
+#: ../../godmode/setup/setup.php:131
 msgid "Timestamp in rollover"
 msgstr ""
 
-#: ../../godmode/setup/setup.php:137
-msgid "Automatic update check"
-msgstr ""
+#: ../../godmode/setup/setup.php:134
+msgid "Time source"
+msgstr "Origem da hora"
 
-#: ../../godmode/setup/links.php:38
+#: ../../godmode/setup/setup.php:135 ../../include/functions_events.php:245
+#: ../../include/functions_events.php:268 ../../include/functions.php:1045
+#: ../../operation/events/events.php:163 ../../operation/events/events.php:320
+#: ../../operation/events/events.php:344 ../../operation/events/events.php:373
+msgid "System"
+msgstr "Sistema"
+
+#: ../../godmode/setup/setup.php:139
+msgid "Automatic update check"
+msgstr "Verificação automática de atualização"
+
+#: ../../godmode/setup/links.php:37
 msgid "There was a problem creating link"
 msgstr "Houve um problema ao criar o link"
 
-#: ../../godmode/setup/links.php:40
+#: ../../godmode/setup/links.php:39
 msgid "Link successfully created"
 msgstr "O link foi criado corretamente"
 
-#: ../../godmode/setup/links.php:52
+#: ../../godmode/setup/links.php:51
 msgid "There was a problem modifying link"
 msgstr "Houve um problema ao modificar o link"
 
-#: ../../godmode/setup/links.php:54
+#: ../../godmode/setup/links.php:53
 msgid "Link successfully updated"
 msgstr "Link atualizado corretamente"
 
-#: ../../godmode/setup/links.php:62
+#: ../../godmode/setup/links.php:61
 msgid "There was a problem deleting link"
 msgstr "Houve um problema ao apagar o link"
 
-#: ../../godmode/setup/links.php:64
+#: ../../godmode/setup/links.php:63
 msgid "Link successfully deleted"
-msgstr ""
+msgstr "Link removido com sucesso"
 
-#: ../../godmode/setup/links.php:79 ../../godmode/setup/news.php:77
+#: ../../godmode/setup/links.php:78 ../../godmode/setup/news.php:77
 msgid "Name error"
-msgstr ""
+msgstr "Erro no nome"
 
-#: ../../godmode/setup/links.php:88 ../../godmode/setup/links.php:116
+#: ../../godmode/setup/links.php:86 ../../godmode/setup/links.php:114
+#: ../../godmode/setup/news.php:87 ../../godmode/setup/news.php:116
+msgid "Pandora Setup"
+msgstr "Configuração"
+
+#: ../../godmode/setup/links.php:87 ../../godmode/setup/links.php:115
 msgid "Link management"
 msgstr "Gestão de links"
 
-#: ../../godmode/setup/links.php:100 ../../godmode/setup/links.php:118
+#: ../../godmode/setup/links.php:99 ../../godmode/setup/links.php:117
 msgid "Link name"
 msgstr "Nome do link"
 
-#: ../../godmode/setup/links.php:103
+#: ../../godmode/setup/links.php:102
 msgid "Link"
 msgstr "Link"
 
@@ -2536,10 +2625,9 @@ msgstr "Gestão de notícias"
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../../godmode/setup/news.php:104 ../../include/functions.php:724
-#: ../../include/functions.php:748 ../../include/functions.php:833
-#: ../../include/functions.php:875 ../../include/functions_db.php:1916
-#: ../../include/functions_db.php:1938
+#: ../../godmode/setup/news.php:104 ../../include/functions.php:749
+#: ../../include/functions.php:773 ../../include/functions_db.php:2029
+#: ../../include/functions_db.php:2051
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:70
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:176
 msgid "Text"
@@ -2557,7 +2645,7 @@ msgstr "Perfis definidos no Pandora"
 
 #: ../../godmode/profiles/profile_list.php:47
 msgid "There was a problem deleting the profile"
-msgstr ""
+msgstr "Houve um problema ao remover o perfil"
 
 #: ../../godmode/profiles/profile_list.php:49
 msgid "Profile successfully deleted"
@@ -2569,7 +2657,7 @@ msgstr "Perfil atualizado corretamente"
 
 #: ../../godmode/profiles/profile_list.php:86
 msgid "There was a problem updating this profile"
-msgstr ""
+msgstr "Houve um problema ao atualizar este perfil"
 
 #: ../../godmode/profiles/profile_list.php:116
 msgid "Profile successfully created"
@@ -2577,7 +2665,7 @@ msgstr "Perfil criado corretamente"
 
 #: ../../godmode/profiles/profile_list.php:118
 msgid "There was a problem creating this profile"
-msgstr ""
+msgstr "Houve um problema ao criar este perfil"
 
 #: ../../godmode/profiles/profile_list.php:123
 msgid "Profile management"
@@ -2609,11 +2697,11 @@ msgid "Edit incidents"
 msgstr "Editar incidentes"
 
 #: ../../godmode/profiles/profile_list.php:178
-#: ../../operation/incidents/incident.php:168 ../../operation/menu.php:143
+#: ../../operation/incidents/incident.php:168 ../../operation/menu.php:95
 msgid "Manage incidents"
 msgstr "Gestão de incidentes"
 
-#: ../../godmode/profiles/profile_list.php:180 ../../operation/menu.php:40
+#: ../../godmode/profiles/profile_list.php:180 ../../operation/menu.php:29
 msgid "View agents"
 msgstr "Ver agentes"
 
@@ -2641,242 +2729,239 @@ msgstr "Perfis"
 
 #: ../../godmode/profiles/profile_list.php:231
 msgid "Read Incidents"
-msgstr ""
+msgstr "Ver incidentes"
 
 #: ../../godmode/profiles/profile_list.php:232
 msgid "Create Incidents"
-msgstr ""
+msgstr "Criar incidentes"
 
 #: ../../godmode/profiles/profile_list.php:233
 msgid "Manage Incidents"
-msgstr ""
+msgstr "Gerenciar incidentes"
 
 #: ../../godmode/profiles/profile_list.php:234
 msgid "Read Agent Information"
-msgstr ""
+msgstr "Ver informações do agente"
 
 #: ../../godmode/profiles/profile_list.php:235
 msgid "Manage Agents"
-msgstr ""
+msgstr "Gerenciar agentes"
 
 #: ../../godmode/profiles/profile_list.php:236
 msgid "Edit Alerts"
-msgstr ""
+msgstr "Editar alertas"
 
 #: ../../godmode/profiles/profile_list.php:237
 msgid "Manage User Rights"
-msgstr ""
+msgstr "Gerenciar permissões de usuários"
 
 #: ../../godmode/profiles/profile_list.php:238
 msgid "Database Management"
-msgstr ""
+msgstr "Gerenciamento do banco de dados"
 
 #: ../../godmode/profiles/profile_list.php:239
 msgid "Alerts Management"
-msgstr ""
+msgstr "Gerenciamento de alertas"
 
 #: ../../godmode/profiles/profile_list.php:240
 msgid "Pandora System Management"
-msgstr ""
+msgstr "Gerenciamento do sistema Pandora"
 
-#: ../../godmode/agentes/configurar_agente.php:132
-#: ../../godmode/agentes/configurar_agente.php:515
-msgid "No agent name specified"
-msgstr ""
-
-#: ../../godmode/agentes/configurar_agente.php:135
+#: ../../godmode/agentes/configurar_agente.php:134
 #: ../../godmode/agentes/configurar_agente.php:518
+msgid "No agent name specified"
+msgstr "Nenhum nome de agente especificado"
+
+#: ../../godmode/agentes/configurar_agente.php:137
+#: ../../godmode/agentes/configurar_agente.php:521
 msgid "There is already an agent in the database with this name"
-msgstr ""
+msgstr "Já existe um agente com este nome no banco de dados"
 
-#: ../../godmode/agentes/configurar_agente.php:166
+#: ../../godmode/agentes/configurar_agente.php:168
 msgid "There was a problem creating record in tagente_estado table"
-msgstr ""
+msgstr "Houve um problema ao criar a entrada na tabela tagente_estado"
 
-#: ../../godmode/agentes/configurar_agente.php:170
+#: ../../godmode/agentes/configurar_agente.php:172
 msgid "There was a problem creating agent_keepalive module"
-msgstr ""
+msgstr "Houve um problema ao criar o módulo agent_keepalive"
 
-#: ../../godmode/agentes/configurar_agente.php:178
+#: ../../godmode/agentes/configurar_agente.php:180
 msgid "There was a problem creating the agent"
-msgstr ""
+msgstr "Houve um problema ao criar o agente"
 
-#: ../../godmode/agentes/configurar_agente.php:189
+#: ../../godmode/agentes/configurar_agente.php:191
 msgid "Setup mode"
 msgstr "Modo gestão"
 
-#: ../../godmode/agentes/configurar_agente.php:196
-#: ../../operation/reporting/graph_viewer.php:169
+#: ../../godmode/agentes/configurar_agente.php:198
 msgid "View"
 msgstr "Ver"
 
-#: ../../godmode/agentes/configurar_agente.php:204
+#: ../../godmode/agentes/configurar_agente.php:206
 msgid "Setup Agent"
 msgstr "Configuração do agent"
 
-#: ../../godmode/agentes/configurar_agente.php:228
+#: ../../godmode/agentes/configurar_agente.php:230
 msgid "Net. Templates"
 msgstr "Modelos de rede"
 
-#: ../../godmode/agentes/configurar_agente.php:243
+#: ../../godmode/agentes/configurar_agente.php:245
 msgid "There was a problem creating agent"
 msgstr "Houve um problema ao criar o agente"
 
-#: ../../godmode/agentes/configurar_agente.php:246
+#: ../../godmode/agentes/configurar_agente.php:248
 msgid "Agent successfully created"
 msgstr "Agente criado corretamente"
 
-#: ../../godmode/agentes/configurar_agente.php:264
+#: ../../godmode/agentes/configurar_agente.php:266
 msgid "No data to normalize"
-msgstr ""
+msgstr "Sem dados para normalizar"
 
-#: ../../godmode/agentes/configurar_agente.php:268
+#: ../../godmode/agentes/configurar_agente.php:270
 msgid "Deleted data above"
 msgstr "Dado apagado"
 
-#: ../../godmode/agentes/configurar_agente.php:270
+#: ../../godmode/agentes/configurar_agente.php:272
 msgid "Error normalizing module"
-msgstr ""
+msgstr "Erro normalizando o módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:299
-#: ../../godmode/alerts/modify_alert.php:73
+#: ../../godmode/agentes/configurar_agente.php:301
 msgid "There was a problem deleting alert"
 msgstr "Houve um problema ao apagar o alerta"
 
-#: ../../godmode/agentes/configurar_agente.php:380
-#: ../../godmode/alerts/modify_alert.php:58
+#: ../../godmode/agentes/configurar_agente.php:382
 msgid "There was a problem creating alert"
 msgstr "Houve um problema ao criar o alerta"
 
-#: ../../godmode/agentes/configurar_agente.php:396
-msgid "There was a problem creating the combined alert"
-msgstr ""
-
 #: ../../godmode/agentes/configurar_agente.php:398
-msgid "Combined alert successfully created"
-msgstr ""
+msgid "There was a problem creating the combined alert"
+msgstr "Houve um problema ao criar o alerta combinado"
 
-#: ../../godmode/agentes/configurar_agente.php:480
-#: ../../godmode/alerts/modify_alert.php:45
+#: ../../godmode/agentes/configurar_agente.php:400
+msgid "Combined alert successfully created"
+msgstr "Alerta combinado criado com sucesso"
+
+#: ../../godmode/agentes/configurar_agente.php:482
 msgid "There was a problem updating alert"
 msgstr "Houve um problema ao atualizar o alerta"
 
-#: ../../godmode/agentes/configurar_agente.php:543
+#: ../../godmode/agentes/configurar_agente.php:546
 msgid "There was a problem updating agent"
 msgstr "Houve um problema ao atualizar o agente"
 
-#: ../../godmode/agentes/configurar_agente.php:546
+#: ../../godmode/agentes/configurar_agente.php:549
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:45
 msgid "Agent successfully updated"
 msgstr "Agente atualizado corretamente"
 
-#: ../../godmode/agentes/configurar_agente.php:570
+#: ../../godmode/agentes/configurar_agente.php:573
 #: ../../operation/agentes/estado_generalagente.php:30
 msgid "There was a problem loading agent"
 msgstr "Houve um erro ao carregar a configuração do agente"
 
-#: ../../godmode/agentes/configurar_agente.php:602
+#: ../../godmode/agentes/configurar_agente.php:606
 msgid "There was a problem loading the module"
-msgstr ""
+msgstr "Houve um problema ao carregar o módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:638
+#: ../../godmode/agentes/configurar_agente.php:643
 msgid "There was a problem loading the alert"
-msgstr ""
+msgstr "Houve um problema ao executar o alerta"
 
-#: ../../godmode/agentes/configurar_agente.php:752
+#: ../../godmode/agentes/configurar_agente.php:772
 msgid "There was a problem updating module"
 msgstr "Houve um problema ao atualizar o módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:754
+#: ../../godmode/agentes/configurar_agente.php:774
 msgid "Module successfully updated"
 msgstr "Módulo atualizado corretamente"
 
-#: ../../godmode/agentes/configurar_agente.php:767
+#: ../../godmode/agentes/configurar_agente.php:787
 msgid "Cannot read from SNMP source"
 msgstr "Não foi possível ler o SNMP de origem"
 
-#: ../../godmode/agentes/configurar_agente.php:769
+#: ../../godmode/agentes/configurar_agente.php:789
 msgid "SNMP source has been scanned"
 msgstr "A origem do SNMP foi analisada"
 
-#: ../../godmode/agentes/configurar_agente.php:801
+#: ../../godmode/agentes/configurar_agente.php:821
 msgid "There was a problem adding module"
 msgstr "Houve um problema ao adicionar o módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:821
-#: ../../godmode/agentes/configurar_agente.php:823
+#: ../../godmode/agentes/configurar_agente.php:829
+#: ../../godmode/agentes/configurar_agente.php:831
 msgid "Module added successfully"
-msgstr ""
+msgstr "Módulo adicionado com sucesso"
 
-#: ../../godmode/agentes/configurar_agente.php:823
+#: ../../godmode/agentes/configurar_agente.php:831
 msgid "Status init unsuccessful"
-msgstr ""
+msgstr "Inicialização do status falhou"
 
-#: ../../godmode/agentes/configurar_agente.php:872
+#: ../../godmode/agentes/configurar_agente.php:871
 msgid "There was a problem deleting the module"
-msgstr ""
+msgstr "Houve um problema ao remover o módulo"
 
-#: ../../godmode/agentes/configurar_agente.php:875
+#: ../../godmode/agentes/configurar_agente.php:874
 msgid "Module deleted successfully"
-msgstr ""
+msgstr "Módulo removido com sucesso"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:80
-#: ../../godmode/agentes/module_manager_editor_data.php:72
-#: ../../godmode/agentes/module_manager_editor_plugin.php:79
+#: ../../godmode/agentes/module_manager_editor_data.php:75
+#: ../../godmode/agentes/module_manager_editor_plugin.php:81
 #: ../../godmode/agentes/module_manager_editor_prediction.php:80
-#: ../../godmode/agentes/module_manager_editor_network.php:81
+#: ../../godmode/agentes/module_manager_editor_network.php:87
 msgid "Module assignment"
 msgstr ""
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:80
 msgid "WMI server module"
-msgstr ""
+msgstr "Módulo de servidor WMI"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:98
-#: ../../godmode/agentes/module_manager_editor_network.php:100
+#: ../../godmode/agentes/module_manager_editor_network.php:106
 msgid "Using Module Component"
 msgstr "Usando componente da rede"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:107
-#: ../../godmode/agentes/module_manager_editor_network.php:109
+#: ../../godmode/agentes/module_manager_editor_network.php:115
 msgid "Manual setup"
 msgstr "Configuração manual"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:123
-#: ../../godmode/agentes/module_manager_editor_network.php:125
+#: ../../godmode/agentes/module_manager_editor_network.php:131
 #: ../../godmode/db/db_purge.php:143
 msgid "Get data"
 msgstr "Obter dados"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:128
-#: ../../godmode/agentes/agent_template.php:156
-#: ../../godmode/agentes/module_manager_editor_data.php:88
-#: ../../godmode/agentes/module_manager_editor_plugin.php:97
+#: ../../godmode/agentes/agent_template.php:131
+#: ../../godmode/agentes/module_manager_editor_data.php:91
+#: ../../godmode/agentes/module_manager_editor_plugin.php:99
 #: ../../godmode/agentes/module_manager_editor_prediction.php:98
-#: ../../godmode/agentes/module_manager_editor_network.php:130
-#: ../../godmode/agentes/module_manager.php:83
+#: ../../godmode/agentes/module_manager_editor_network.php:136
+#: ../../godmode/agentes/module_manager.php:77
 #: ../../godmode/modules/manage_network_components.php:182
 #: ../../godmode/modules/manage_network_components_form_wmi.php:92
 #: ../../godmode/modules/manage_network_templates_form.php:140
 #: ../../godmode/modules/manage_network_components_form_network.php:195
 #: ../../operation/agentes/status_monitor.php:73
 #: ../../operation/agentes/estado_ultimopaquete.php:52
-#: ../../operation/agentes/estado_monitores.php:50
+#: ../../operation/agentes/estado_monitores.php:51
 #: ../../operation/agentes/sla_view.php:46
 #: ../../operation/agentes/sla_view.php:147
+#: ../../operation/agentes/estado_alertas.php:138
 msgid "Module name"
 msgstr "Nome do módulo"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:136
-#: ../../godmode/agentes/module_manager_editor_plugin.php:105
-#: ../../godmode/agentes/module_manager_editor_network.php:138
+#: ../../godmode/agentes/module_manager_editor_plugin.php:107
+#: ../../godmode/agentes/module_manager_editor_network.php:144
 msgid "Target IP"
 msgstr "IP destino"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:138
 #: ../../godmode/modules/manage_network_components_form_wmi.php:168
 msgid "Namespace"
-msgstr ""
+msgstr "Namespace"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:145
 #: ../../godmode/modules/manage_network_components_form_wmi.php:144
@@ -2891,467 +2976,487 @@ msgstr ""
 #: ../../godmode/agentes/module_manager_editor_wmi.php:156
 #: ../../godmode/modules/manage_network_components_form_wmi.php:160
 msgid "Field number"
-msgstr ""
+msgstr "Número do campo"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:164
-#: ../../godmode/agentes/module_manager_editor_plugin.php:134
+#: ../../godmode/agentes/module_manager_editor_plugin.php:136
 #: ../../godmode/modules/manage_network_components_form_wmi.php:176
 #: ../../enterprise/godmode/agentes/inventory_manager.php:124
 msgid "Username"
-msgstr ""
+msgstr "Nome do Usuário"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:173
-#: ../../godmode/agentes/module_manager_editor_data.php:95
-#: ../../godmode/agentes/module_manager_editor_plugin.php:142
-#: ../../godmode/agentes/module_manager_editor_prediction.php:122
-#: ../../godmode/agentes/module_manager_editor_network.php:146
+#: ../../godmode/agentes/module_manager_editor_data.php:98
+#: ../../godmode/agentes/module_manager_editor_plugin.php:144
+#: ../../godmode/agentes/module_manager_editor_prediction.php:127
+#: ../../godmode/agentes/module_manager_editor_network.php:152
 #: ../../godmode/modules/manage_network_components_form_wmi.php:96
 #: ../../godmode/modules/manage_network_components_form_network.php:199
 msgid "Module type"
 msgstr "Tipo de módulo"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:193
-#: ../../godmode/agentes/module_manager_editor_plugin.php:160
-#: ../../godmode/agentes/module_manager_editor_network.php:167
+#: ../../godmode/agentes/module_manager_editor_plugin.php:162
+#: ../../godmode/agentes/module_manager_editor_network.php:173
 #: ../../godmode/modules/manage_network_components_form_wmi.php:138
 msgid "Max. timeout"
-msgstr ""
+msgstr "Tempo máximo de expiração"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:200
-#: ../../godmode/agentes/module_manager_editor_data.php:153
-#: ../../godmode/agentes/module_manager_editor_plugin.php:167
-#: ../../godmode/agentes/module_manager_editor_prediction.php:142
-#: ../../godmode/agentes/module_manager_editor_network.php:174
+#: ../../godmode/agentes/module_manager_editor_data.php:156
+#: ../../godmode/agentes/module_manager_editor_plugin.php:169
+#: ../../godmode/agentes/module_manager_editor_prediction.php:143
+#: ../../godmode/agentes/module_manager_editor_network.php:180
 #: ../../godmode/modules/manage_network_components_form_wmi.php:120
 #: ../../godmode/modules/manage_network_components_form_network.php:223
 msgid "Module group"
 msgstr "Grupo módulos"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:223
-#: ../../godmode/agentes/module_manager_editor_data.php:116
-#: ../../godmode/agentes/module_manager_editor_plugin.php:190
-#: ../../godmode/agentes/module_manager_editor_network.php:245
+#: ../../godmode/agentes/module_manager_editor_data.php:119
+#: ../../godmode/agentes/module_manager_editor_plugin.php:192
+#: ../../godmode/agentes/module_manager_editor_network.php:274
 msgid "Post process"
 msgstr ""
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:228
-#: ../../godmode/agentes/module_manager_editor_data.php:121
-#: ../../godmode/agentes/module_manager_editor_plugin.php:195
-#: ../../godmode/agentes/module_manager_editor_prediction.php:154
-#: ../../godmode/agentes/module_manager_editor_network.php:250
+#: ../../godmode/agentes/module_manager_editor_data.php:124
+#: ../../godmode/agentes/module_manager_editor_plugin.php:197
+#: ../../godmode/agentes/module_manager_editor_prediction.php:148
+#: ../../godmode/agentes/module_manager_editor_network.php:279
 msgid "Export target"
-msgstr ""
+msgstr "Exportar destino"
 
-#: ../../godmode/agentes/agent_template.php:114
+#: ../../godmode/agentes/agent_template.php:79
+msgid "Error adding module"
+msgstr "Erro adicionando o módulo"
+
+#: ../../godmode/agentes/agent_template.php:83
 msgid "Modules successfully added "
 msgstr "Módulos adicionados corretamente "
 
-#: ../../godmode/agentes/agent_template.php:119
-#: ../../godmode/agentes/manage_config_remote.php:82
-#: ../../godmode/agentes/alert_manager.php:33
-#: ../../godmode/agentes/manage_config.php:372
-#: ../../godmode/agentes/modificar_agente.php:133
-#: ../../godmode/agentes/agent_manager.php:37
-#: ../../godmode/agentes/module_manager.php:31
+#: ../../godmode/agentes/agent_template.php:88
+#: ../../godmode/agentes/manage_config_remote.php:80
+#: ../../godmode/agentes/alert_manager.php:27
+#: ../../godmode/agentes/manage_config.php:368
+#: ../../godmode/agentes/modificar_agente.php:53
+#: ../../godmode/agentes/agent_manager.php:30
+#: ../../godmode/agentes/module_manager.php:25
 #: ../../enterprise/godmode/agentes/inventory_manager.php:37
 msgid "Agent configuration"
 msgstr "Configuração de agentes"
 
-#: ../../godmode/agentes/agent_template.php:126
+#: ../../godmode/agentes/agent_template.php:94
 msgid "Available templates"
 msgstr "Modelos disponíveis"
 
-#: ../../godmode/agentes/agent_template.php:130
+#: ../../godmode/agentes/agent_template.php:107
+#: ../../godmode/agentes/alert_manager.php:200
 msgid "Template"
 msgstr "Modelo"
 
-#: ../../godmode/agentes/agent_template.php:141
+#: ../../godmode/agentes/agent_template.php:109
 msgid "Assign"
 msgstr "Assinalar"
 
-#: ../../godmode/agentes/agent_template.php:148
-#: ../../godmode/agentes/module_manager.php:76 ../../godmode/db/db_info.php:62
+#: ../../godmode/agentes/agent_template.php:115
+#: ../../godmode/agentes/module_manager.php:70 ../../godmode/db/db_info.php:63
 msgid "Assigned modules"
 msgstr "Módulos atribuídos"
 
-#: ../../godmode/agentes/module_manager_editor_data.php:72
+#: ../../godmode/agentes/module_manager_editor_data.php:75
 msgid "Data server module"
-msgstr ""
+msgstr "Módulo do servidor de dados"
 
-#: ../../godmode/agentes/module_manager_editor_data.php:163
+#: ../../godmode/agentes/module_manager_editor_data.php:166
 msgid "Not assigned"
 msgstr ""
 
-#: ../../godmode/agentes/manage_config_remote.php:44
-#: ../../godmode/agentes/manage_config.php:47
+#: ../../godmode/agentes/manage_config_remote.php:42
+#: ../../godmode/agentes/manage_config.php:45
 msgid "Data Copy"
 msgstr "Cópia de dados"
 
-#: ../../godmode/agentes/manage_config_remote.php:50
-#: ../../godmode/agentes/manage_config.php:50
-#: ../../godmode/agentes/manage_config.php:238
+#: ../../godmode/agentes/manage_config_remote.php:48
+#: ../../godmode/agentes/manage_config.php:48
+#: ../../godmode/agentes/manage_config.php:236
 msgid "No selected agents to copy"
 msgstr "Não foram selecionados agentes de destino para a cópia"
 
-#: ../../godmode/agentes/manage_config_remote.php:66
+#: ../../godmode/agentes/manage_config_remote.php:64
 msgid "copyage"
 msgstr "Copiando agente"
 
-#: ../../godmode/agentes/manage_config_remote.php:82
-#: ../../godmode/agentes/manage_config.php:372
+#: ../../godmode/agentes/manage_config_remote.php:80
+#: ../../godmode/agentes/manage_config.php:368
 msgid "Configuration Management"
 msgstr "Gerenciamento de Configurações"
 
-#: ../../godmode/agentes/manage_config_remote.php:87
-#: ../../godmode/agentes/manage_config.php:377
+#: ../../godmode/agentes/manage_config_remote.php:85
+#: ../../godmode/agentes/manage_config.php:373
 msgid "Source group"
-msgstr ""
+msgstr "Grupo de origem"
 
-#: ../../godmode/agentes/manage_config_remote.php:129
-#: ../../godmode/agentes/manage_config.php:416
-#: ../../godmode/db/db_refine.php:90
-#: ../../operation/agentes/exportdata.php:263
+#: ../../godmode/agentes/manage_config_remote.php:127
+#: ../../godmode/agentes/manage_config.php:412
+#: ../../godmode/db/db_refine.php:73
+#: ../../operation/agentes/exportdata.php:262
 msgid "Get Info"
 msgstr "Obter info."
 
-#: ../../godmode/agentes/manage_config_remote.php:134
-#: ../../godmode/agentes/manage_config.php:466
+#: ../../godmode/agentes/manage_config_remote.php:132
+#: ../../godmode/agentes/manage_config.php:462
 msgid "To Agent(s):"
 msgstr "Agente(s) destino"
 
-#: ../../godmode/agentes/manage_config_remote.php:146
+#: ../../godmode/agentes/manage_config_remote.php:144
 msgid "Replicate configuration"
-msgstr ""
+msgstr "Duplicar configuração"
+
+#: ../../godmode/agentes/planned_downtime.php:147
+msgid "Timestamp from"
+msgstr "Timbre de data de"
 
 #: ../../godmode/agentes/planned_downtime.php:151
-msgid "Timestamp from"
-msgstr ""
-
-#: ../../godmode/agentes/planned_downtime.php:155
 msgid "Timestamp to"
-msgstr ""
+msgstr "Timbre de data para"
 
-#: ../../godmode/agentes/planned_downtime.php:167
+#: ../../godmode/agentes/planned_downtime.php:163
 msgid "Planned Downtime Form"
-msgstr ""
+msgstr "Formulário de agendamento de indisponibilidade"
 
-#: ../../godmode/agentes/planned_downtime.php:188
+#: ../../godmode/agentes/planned_downtime.php:184
 msgid "Available Agents"
-msgstr ""
+msgstr "Agentes disponíveis"
 
-#: ../../godmode/agentes/planned_downtime.php:209
+#: ../../godmode/agentes/planned_downtime.php:205
 msgid "Filter by group"
-msgstr ""
+msgstr "Filtrar por grupo"
 
-#: ../../godmode/agentes/planned_downtime.php:221
+#: ../../godmode/agentes/planned_downtime.php:217
 msgid "Agents planned for this downtime"
-msgstr ""
+msgstr "Agentes planejados para esta indisponibilidade"
 
-#: ../../godmode/agentes/planned_downtime.php:229
+#: ../../godmode/agentes/planned_downtime.php:225
 #: ../../godmode/users/user_list.php:61
-#: ../../operation/agentes/estado_generalagente.php:100
-#: ../../operation/agentes/estado_monitores.php:54
-#: ../../operation/agentes/ver_agente.php:57
+#: ../../operation/agentes/estado_generalagente.php:98
+#: ../../operation/agentes/estado_monitores.php:55
+#: ../../operation/agentes/ver_agente.php:56
 #: ../../operation/agentes/sla_view.php:50
 #: ../../operation/agentes/estado_agente.php:155
 #: ../../operation/users/user.php:32
 msgid "Last contact"
 msgstr "Último contato"
 
-#: ../../godmode/agentes/planned_downtime.php:230
+#: ../../godmode/agentes/planned_downtime.php:226
 msgid "Remove"
-msgstr ""
+msgstr "Remover"
 
-#: ../../godmode/agentes/planned_downtime.php:237
-#: ../../godmode/agentes/planned_downtime.php:282
+#: ../../godmode/agentes/planned_downtime.php:233
+#: ../../godmode/agentes/planned_downtime.php:278
 msgid "No planned downtime"
-msgstr ""
+msgstr "Nenhuma indisponibilidade agendada"
+
+#: ../../godmode/agentes/planned_downtime.php:263
+msgid "Planned Downtime present on system"
+msgstr "Indisponibilidades agendadas presentes no sistema"
 
 #: ../../godmode/agentes/planned_downtime.php:267
-msgid "Planned Downtime present on system"
-msgstr ""
-
-#: ../../godmode/agentes/planned_downtime.php:271
 msgid "Name #Ag."
 msgstr ""
 
-#: ../../godmode/agentes/planned_downtime.php:273
+#: ../../godmode/agentes/planned_downtime.php:269
+#: ../../godmode/agentes/alert_manager.php:159
+#: ../../godmode/agentes/alert_manager.php:214
+#: ../../godmode/alerts/alert_templates.php:112
 #: ../../operation/messages/message.php:64
 #: ../../operation/messages/message.php:105
 #: ../../operation/messages/message.php:139
 msgid "From"
 msgstr "Desde"
 
-#: ../../godmode/agentes/planned_downtime.php:274
+#: ../../godmode/agentes/planned_downtime.php:270
 #: ../../operation/messages/message.php:67
 #: ../../operation/messages/message.php:107
 msgid "To"
 msgstr "Até"
 
-#: ../../godmode/agentes/planned_downtime.php:275
+#: ../../godmode/agentes/planned_downtime.php:271
 msgid "Del"
-msgstr ""
+msgstr "Apagar"
 
-#: ../../godmode/agentes/planned_downtime.php:276
+#: ../../godmode/agentes/planned_downtime.php:272
 msgid "Upd"
-msgstr ""
+msgstr "Atualizar"
 
-#: ../../godmode/agentes/planned_downtime.php:277
+#: ../../godmode/agentes/planned_downtime.php:273
 msgid "Running"
-msgstr ""
+msgstr "Executando"
 
-#: ../../godmode/agentes/module_manager_editor_plugin.php:79
+#: ../../godmode/agentes/module_manager_editor_plugin.php:81
 msgid "Plugin server module"
-msgstr ""
+msgstr "Módulo de servidor de plugin"
 
-#: ../../godmode/agentes/module_manager_editor_plugin.php:107
+#: ../../godmode/agentes/module_manager_editor_plugin.php:109
 msgid "plugin"
-msgstr ""
+msgstr "plugin"
 
-#: ../../godmode/agentes/module_manager_editor_plugin.php:124
+#: ../../godmode/agentes/module_manager_editor_plugin.php:126
 msgid "Plugin parameters"
-msgstr ""
+msgstr "Parâmetros do plugin"
 
-#: ../../godmode/agentes/alert_manager.php:43
-msgid "Create a simple alert"
-msgstr ""
+#: ../../godmode/agentes/alert_manager.php:37
+#: ../../godmode/alerts/configure_alert_template.php:218
+#: ../../godmode/alerts/alert_actions.php:62
+#: ../../godmode/alerts/alert_commands.php:55
+msgid "Successfully created"
+msgstr "Criado com sucesso"
 
-#: ../../godmode/agentes/alert_manager.php:44
-msgid "Create a new combined alert"
-msgstr ""
+#: ../../godmode/agentes/alert_manager.php:38
+#: ../../godmode/alerts/configure_alert_template.php:219
+#: ../../godmode/alerts/alert_actions.php:63
+#: ../../godmode/alerts/alert_commands.php:56
+msgid "Could not be created"
+msgstr "Não pode ser criado"
 
-#: ../../godmode/agentes/alert_manager.php:59
-msgid "Simple alerts"
-msgstr ""
+#: ../../godmode/agentes/alert_manager.php:65
+msgid "Successfully added"
+msgstr "Adicionado com sucesso"
 
-#: ../../godmode/agentes/alert_manager.php:108
-#: ../../include/functions_events.php:253
-#: ../../operation/snmpconsole/snmp_view.php:156
-#: ../../operation/snmpconsole/snmp_view.php:221
-#: ../../operation/snmpconsole/snmp_view.php:384
-#: ../../operation/events/events.php:332
-msgid "Alert"
-msgstr "Alerta"
+#: ../../godmode/agentes/alert_manager.php:66
+msgid "Could not be added"
+msgstr "Não pode ser adicionado"
+
+#: ../../godmode/agentes/alert_manager.php:72
+msgid "Modules defined"
+msgstr "Módulos definidos"
+
+#: ../../godmode/agentes/alert_manager.php:102
+msgid "Latest value"
+msgstr "Valor mais recente"
 
 #: ../../godmode/agentes/alert_manager.php:109
-#: ../../godmode/agentes/alert_manager.php:185
-#: ../../godmode/agentes/alert_manager_editor.php:365
-#: ../../include/functions_reporting.php:548
-msgid "Threshold"
-msgstr "intervalo"
+msgid "Add alert"
+msgstr "Alerta adicionado"
 
-#: ../../godmode/agentes/alert_manager.php:110
-#: ../../godmode/agentes/alert_manager.php:186
-#: ../../godmode/agentes/alert_manager_editor.php:366
-#: ../../operation/agentes/estado_alertas.php:61
-msgid "Min."
-msgstr "Mín."
+#: ../../godmode/agentes/alert_manager.php:152 ../../include/functions.php:863
+msgid "Always"
+msgstr "Sempre"
 
-#: ../../godmode/agentes/alert_manager.php:111
-#: ../../godmode/agentes/alert_manager.php:187
-#: ../../godmode/agentes/alert_manager_editor.php:367
-#: ../../operation/agentes/estado_alertas.php:62
-msgid "Max."
-msgstr "Máx."
+#: ../../godmode/agentes/alert_manager.php:154
+msgid "On"
+msgstr "Ativado"
 
-#: ../../godmode/agentes/alert_manager.php:112
-#: ../../godmode/agentes/alert_manager.php:188
-#: ../../godmode/agentes/alert_manager_editor.php:368
-#: ../../include/functions_db.php:1862
-msgid "Time"
-msgstr "Hora"
+#: ../../godmode/agentes/alert_manager.php:157
+msgid "Until"
+msgstr "Até"
 
-#: ../../godmode/agentes/alert_manager.php:114
-#: ../../godmode/agentes/alert_manager.php:190
-#: ../../godmode/agentes/alert_manager_editor.php:370
-msgid "info"
-msgstr ""
+#: ../../godmode/agentes/alert_manager.php:160
+#: ../../godmode/agentes/alert_manager.php:216
+#: ../../godmode/alerts/alert_templates.php:114
+#: ../../operation/agentes/exportdata.php:118
+#: ../../operation/agentes/exportdata.php:138
+msgid "to"
+msgstr "até"
 
-#: ../../godmode/agentes/alert_manager.php:119
-#: ../../godmode/agentes/alert_manager.php:195
-#: ../../operation/agentes/estado_alertas.php:106
-msgid "This agent doesn't have any alert"
-msgstr "Este agente não tem nenhum alerta definido"
+#: ../../godmode/agentes/alert_manager.php:178
+msgid "Add action"
+msgstr "Adicionar ação"
 
-#: ../../godmode/agentes/alert_manager.php:122
-#: ../../godmode/agentes/alert_manager.php:134
-#: ../../operation/agentes/estado_ultimopaquete.php:212
-msgid "This agent doesn't have any module"
-msgstr "Este agente não tem nenhum módulo definido"
+#: ../../godmode/agentes/alert_manager.php:212
+msgid "Advanced options"
+msgstr "Opções avançadas"
 
-#: ../../godmode/agentes/alert_manager.php:129
-#: ../../operation/agentes/estado_alertas.php:87
-msgid "Combined alerts"
-msgstr ""
+#: ../../godmode/agentes/alert_manager.php:218
+msgid "matches of the alert"
+msgstr "Combinações do alerta"
 
-#: ../../godmode/agentes/alert_manager.php:141
-msgid "Combined"
-msgstr ""
-
-#: ../../godmode/agentes/alert_manager.php:184
-#: ../../godmode/agentes/alert_manager_editor.php:364
-#: ../../include/functions_db.php:1858
-msgid "Oper"
-msgstr ""
-
-#: ../../godmode/agentes/manage_config.php:55
-#: ../../godmode/agentes/manage_config.php:243
+#: ../../godmode/agentes/manage_config.php:53
+#: ../../godmode/agentes/manage_config.php:241
+#: ../../godmode/db/db_refine.php:46
 msgid "No modules have been selected"
-msgstr ""
+msgstr "Nenhum módulo foi selecionado"
 
-#: ../../godmode/agentes/manage_config.php:73
+#: ../../godmode/agentes/manage_config.php:71
 msgid "You must check modules and/or alerts to be copied"
-msgstr ""
+msgstr "Você deve selecionar os módulo e/ou alertas a serem copiados"
 
-#: ../../godmode/agentes/manage_config.php:92
+#: ../../godmode/agentes/manage_config.php:90
 msgid "Copying module"
 msgstr "Copiando módulo"
 
-#: ../../godmode/agentes/manage_config.php:175
+#: ../../godmode/agentes/manage_config.php:173
 msgid "Copying alert"
 msgstr "Copiando alerta"
 
-#: ../../godmode/agentes/manage_config.php:221
+#: ../../godmode/agentes/manage_config.php:219
 msgid "There was an error copying the module, the copy has been cancelled"
-msgstr ""
+msgstr "Houve um erro ao copiar o módulo. A cópia foi cancelada."
 
-#: ../../godmode/agentes/manage_config.php:224
+#: ../../godmode/agentes/manage_config.php:222
 msgid "Successfully copied module"
-msgstr ""
+msgstr "Módulo copiado com sucesso"
 
-#: ../../godmode/agentes/manage_config.php:235
+#: ../../godmode/agentes/manage_config.php:233
 msgid "Agent Module Data Deletion"
-msgstr ""
+msgstr "Remoção de módulo agente"
 
-#: ../../godmode/agentes/manage_config.php:264
+#: ../../godmode/agentes/manage_config.php:260
 msgid "You must check modules and/or alerts to be deleted"
-msgstr ""
+msgstr "Você deve selecionar os módulos e/ou alertas a serem removidos"
 
-#: ../../godmode/agentes/manage_config.php:329
+#: ../../godmode/agentes/manage_config.php:325
 msgid ""
 "There was an error removing the module data, the removal has been cancelled"
-msgstr ""
+msgstr "Houve um erro ao remover o módulo de dados. A remoção foi cancelada."
 
-#: ../../godmode/agentes/manage_config.php:332
+#: ../../godmode/agentes/manage_config.php:328
 msgid "Successfully removed module data"
-msgstr ""
+msgstr "Módulo de dados removido com sucesso"
 
-#: ../../godmode/agentes/manage_config.php:344
+#: ../../godmode/agentes/manage_config.php:340
 msgid "Deleting Agent"
-msgstr ""
+msgstr "Removendo agente"
 
-#: ../../godmode/agentes/manage_config.php:351
+#: ../../godmode/agentes/manage_config.php:347
 msgid "You must select at least one agent to be removed"
-msgstr ""
+msgstr "Você deve selecionar ao menos um agente a ser removido"
 
-#: ../../godmode/agentes/manage_config.php:358
+#: ../../godmode/agentes/manage_config.php:354
 msgid "There was an error removing the agents. Removal has been cancelled"
-msgstr ""
+msgstr "Houve um erro ao remover os agentes. A remoção foi cancelada."
 
-#: ../../godmode/agentes/manage_config.php:360
+#: ../../godmode/agentes/manage_config.php:356
 msgid "Successfully removed agents"
-msgstr ""
+msgstr "Agentes removidos com sucesso"
 
-#: ../../godmode/agentes/manage_config.php:399
+#: ../../godmode/agentes/manage_config.php:395
 msgid "No Agents in this Group"
-msgstr ""
+msgstr "Nenhum agente neste grupo"
 
-#: ../../godmode/agentes/manage_config.php:427
+#: ../../godmode/agentes/manage_config.php:423
 msgid "No modules for this agent"
-msgstr ""
+msgstr "Sem módulos para este agente"
 
-#: ../../godmode/agentes/manage_config.php:429
+#: ../../godmode/agentes/manage_config.php:425
+#: ../../godmode/db/db_refine.php:69
 #: ../../enterprise/operation/inventory/inventory.php:76
 msgid "No agent selected"
 msgstr "Nenhum agente selecionado"
 
-#: ../../godmode/agentes/manage_config.php:441
+#: ../../godmode/agentes/manage_config.php:437
 msgid "Targets"
-msgstr ""
+msgstr "Destinos"
 
-#: ../../godmode/agentes/manage_config.php:473
+#: ../../godmode/agentes/manage_config.php:469
 msgid "Copy Modules/Alerts"
-msgstr ""
+msgstr "Copiar Módulos/Alertas"
 
-#: ../../godmode/agentes/manage_config.php:476
+#: ../../godmode/agentes/manage_config.php:472
 msgid "Delete Modules/Alerts"
-msgstr ""
+msgstr "Remover Módulos/Alertas"
 
-#: ../../godmode/agentes/manage_config.php:476
+#: ../../godmode/agentes/manage_config.php:472
 msgid "Are you sure you want to delete these modules and alerts?"
-msgstr ""
+msgstr "Você tem certeza que deseja remover estes módulos e alertas?"
 
-#: ../../godmode/agentes/manage_config.php:479
+#: ../../godmode/agentes/manage_config.php:475
 msgid "Delete Agents"
-msgstr ""
+msgstr "Remover agentes"
 
-#: ../../godmode/agentes/manage_config.php:479
+#: ../../godmode/agentes/manage_config.php:475
 msgid "Are you sure you want to delete these agents?"
-msgstr ""
+msgstr "Você tem certeza que deseja remover estes agentes?"
 
 #: ../../godmode/agentes/module_manager_editor_prediction.php:80
 msgid "Prediction server module"
-msgstr ""
+msgstr "Módulo do servidor de previsões"
 
-#: ../../godmode/agentes/module_manager_editor_prediction.php:106
+#: ../../godmode/agentes/module_manager_editor_prediction.php:108
 msgid "Source module"
-msgstr ""
+msgstr "Módulo de origem"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:81
+#: ../../godmode/agentes/module_manager_editor_network.php:87
 msgid "Network server module"
-msgstr ""
+msgstr "Módulo do servidor de rede"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:140
+#: ../../godmode/agentes/module_manager_editor_network.php:146
 #: ../../godmode/modules/manage_network_components_form_network.php:240
 msgid "TCP port"
 msgstr "Porta TCP"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:189
+#: ../../godmode/agentes/module_manager_editor_network.php:195
 msgid "SNMP walk"
-msgstr ""
+msgstr "SNMP Walk"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:210
+#: ../../godmode/agentes/module_manager_editor_network.php:216
 #: ../../godmode/modules/manage_network_components_form_network.php:244
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:214
+#: ../../godmode/agentes/module_manager_editor_network.php:220
 #: ../../godmode/modules/manage_network_components_form_network.php:248
 msgid "SNMP Community"
 msgstr "Comunidade SNMP"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:220
+#: ../../godmode/agentes/module_manager_editor_network.php:226
 msgid "SNMP version"
+msgstr "Versão do SNMP"
+
+#: ../../godmode/agentes/module_manager_editor_network.php:251
+msgid "Warning status"
+msgstr "Status do alerta"
+
+#: ../../godmode/agentes/module_manager_editor_network.php:252
+#: ../../godmode/agentes/module_manager_editor_network.php:257
+#: ../../godmode/agentes/alert_manager_editor.php:368
+#: ../../godmode/alerts/configure_alert_template.php:436
+#: ../../include/functions_alerts.php:243
+#: ../../operation/agentes/estado_alertas.php:123
+msgid "Min."
+msgstr "Mín."
+
+#: ../../godmode/agentes/module_manager_editor_network.php:253
+#: ../../godmode/agentes/module_manager_editor_network.php:258
+#: ../../godmode/agentes/alert_manager_editor.php:369
+#: ../../godmode/alerts/configure_alert_template.php:433
+#: ../../include/functions_alerts.php:242
+#: ../../operation/agentes/estado_alertas.php:123
+msgid "Max."
+msgstr "Máx."
+
+#: ../../godmode/agentes/module_manager_editor_network.php:256
+msgid "Critical status"
+msgstr "Status crítico"
+
+#: ../../godmode/agentes/module_manager_editor_network.php:262
+msgid "Historical data"
+msgstr "Dados históricos"
+
+#: ../../godmode/agentes/module_manager_editor_network.php:267
+msgid "FF threshold"
 msgstr ""
 
-#: ../../godmode/agentes/module_manager_editor_network.php:266
+#: ../../godmode/agentes/module_manager_editor_network.php:295
 #: ../../godmode/modules/manage_network_components_form_network.php:252
 msgid "TCP send"
 msgstr "Enviar TCP"
 
-#: ../../godmode/agentes/module_manager_editor_network.php:276
+#: ../../godmode/agentes/module_manager_editor_network.php:305
 #: ../../godmode/modules/manage_network_components_form_network.php:256
 msgid "TCP receive"
 msgstr "Receber TCP"
 
-#: ../../godmode/agentes/modificar_agente.php:108
-msgid "There was a problem deleting agent"
-msgstr "Houve um problema ao apagar o agente"
-
-#: ../../godmode/agentes/modificar_agente.php:111
-msgid "Agent deleted successfully"
-msgstr ""
-
-#: ../../godmode/agentes/modificar_agente.php:133
+#: ../../godmode/agentes/modificar_agente.php:53
 msgid "Agents defined in Pandora"
 msgstr "Agentes definidos no Pandora"
 
-#: ../../godmode/agentes/modificar_agente.php:167
+#: ../../godmode/agentes/modificar_agente.php:87
 #: ../../operation/agentes/estado_agente.php:66
 msgid "Free text for search (*)"
 msgstr "Texto livre para busca (*)"
 
-#: ../../godmode/agentes/modificar_agente.php:181
+#: ../../godmode/agentes/modificar_agente.php:101
 #: ../../enterprise/operation/agentes/agent_inventory.php:47
 #: ../../enterprise/operation/agentes/agent_inventory.php:52
 #: ../../enterprise/operation/inventory/inventory.php:68
@@ -3360,171 +3465,181 @@ msgstr "Texto livre para busca (*)"
 msgid "Search"
 msgstr "Buscar"
 
-#: ../../godmode/agentes/modificar_agente.php:220
-#: ../../godmode/agentes/agent_manager.php:75 ../../godmode/db/db_info.php:61
-#: ../../include/functions_events.php:187
+#: ../../godmode/agentes/modificar_agente.php:140
+#: ../../godmode/agentes/agent_manager.php:68 ../../godmode/db/db_info.php:62
+#: ../../include/functions_events.php:204
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:58
 #: ../../operation/agentes/estado_generalagente.php:58
-#: ../../operation/events/events.php:243
+#: ../../operation/agentes/estado_alertas.php:140
+#: ../../operation/agentes/estado_alertas.php:164
+#: ../../operation/events/events.php:261
 msgid "Agent name"
 msgstr "Nome do agente"
 
-#: ../../godmode/agentes/modificar_agente.php:221
+#: ../../godmode/agentes/modificar_agente.php:141
 msgid "Remote agent configuration"
-msgstr ""
+msgstr "Configuração de agente remoto"
 
-#: ../../godmode/agentes/modificar_agente.php:221
+#: ../../godmode/agentes/modificar_agente.php:141
 msgid "R"
 msgstr ""
 
-#: ../../godmode/agentes/modificar_agente.php:257
+#: ../../godmode/agentes/modificar_agente.php:177
 msgid "Edit remote config"
-msgstr ""
+msgstr "Editar configuração remota"
 
-#: ../../godmode/agentes/modificar_agente.php:281
+#: ../../godmode/agentes/modificar_agente.php:201
 msgid "There are no defined agents"
 msgstr "Não há nenhum agente definido"
 
-#: ../../godmode/agentes/modificar_agente.php:289
-#: ../../godmode/agentes/agent_manager.php:40
+#: ../../godmode/agentes/modificar_agente.php:209
+#: ../../godmode/agentes/agent_manager.php:33
 #: ../../operation/snmpconsole/snmp_view.php:284
-#: ../../operation/agentes/estado_agente.php:340
+#: ../../operation/agentes/estado_agente.php:328
 msgid "Create agent"
 msgstr "Criar agente"
 
-#: ../../godmode/agentes/agent_manager.php:42
+#: ../../godmode/agentes/agent_manager.php:35
 msgid "Update agent"
 msgstr "Atualizar agente"
 
-#: ../../godmode/agentes/agent_manager.php:75
+#: ../../godmode/agentes/agent_manager.php:68
 msgid "The agent's name must be the same as the one defined at the console"
-msgstr ""
+msgstr "O nome do agente deve ser o mesmo que o definido no console"
 
-#: ../../godmode/agentes/agent_manager.php:80 ../../operation/menu.php:69
+#: ../../godmode/agentes/agent_manager.php:73 ../../operation/menu.php:43
 msgid "Agent detail"
 msgstr "Detalhe do agente"
 
-#: ../../godmode/agentes/agent_manager.php:86
+#: ../../godmode/agentes/agent_manager.php:79
 msgid "This agent can be remotely configured"
-msgstr ""
+msgstr "Este agente pode ser configurado remotamente"
 
-#: ../../godmode/agentes/agent_manager.php:86
+#: ../../godmode/agentes/agent_manager.php:79
 msgid "You can remotely edit this agent configuration"
-msgstr ""
+msgstr "Você pode editar remotamente a configuração deste agente"
 
-#: ../../godmode/agentes/agent_manager.php:98
+#: ../../godmode/agentes/agent_manager.php:91
 msgid "Delete selected"
 msgstr "Apagar selecionadas"
 
-#: ../../godmode/agentes/agent_manager.php:117
+#: ../../godmode/agentes/agent_manager.php:110
 msgid ""
 "You must select a Network Server for the Agent, so it can work properly with "
 "this kind of modules"
 msgstr ""
+"Você debe selecionar um servidor de rede para este agente, assim ele poderá "
+"trabalhar corretamente com este tipo de módulos"
 
-#: ../../godmode/agentes/agent_manager.php:121
+#: ../../godmode/agentes/agent_manager.php:114
 #: ../../operation/servers/view_server.php:115
 msgid "Plugin Server"
-msgstr ""
+msgstr "Servidor de plugin"
 
-#: ../../godmode/agentes/agent_manager.php:121
+#: ../../godmode/agentes/agent_manager.php:114
 msgid ""
 "You must select a Plugin Server for the Agent, so it can work properly with "
 "this kind of modules"
 msgstr ""
+"Você deve escolher um servidor de plugin para o agente, assim ele poderá "
+"trabalhar corretamente com esse tipo de módulos"
 
-#: ../../godmode/agentes/agent_manager.php:125
+#: ../../godmode/agentes/agent_manager.php:118
 #: ../../operation/servers/view_server.php:109
 msgid "WMI Server"
-msgstr ""
+msgstr "Servidor WMI"
 
-#: ../../godmode/agentes/agent_manager.php:125
+#: ../../godmode/agentes/agent_manager.php:118
 msgid ""
 "You must select a WMI Server for the Agent, so it can work properly with "
 "this kind of modules"
 msgstr ""
+"Você deve escolher um servidor WMI para o agente, assim ele poderá trabalhar "
+"corretamente com esse tipo de módulos"
 
-#: ../../godmode/agentes/agent_manager.php:129
+#: ../../godmode/agentes/agent_manager.php:122
 #: ../../operation/servers/view_server.php:112
 msgid "Prediction Server"
-msgstr ""
+msgstr "Servidor de previsão"
 
-#: ../../godmode/agentes/agent_manager.php:129
+#: ../../godmode/agentes/agent_manager.php:122
 msgid ""
 "You must select a Prediction Server for the Agent, so it can work properly "
 "with this kind of modules"
 msgstr ""
+"Você deve escolher um servidor de previsão para o agente, assim ele poderá "
+"trabalhar corretamente com esse tipo de módulos"
 
-#: ../../godmode/agentes/agent_manager.php:139
+#: ../../godmode/agentes/agent_manager.php:136
 msgid "Module definition"
 msgstr "Definição de módulos"
 
-#: ../../godmode/agentes/agent_manager.php:140
+#: ../../godmode/agentes/agent_manager.php:137
 msgid "Learning mode"
 msgstr "Modo de aprendizagem"
 
-#: ../../godmode/agentes/agent_manager.php:141
+#: ../../godmode/agentes/agent_manager.php:138
 msgid "Normal mode"
 msgstr "Modo normal"
 
-#: ../../godmode/agentes/agent_manager.php:146
+#: ../../godmode/agentes/agent_manager.php:143
 msgid "Active"
 msgstr "Ativo"
 
-#: ../../godmode/agentes/agent_manager.php:149
+#: ../../godmode/agentes/agent_manager.php:146
 msgid "Remote configuration"
-msgstr ""
+msgstr "Configuração remota"
 
-#: ../../godmode/agentes/agent_manager.php:157
+#: ../../godmode/agentes/agent_manager.php:154
 msgid "Not available"
-msgstr ""
+msgstr "Indisponível"
+
+#: ../../godmode/agentes/module_manager.php:51
+msgid "Create a new data server module"
+msgstr "Criar um novo módulo de servidor de dados"
+
+#: ../../godmode/agentes/module_manager.php:53
+msgid "Create a new network server module"
+msgstr "Criar um novo módulo de servidor de rede"
+
+#: ../../godmode/agentes/module_manager.php:55
+msgid "Create a new plugin Server module"
+msgstr "Criar um novo módulo de servidor de plugin"
 
 #: ../../godmode/agentes/module_manager.php:57
-msgid "Create a new data server module"
-msgstr ""
+msgid "Create a new WMI Server module"
+msgstr "Criar um novo módulo de servidor WMI"
 
 #: ../../godmode/agentes/module_manager.php:59
-msgid "Create a new network server module"
-msgstr ""
-
-#: ../../godmode/agentes/module_manager.php:61
-msgid "Create a new plugin Server module"
-msgstr ""
-
-#: ../../godmode/agentes/module_manager.php:63
-msgid "Create a new WMI Server module"
-msgstr ""
-
-#: ../../godmode/agentes/module_manager.php:65
 msgid "Create a new prediction Server module"
-msgstr ""
+msgstr "Criar um novo módulo de servidor de previsões"
 
-#: ../../godmode/agentes/module_manager.php:84
+#: ../../godmode/agentes/module_manager.php:78
 msgid "S"
 msgstr ""
 
-#: ../../godmode/agentes/module_manager.php:88
+#: ../../godmode/agentes/module_manager.php:82
 #: ../../godmode/modules/manage_network_components.php:188
 msgid "Max/Min"
 msgstr "Máx/Mín"
 
-#: ../../godmode/agentes/module_manager.php:170
+#: ../../godmode/agentes/module_manager.php:163
 msgid "No available data to show"
-msgstr ""
+msgstr "Nenhum dado disponível para exibição"
 
-#: ../../godmode/agentes/alert_manager_editor.php:22
+#: ../../godmode/agentes/alert_manager_editor.php:24
 msgid "Alert association form"
 msgstr "Formulário de associação de alerta"
 
-#: ../../godmode/agentes/alert_manager_editor.php:47
+#: ../../godmode/agentes/alert_manager_editor.php:49
 msgid "Assigned module"
 msgstr "Módulo atribuído"
 
-#: ../../godmode/agentes/alert_manager_editor.php:98
+#: ../../godmode/agentes/alert_manager_editor.php:100
 msgid "Alert status"
 msgstr "Status dos alertas"
 
-#: ../../godmode/agentes/alert_manager_editor.php:117
+#: ../../godmode/agentes/alert_manager_editor.php:119
 msgid ""
 "Min. possible value to consider 'valid' values, below this limit, Pandora "
 "FMS will fire the alert"
@@ -3532,7 +3647,7 @@ msgstr ""
 "Valor mínimo possível a considerar como 'válido', abaixo deste limite o "
 "Pandora FMS disparará o alerta"
 
-#: ../../godmode/agentes/alert_manager_editor.php:123
+#: ../../godmode/agentes/alert_manager_editor.php:125
 msgid ""
 "Max. possible value to consider 'valid' values, above this limit, Pandora "
 "FMS will fire the alert"
@@ -3540,92 +3655,117 @@ msgstr ""
 "Valor máximo possível a considerar como 'válido', abaixo deste limite o "
 "Pandora FMS disparará o alerta"
 
-#: ../../godmode/agentes/alert_manager_editor.php:130
+#: ../../godmode/agentes/alert_manager_editor.php:132
 msgid "Alert text"
 msgstr "Alerta de texto"
 
-#: ../../godmode/agentes/alert_manager_editor.php:136
+#: ../../godmode/agentes/alert_manager_editor.php:138
 msgid ""
 "This value must be al least Module Interval * (Min.Number of Alerts + 1)"
 msgstr ""
 "Este valor deve ser como mínimo, o intervalo do módulo multiplicado pelo "
 "mínimo de número de alertas + 1"
 
-#: ../../godmode/agentes/alert_manager_editor.php:158
+#: ../../godmode/agentes/alert_manager_editor.php:160
 msgid "Other"
 msgstr "Outro"
 
-#: ../../godmode/agentes/alert_manager_editor.php:204
+#: ../../godmode/agentes/alert_manager_editor.php:206
+#: ../../godmode/alerts/configure_alert_template.php:321
 msgid "Time from"
 msgstr "Data desde"
 
-#: ../../godmode/agentes/alert_manager_editor.php:219
+#: ../../godmode/agentes/alert_manager_editor.php:221
+#: ../../godmode/alerts/configure_alert_template.php:324
 msgid "Time to"
 msgstr "Data até"
 
-#: ../../godmode/agentes/alert_manager_editor.php:235
-msgid "Days of week"
-msgstr ""
-
 #: ../../godmode/agentes/alert_manager_editor.php:237
-#: ../../include/functions.php:623
+#: ../../godmode/alerts/configure_alert_template.php:305
+msgid "Days of week"
+msgstr "Dias da semana"
+
+#: ../../godmode/agentes/alert_manager_editor.php:239
+#: ../../godmode/alerts/configure_alert_template.php:306
+#: ../../include/functions.php:655
 msgid "Mon"
-msgstr ""
+msgstr "Seg"
 
-#: ../../godmode/agentes/alert_manager_editor.php:240
-#: ../../include/functions.php:625
+#: ../../godmode/agentes/alert_manager_editor.php:242
+#: ../../godmode/alerts/configure_alert_template.php:308
+#: ../../include/functions.php:657
 msgid "Tue"
-msgstr ""
+msgstr "Ter"
 
-#: ../../godmode/agentes/alert_manager_editor.php:243
-#: ../../include/functions.php:627
+#: ../../godmode/agentes/alert_manager_editor.php:245
+#: ../../godmode/alerts/configure_alert_template.php:310
+#: ../../include/functions.php:659
 msgid "Wed"
-msgstr ""
+msgstr "Qua"
 
-#: ../../godmode/agentes/alert_manager_editor.php:246
-#: ../../include/functions.php:629
+#: ../../godmode/agentes/alert_manager_editor.php:248
+#: ../../godmode/alerts/configure_alert_template.php:312
+#: ../../include/functions.php:661
 msgid "Thu"
-msgstr ""
+msgstr "Qui"
 
-#: ../../godmode/agentes/alert_manager_editor.php:249
-#: ../../include/functions.php:631
+#: ../../godmode/agentes/alert_manager_editor.php:251
+#: ../../godmode/alerts/configure_alert_template.php:314
+#: ../../include/functions.php:663
 msgid "Fri"
-msgstr ""
+msgstr "Sex"
 
-#: ../../godmode/agentes/alert_manager_editor.php:252
-#: ../../include/functions.php:633
+#: ../../godmode/agentes/alert_manager_editor.php:254
+#: ../../godmode/alerts/configure_alert_template.php:316
+#: ../../include/functions.php:665
 msgid "Sat"
-msgstr ""
+msgstr "Sáb"
 
-#: ../../godmode/agentes/alert_manager_editor.php:255
-#: ../../include/functions.php:635
+#: ../../godmode/agentes/alert_manager_editor.php:257
+#: ../../godmode/alerts/configure_alert_template.php:318
+#: ../../include/functions.php:667
 msgid "Sun"
-msgstr ""
+msgstr "Dom"
 
-#: ../../godmode/agentes/alert_manager_editor.php:259
+#: ../../godmode/agentes/alert_manager_editor.php:261
 msgid "Field #2 (Rec)"
-msgstr ""
+msgstr "Campo 2 (Rec)"
 
-#: ../../godmode/agentes/alert_manager_editor.php:264
+#: ../../godmode/agentes/alert_manager_editor.php:266
+#: ../../godmode/alerts/configure_alert_template.php:367
 msgid "Alert recovery"
-msgstr ""
+msgstr "Recuperação de alerta"
 
-#: ../../godmode/agentes/alert_manager_editor.php:280
+#: ../../godmode/agentes/alert_manager_editor.php:282
 msgid "Field #3 (Rec)"
-msgstr ""
+msgstr "Campo 3 (Rec)"
 
-#: ../../godmode/agentes/alert_manager_editor.php:299
+#: ../../godmode/agentes/alert_manager_editor.php:301
 msgid "Combined alert components"
-msgstr ""
+msgstr "Componentes de alerta combinado"
 
-#: ../../godmode/agentes/alert_manager_editor.php:312
+#: ../../godmode/agentes/alert_manager_editor.php:314
 msgid "Source Agent/Alert"
-msgstr ""
+msgstr "Agente/Alerta de origem"
 
-#: ../../godmode/agentes/alert_manager_editor.php:341
-#: ../../operation/menu.php:26
-msgid "Operation"
-msgstr "Operação"
+#: ../../godmode/agentes/alert_manager_editor.php:366
+#: ../../include/functions_db.php:1971
+msgid "Oper"
+msgstr "Operador"
+
+#: ../../godmode/agentes/alert_manager_editor.php:367
+#: ../../include/functions_reporting.php:550
+msgid "Threshold"
+msgstr "intervalo"
+
+#: ../../godmode/agentes/alert_manager_editor.php:370
+#: ../../include/functions_db.php:1975
+msgid "Time"
+msgstr "Hora"
+
+#: ../../godmode/agentes/alert_manager_editor.php:372
+msgid "info"
+msgstr "info"
 
 #: ../../godmode/modules/manage_network_components.php:137
 #: ../../godmode/modules/manage_nc_groups.php:70
@@ -3643,11 +3783,11 @@ msgstr "Gestão dos componentes de rede"
 
 #: ../../godmode/modules/manage_network_components.php:166
 msgid "Create a new network component"
-msgstr ""
+msgstr "Criar um novo componente de rede"
 
 #: ../../godmode/modules/manage_network_components.php:167
 msgid "Create a new WMI component"
-msgstr ""
+msgstr "Criar um novo componente WMI"
 
 #: ../../godmode/modules/manage_network_components.php:186
 msgid "NC.Group"
@@ -3660,7 +3800,7 @@ msgstr "Gestão dos grupos de componentes de rede"
 
 #: ../../godmode/modules/manage_network_components_form_wmi.php:80
 msgid "WMI component management"
-msgstr ""
+msgstr "Gerenciamento de componente WMI"
 
 #: ../../godmode/modules/manage_network_components_form_wmi.php:133
 #: ../../godmode/modules/manage_network_components_form_network.php:235
@@ -3688,43 +3828,43 @@ msgstr "Não há nenhum perfil de rede definido"
 
 #: ../../godmode/modules/manage_network_templates_form.php:47
 msgid "Successfully deleted module from profile"
-msgstr ""
+msgstr "Módulo removido com perfil com sucesso"
 
 #: ../../godmode/modules/manage_network_templates_form.php:47
 msgid "Error deleting module from profile"
-msgstr ""
+msgstr "Erro ao remover o módulo do perfil"
 
 #: ../../godmode/modules/manage_network_templates_form.php:59
 msgid "Successfully added module to profile"
-msgstr ""
+msgstr "Módulo adicionado com sucesso ao perfil"
 
 #: ../../godmode/modules/manage_network_templates_form.php:59
 msgid "Error adding module to profile"
-msgstr ""
+msgstr "Erro adicionando o módulo ao perfil"
 
 #: ../../godmode/modules/manage_network_templates_form.php:71
 msgid "Successfully updated network profile"
-msgstr ""
+msgstr "Perfil de rede atualizado com sucesso"
 
 #: ../../godmode/modules/manage_network_templates_form.php:71
 msgid "Error updating network profile"
-msgstr ""
+msgstr "Erro ao atualizar o perfil de rede"
 
 #: ../../godmode/modules/manage_network_templates_form.php:76
 msgid "Successfully added network profile"
-msgstr ""
+msgstr "Perfil de rede adicionado com sucesso"
 
 #: ../../godmode/modules/manage_network_templates_form.php:76
 msgid "Error adding network profile"
-msgstr ""
+msgstr "Erro ao adicionar o perfil de rede"
 
 #: ../../godmode/modules/manage_network_templates_form.php:128
 msgid "No modules for this profile"
-msgstr ""
+msgstr "Sem módulos para este perfil"
 
 #: ../../godmode/modules/manage_network_templates_form.php:168
 msgid "Add Modules"
-msgstr ""
+msgstr "Adicionar Módulos"
 
 #: ../../godmode/modules/module_list.php:46
 msgid "Problem modifying module"
@@ -3759,10 +3899,10 @@ msgstr "Usuários definidos no Pandora"
 
 #: ../../godmode/users/user_list.php:59
 #: ../../godmode/users/configure_user.php:177
-#: ../../include/functions_events.php:189
-#: ../../include/functions_reporting.php:305
+#: ../../include/functions_events.php:206
+#: ../../include/functions_reporting.php:300
 #: ../../operation/snmpconsole/snmp_view.php:214
-#: ../../operation/events/events.php:252
+#: ../../operation/events/events.php:270
 #: ../../operation/users/user_edit.php:109
 msgid "User ID"
 msgstr "ID usuário"
@@ -3804,11 +3944,11 @@ msgstr "Houve um problema ao atualizar o usuário"
 
 #: ../../godmode/users/configure_user.php:148
 msgid "User creation failed"
-msgstr ""
+msgstr "A criação de usuário falhou"
 
 #: ../../godmode/users/configure_user.php:150
 msgid "User created successfully"
-msgstr ""
+msgstr "Usuário criado com sucesso"
 
 #: ../../godmode/users/configure_user.php:164
 msgid "Update user"
@@ -3821,7 +3961,7 @@ msgstr "Nome Real"
 
 #: ../../godmode/users/configure_user.php:188
 msgid "Password confirmation"
-msgstr ""
+msgstr "Confirmação da senha"
 
 #: ../../godmode/users/configure_user.php:194
 #: ../../operation/users/user_edit.php:127
@@ -3841,6 +3981,8 @@ msgid ""
 "This user has permissions to manage all. This is admin user and overwrites "
 "all permissions given in profiles/groups"
 msgstr ""
+"Esse usuário tem permissão total de gerencimaneto. Esse é um usuário "
+"administrativo e sobrepõe todas as permissões dadas em perfis/grupos"
 
 #: ../../godmode/users/configure_user.php:204
 msgid "Standard user"
@@ -3867,7 +4009,7 @@ msgstr "Perfis/Grupos atribuídos a este usuário"
 
 #: ../../godmode/db/db_info.php:42 ../../godmode/db/db_purge.php:41
 #: ../../godmode/db/db_main.php:40 ../../godmode/db/db_audit.php:72
-#: ../../godmode/db/db_refine.php:68 ../../godmode/db/db_event.php:45
+#: ../../godmode/db/db_refine.php:32 ../../godmode/db/db_event.php:45
 msgid "Database Maintenance"
 msgstr "Manutenção da Base de Dados"
 
@@ -3886,14 +4028,16 @@ msgstr "Pacotes por agentes"
 #: ../../godmode/db/db_info.php:54
 msgid "Press here to get database information as text"
 msgstr ""
+"Clique aqui para visualizar as informações do banco de dados como texto"
 
-#: ../../godmode/db/db_info.php:63
+#: ../../godmode/db/db_info.php:64
 msgid "Total data"
 msgstr "Dados totais"
 
-#: ../../godmode/db/db_info.php:93
+#: ../../godmode/db/db_info.php:87
 msgid "Press here to get database information as a graph"
 msgstr ""
+"Clique aqui para visualizar as informações do bando de dados como gráfico"
 
 #: ../../godmode/db/db_sanity.php:32
 msgid "Database sanity tool"
@@ -3901,15 +4045,15 @@ msgstr ""
 
 #: ../../godmode/db/db_sanity.php:38
 msgid "Checking tagente_estado table"
-msgstr ""
+msgstr "Verificando tabela tagente_estado"
 
 #: ../../godmode/db/db_sanity.php:55
 msgid "Checking database consistency"
-msgstr ""
+msgstr "Verificando consistência do banco de dados"
 
 #: ../../godmode/db/db_sanity.php:71
 msgid "Deleting non-init data"
-msgstr ""
+msgstr "Removendo dados não inicializados"
 
 #: ../../godmode/db/db_sanity.php:89
 msgid ""
@@ -3924,11 +4068,11 @@ msgstr ""
 
 #: ../../godmode/db/db_sanity.php:94
 msgid "Sanitize my database now"
-msgstr ""
+msgstr "Higienize minha base de dados agora"
 
 #: ../../godmode/db/db_sanity.php:101
 msgid "Delete non-initialized modules now"
-msgstr ""
+msgstr "Remova módulos não-inicializados agora"
 
 #: ../../godmode/db/db_purge.php:44
 msgid "Get data from agent"
@@ -3936,25 +4080,27 @@ msgstr "Obter dados de um agente"
 
 #: ../../godmode/db/db_purge.php:83
 msgid "Purge task launched for agent"
-msgstr ""
+msgstr "Tarefa de remoção disparada para o agente"
 
 #: ../../godmode/db/db_purge.php:83
 msgid "Data older than"
-msgstr ""
+msgstr "Dados mais antigos que"
 
 #: ../../godmode/db/db_purge.php:84
 msgid ""
 "Please be patient. This operation can take a long time depending on the "
 "amount of modules."
 msgstr ""
+"Por favor, seja paciente. Esta operação pode demorar bastante tempo "
+"dependendo do número de módulos."
 
 #: ../../godmode/db/db_purge.php:97
 msgid "Deleting records for module"
-msgstr ""
+msgstr "Removendo entradas para o módulo"
 
 #: ../../godmode/db/db_purge.php:121
 msgid "Deleting records for all agents"
-msgstr ""
+msgstr "Removendo as entradas para todos os agentes"
 
 #: ../../godmode/db/db_purge.php:135
 msgid "Choose agent"
@@ -3966,51 +4112,52 @@ msgstr "Todos os agentes"
 
 #: ../../godmode/db/db_purge.php:141
 msgid "Select the agent you want information about"
-msgstr ""
+msgstr "Selecione o agente do qual deseja informações"
 
 #: ../../godmode/db/db_purge.php:144
 msgid "Click here to get the data from the agent specified in the select box"
 msgstr ""
+"Clique aqui para ver informações do agente especificado na caixa de seleção"
 
 #: ../../godmode/db/db_purge.php:148
 msgid "Information on agent"
-msgstr ""
+msgstr "Informações sobre o agente"
 
 #: ../../godmode/db/db_purge.php:148 ../../godmode/db/db_purge.php:150
 msgid "in the database"
-msgstr ""
+msgstr "no banco de dados"
 
 #: ../../godmode/db/db_purge.php:150
 msgid "Information on all agents"
-msgstr ""
+msgstr "Informações sobre todos os agentes"
 
 #: ../../godmode/db/db_purge.php:197
 msgid "Packets less than three months old"
-msgstr ""
+msgstr "Pacotes com menos de três meses"
 
 #: ../../godmode/db/db_purge.php:198
 msgid "Packets less than one month old"
-msgstr ""
+msgstr "Pacotes com menos de um mês"
 
 #: ../../godmode/db/db_purge.php:199
 msgid "Packets less than two weeks old"
-msgstr ""
+msgstr "Pacotes com menos de duas semanas"
 
 #: ../../godmode/db/db_purge.php:200
 msgid "Packets less than one week old"
-msgstr ""
+msgstr "Pacotes com menos de uma semana"
 
 #: ../../godmode/db/db_purge.php:201
 msgid "Packets less than three days old"
-msgstr ""
+msgstr "Pacotes com menos de três dias"
 
 #: ../../godmode/db/db_purge.php:202
 msgid "Packets less than one day old"
-msgstr ""
+msgstr "Pacotes com menos de um dia"
 
 #: ../../godmode/db/db_purge.php:203
 msgid "Total number of packets"
-msgstr ""
+msgstr "Número total de pacotes"
 
 #: ../../godmode/db/db_purge.php:208 ../../godmode/db/db_audit.php:91
 #: ../../godmode/db/db_event.php:67
@@ -4019,19 +4166,19 @@ msgstr "Apagar dados"
 
 #: ../../godmode/db/db_purge.php:212
 msgid "Purge data over 3 months"
-msgstr ""
+msgstr "Remover dados com mais de 3 meses"
 
 #: ../../godmode/db/db_purge.php:213
 msgid "Purge data over 1 month"
-msgstr ""
+msgstr "Remover dados com mais de 1 mês"
 
 #: ../../godmode/db/db_purge.php:214
 msgid "Purge data over 2 weeks"
-msgstr ""
+msgstr "Remover dados com mais de 2 semanas"
 
 #: ../../godmode/db/db_purge.php:215
 msgid "Purge data over 1 week"
-msgstr ""
+msgstr "Remover dados com mais de 1 semana"
 
 #: ../../godmode/db/db_purge.php:216
 msgid "Purge data over 3 days"
@@ -4043,7 +4190,7 @@ msgstr "Apagar os dados com mais de um dia"
 
 #: ../../godmode/db/db_purge.php:218
 msgid "All data until now"
-msgstr ""
+msgstr "Todos os dados até o momento"
 
 #: ../../godmode/db/db_purge.php:221 ../../godmode/db/db_audit.php:106
 #: ../../godmode/db/db_event.php:86
@@ -4056,11 +4203,11 @@ msgstr "Configuração atual da Base de Dados"
 
 #: ../../godmode/db/db_main.php:43
 msgid "Max. time before compact data"
-msgstr ""
+msgstr "Tempo máximo antes de compactar dados"
 
 #: ../../godmode/db/db_main.php:44
 msgid "Max. time before purge"
-msgstr ""
+msgstr "Tempo máximo antes de remover"
 
 #: ../../godmode/db/db_main.php:48
 msgid ""
@@ -4123,43 +4270,44 @@ msgstr "Apagar os dados de auditoria exceto o último dia"
 msgid "Purge all audit data"
 msgstr "Apagar todos os dados de auditoria"
 
-#: ../../godmode/db/db_refine.php:35
-msgid "Delete Data"
-msgstr "Apagar dados"
+#: ../../godmode/db/db_refine.php:41 ../../godmode/db/db_refine.php:46
+#: ../../include/functions.php:1046
+msgid "Error"
+msgstr "Erro"
 
 #: ../../godmode/db/db_refine.php:41
-msgid "Maximum equal to minimum"
-msgstr "Máximo igual ao mínimo"
+msgid "Maximum is equal to minimum"
+msgstr "O máximo é igual ao mínimo"
 
-#: ../../godmode/db/db_refine.php:48
-msgid "No modules has been selected"
-msgstr "Não foram selecionados módulos"
-
-#: ../../godmode/db/db_refine.php:60
+#: ../../godmode/db/db_refine.php:55
 msgid "Filtering data module"
 msgstr "Filtrando módulo de dados"
 
-#: ../../godmode/db/db_refine.php:104
-msgid "Purge data out these limits"
-msgstr "Apagar dados fora destes limites"
+#: ../../godmode/db/db_refine.php:60
+msgid "Filtering completed"
+msgstr "Filtragem completa"
 
-#: ../../godmode/db/db_refine.php:106
-#: ../../include/functions_reporting.php:546
+#: ../../godmode/db/db_refine.php:85
+msgid "Purge data out of these limits"
+msgstr "Remover dados fora destes limites"
+
+#: ../../godmode/db/db_refine.php:86 ../../godmode/db/db_refine.php:87
+#: ../../include/functions_reporting.php:548
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../../godmode/db/db_refine.php:107
-#: ../../include/functions_reporting.php:547
+#: ../../godmode/db/db_refine.php:89 ../../godmode/db/db_refine.php:90
+#: ../../include/functions_reporting.php:549
 msgid "Maximum"
 msgstr "Máximo"
 
 #: ../../godmode/db/db_event.php:38
 msgid "Successfully deleted old events"
-msgstr ""
+msgstr "Eventos antigos removidos com sucesso"
 
 #: ../../godmode/db/db_event.php:40
 msgid "Error deleting old events"
-msgstr ""
+msgstr "Erro removendo eventos antigos"
 
 #: ../../godmode/db/db_event.php:45
 msgid "Event Database cleanup"
@@ -4167,7 +4315,7 @@ msgstr "Limpeza da Base de Dados de eventos"
 
 #: ../../godmode/db/db_event.php:61
 msgid "Latest data"
-msgstr ""
+msgstr "Dados mais recentes"
 
 #: ../../godmode/db/db_event.php:75
 msgid "Purge event data over 90 days"
@@ -4197,150 +4345,335 @@ msgstr "Apagar os dados de eventos, exceto as últimas 24 horas"
 msgid "Purge all event data"
 msgstr "Apagar todos os dados de eventos"
 
-#: ../../godmode/alerts/modify_alert.php:81
-#: ../../godmode/alerts/configure_alert.php:58
-msgid "Alert configuration"
-msgstr "Configuração de alertas"
+#: ../../godmode/alerts/configure_alert_command.php:44
+msgid "Configure alert command"
+msgstr ""
 
-#: ../../godmode/alerts/modify_alert.php:82
-msgid "Alerts defined in Pandora"
-msgstr "Alertas definidos no Pandora"
+#: ../../godmode/alerts/configure_alert_command.php:54
+#: ../../godmode/alerts/configure_alert_action.php:59
+#: ../../godmode/alerts/configure_alert.php:84
+msgid "Command"
+msgstr "Comando"
 
-#: ../../godmode/alerts/modify_alert.php:84
-#: ../../godmode/alerts/configure_alert.php:79
-msgid "Alert name"
-msgstr "Nome do alerta"
+#: ../../godmode/alerts/configure_alert_action.php:48
+msgid "Configure alert action"
+msgstr ""
+
+#: ../../godmode/alerts/configure_alert_action.php:63
+#: ../../godmode/alerts/configure_alert_template.php:348
+msgid "Field 1"
+msgstr "Campo 1"
+
+#: ../../godmode/alerts/configure_alert_action.php:66
+#: ../../godmode/alerts/configure_alert_template.php:351
+#: ../../godmode/alerts/configure_alert_template.php:373
+msgid "Field 2"
+msgstr "Campo 2"
+
+#: ../../godmode/alerts/configure_alert_action.php:69
+#: ../../godmode/alerts/configure_alert_template.php:354
+#: ../../godmode/alerts/configure_alert_template.php:377
+msgid "Field 3"
+msgstr "Campo 3"
+
+#: ../../godmode/alerts/configure_alert_action.php:72
+#: ../../godmode/alerts/configure_alert_template.php:357
+msgid "Command preview"
+msgstr "Pré-visualização do comando"
+
+#: ../../godmode/alerts/alert_templates.php:49
+#: ../../godmode/alerts/configure_alert_template.php:419
+#: ../../operation/snmpconsole/snmp_view.php:208
+msgid "Value"
+msgstr "Valor"
+
+#: ../../godmode/alerts/alert_templates.php:51
+msgid "Empty"
+msgstr "Vazio"
+
+#: ../../godmode/alerts/alert_templates.php:84
+msgid "Everyday"
+msgstr ""
+
+#: ../../godmode/alerts/alert_templates.php:86
+#: ../../operation/agentes/exportdata.php:54
+msgid "Monday"
+msgstr "Segunda-feira"
+
+#: ../../godmode/alerts/alert_templates.php:87
+#: ../../operation/agentes/exportdata.php:54
+msgid "Tuesday"
+msgstr "Terça-feira"
+
+#: ../../godmode/alerts/alert_templates.php:88
+#: ../../operation/agentes/exportdata.php:54
+msgid "Wednesday"
+msgstr "Quarta-feira"
+
+#: ../../godmode/alerts/alert_templates.php:89
+msgid "Thursday"
+msgstr "Quinta-feira"
+
+#: ../../godmode/alerts/alert_templates.php:90
+#: ../../operation/agentes/exportdata.php:54
+msgid "Friday"
+msgstr "Sábado"
+
+#: ../../godmode/alerts/alert_templates.php:91
+#: ../../operation/agentes/exportdata.php:54
+msgid "Saturday"
+msgstr "Domingo"
+
+#: ../../godmode/alerts/alert_templates.php:92
+#: ../../operation/agentes/exportdata.php:54
+msgid "Sunday"
+msgstr "Domingo"
+
+#: ../../godmode/alerts/alert_templates.php:94
+#: ../../include/functions_db.php:1980
+msgid "Days"
+msgstr "Dias"
+
+#: ../../godmode/alerts/alert_templates.php:94
+msgid "Every"
+msgstr "Todos"
+
+#: ../../godmode/alerts/alert_templates.php:104
+msgid "and"
+msgstr "e"
+
+#: ../../godmode/alerts/alert_templates.php:126
+msgid "Alert templates"
+msgstr "Modelos de alerta"
+
+#: ../../godmode/alerts/alert_templates.php:142
+#: ../../godmode/alerts/configure_alert_template.php:228
+#: ../../godmode/alerts/alert_actions.php:79
+#: ../../godmode/alerts/alert_commands.php:74
+msgid "Successfully updated"
+msgstr "Atualizado com sucesso"
+
+#: ../../godmode/alerts/alert_templates.php:143
+#: ../../godmode/alerts/configure_alert_template.php:229
+#: ../../godmode/alerts/alert_actions.php:80
+#: ../../godmode/alerts/alert_commands.php:75
+msgid "Could not be updated"
+msgstr "Não pode ser atualizado"
+
+#: ../../godmode/alerts/alert_templates.php:158
+#: ../../godmode/alerts/alert_actions.php:88
+#: ../../godmode/alerts/alert_commands.php:91
+msgid "Successfully deleted"
+msgstr "Removido com sucesso"
+
+#: ../../godmode/alerts/alert_templates.php:159
+#: ../../godmode/alerts/alert_actions.php:89
+#: ../../godmode/alerts/alert_commands.php:92
+msgid "Could not be deleted"
+msgstr "Não pode ser removido"
+
+#: ../../godmode/alerts/configure_alert_template.php:40
+#: ../../godmode/alerts/configure_alert_template.php:43
+#: ../../godmode/alerts/configure_alert_template.php:55
+#: ../../godmode/alerts/configure_alert_template.php:58
+#: ../../godmode/alerts/configure_alert_template.php:70
+#: ../../godmode/alerts/configure_alert_template.php:73
+msgid "Step"
+msgstr "Passo"
+
+#: ../../godmode/alerts/configure_alert_template.php:40
+#: ../../godmode/alerts/configure_alert_template.php:43
+msgid "Conditions"
+msgstr "Condições"
+
+#: ../../godmode/alerts/configure_alert_template.php:55
+#: ../../godmode/alerts/configure_alert_template.php:58
+#: ../../include/functions_db.php:1974
+msgid "Firing"
+msgstr "Disparando"
+
+#: ../../godmode/alerts/configure_alert_template.php:70
+#: ../../godmode/alerts/configure_alert_template.php:73
+#: ../../include/functions.php:790 ../../include/functions.php:849
+#: ../../include/functions_db.php:1978
+msgid "Recovery"
+msgstr "Recuperação"
+
+#: ../../godmode/alerts/configure_alert_template.php:265
+msgid "Configure alert template"
+msgstr "Configurar outro model"
+
+#: ../../godmode/alerts/configure_alert_template.php:343
+msgid "Default action"
+msgstr "Ação Padrão"
+
+#: ../../godmode/alerts/configure_alert_template.php:415
+msgid "Condition type"
+msgstr "Tipo da condição"
+
+#: ../../godmode/alerts/configure_alert_template.php:417
+msgid "Select"
+msgstr "Selecionar"
+
+#: ../../godmode/alerts/configure_alert_template.php:426
+msgid "The regular expression is valid"
+msgstr "A expressão regular é válida"
+
+#: ../../godmode/alerts/configure_alert_template.php:430
+msgid "The regular expression is not valid"
+msgstr "A expressão regular é inválida"
+
+#: ../../godmode/alerts/configure_alert_template.php:457
+msgid "Finish"
+msgstr "Finalizar"
+
+#: ../../godmode/alerts/configure_alert_template.php:460
+msgid "Next"
+msgstr "Próximo"
+
+#: ../../godmode/alerts/alert_actions.php:44
+msgid "Alert actions"
+msgstr "Ações dos alertas"
 
 #: ../../godmode/alerts/configure_alert.php:46
 msgid "There was a problem loading alert"
 msgstr "Houve um erro ao carregar a configuração do alerta"
 
+#: ../../godmode/alerts/configure_alert.php:58
+msgid "Alert configuration"
+msgstr "Configuração de alertas"
+
 #: ../../godmode/alerts/configure_alert.php:63
 msgid "Modify alert"
 msgstr "Modificar alerta"
 
-#: ../../godmode/alerts/configure_alert.php:84
-msgid "Command"
-msgstr "Comando"
+#: ../../godmode/alerts/configure_alert.php:79
+msgid "Alert name"
+msgstr "Nome do alerta"
 
-#: ../../include/functions_html.php:732
-msgid "Request successfully processed"
-msgstr ""
+#: ../../godmode/alerts/alert_commands.php:42
+msgid "Alert commands"
+msgstr "Comandos dos alertas"
 
-#: ../../include/functions_html.php:735
-msgid "Error processing request"
-msgstr ""
-
-#: ../../include/functions_incidents.php:81
+#: ../../include/functions_incidents.php:79
 msgid "Active incidents"
 msgstr "Incidentes ativos"
 
-#: ../../include/functions_incidents.php:82
+#: ../../include/functions_incidents.php:80
 msgid "Active incidents, with comments"
 msgstr "Incidentes ativos, com comentários"
 
-#: ../../include/functions_incidents.php:83
+#: ../../include/functions_incidents.php:81
 msgid "Rejected incidents"
 msgstr "Incidentes rejeitados"
 
-#: ../../include/functions_incidents.php:84
+#: ../../include/functions_incidents.php:82
 msgid "Expired incidents"
 msgstr "Incidentes expirados"
 
-#: ../../include/functions_incidents.php:85
+#: ../../include/functions_incidents.php:83
 msgid "Closed incidents"
 msgstr "Incidentes fechados"
 
-#: ../../include/functions_events.php:160
-#: ../../operation/events/events.php:387
+#: ../../include/functions_events.php:177
+#: ../../operation/events/events.php:415
 msgid "No events"
-msgstr ""
+msgstr "Nenhum evento"
 
-#: ../../include/functions_events.php:170
+#: ../../include/functions_events.php:187
 msgid "Latest events"
-msgstr ""
+msgstr "Eventos mais recentes"
 
-#: ../../include/functions_events.php:178
+#: ../../include/functions_events.php:195
 msgid "St"
 msgstr ""
 
-#: ../../include/functions_events.php:185
-#: ../../include/functions_reporting.php:304
-#: ../../operation/events/events.php:241
+#: ../../include/functions_events.php:202
+#: ../../include/functions_reporting.php:299
+#: ../../operation/events/events.php:259
 msgid "Event name"
 msgstr "Nome do evento"
 
-#: ../../include/functions_events.php:213 ../../include/functions.php:1052
+#: ../../include/functions_events.php:230 ../../include/functions.php:1041
 msgid "Alert recovered"
-msgstr ""
+msgstr "Recuperação de alerta"
 
-#: ../../include/functions_events.php:216
+#: ../../include/functions_events.php:233
 msgid "Alert manually validated"
-msgstr ""
+msgstr "Alerta validado manualmente"
 
-#: ../../include/functions_events.php:219 ../../include/functions.php:1049
+#: ../../include/functions_events.php:236 ../../include/functions.php:1038
 #: ../../operation/agentes/status_monitor.php:209
 #: ../../operation/agentes/status_monitor.php:229
 msgid "Monitor up"
-msgstr ""
+msgstr "Monitor ativo"
 
-#: ../../include/functions_events.php:222 ../../include/functions.php:1050
+#: ../../include/functions_events.php:239 ../../include/functions.php:1039
 #: ../../operation/agentes/status_monitor.php:211
 #: ../../operation/agentes/status_monitor.php:229
 msgid "Monitor down"
-msgstr ""
+msgstr "Monitor inativo"
 
-#: ../../include/functions_events.php:225 ../../include/functions.php:892
-#: ../../include/functions.php:1051 ../../include/functions_db.php:1950
+#: ../../include/functions_events.php:242 ../../include/functions.php:877
+#: ../../include/functions.php:1040 ../../include/functions_db.php:2063
 #: ../../operation/snmpconsole/snmp_view.php:335
 #: ../../operation/agentes/bulbs.php:29
-#: ../../operation/agentes/estado_agente.php:318
-#: ../../operation/agentes/estado_alertas.php:141
-#: ../../operation/agentes/estado_alertas.php:188
+#: ../../operation/agentes/estado_agente.php:306
+#: ../../operation/agentes/estado_alertas.php:105
 msgid "Alert fired"
 msgstr "Alerta disparado"
 
-#: ../../include/functions_events.php:228
-#: ../../include/functions_events.php:251 ../../include/functions.php:1056
-#: ../../operation/events/events.php:158 ../../operation/events/events.php:296
-#: ../../operation/events/events.php:320
-msgid "System"
-msgstr ""
-
-#: ../../include/functions_events.php:231
+#: ../../include/functions_events.php:248
 msgid "Host detected by recon server"
-msgstr ""
+msgstr "Servidor detectado pelo sevidor de reconhecimento"
 
-#: ../../include/functions_visual_map.php:139
+#: ../../include/functions_events.php:270
+#: ../../operation/snmpconsole/snmp_view.php:156
+#: ../../operation/snmpconsole/snmp_view.php:221
+#: ../../operation/snmpconsole/snmp_view.php:384
+#: ../../operation/events/events.php:356
+msgid "Alert"
+msgstr "Alerta"
+
+#: ../../include/functions_visual_map.php:150
 msgid "Static graph"
 msgstr "Imagem estática"
 
-#: ../../include/functions_visual_map.php:140
+#: ../../include/functions_visual_map.php:151
 #: ../../enterprise/include/functions_reporting_pdf.php:127
 msgid "Module graph"
 msgstr "Gráfico do módulo"
 
-#: ../../include/functions.php:184
-msgid "You don't have access"
-msgstr "Não tem acesso"
+#: ../../include/functions_alerts.php:240
+msgid "Regular expression"
+msgstr "Expressão regular"
 
-#: ../../include/functions.php:188
-msgid "You don't have enough permission to access this resource"
-msgstr "Não tem permissão necessária para acessar este recurso"
+#: ../../include/functions_alerts.php:241
+msgid "Max and min"
+msgstr "Máx e min"
 
-#: ../../include/functions.php:202 ../../include/functions.php:206
-msgid "Unmanaged error"
-msgstr ""
+#: ../../include/functions_alerts.php:244
+msgid "Equal to"
+msgstr "Igual a"
 
-#: ../../include/functions.php:382
-msgid "."
-msgstr ""
+#: ../../include/functions_alerts.php:245
+msgid "Not equal to"
+msgstr "Não igual a"
 
-#: ../../include/functions.php:384
-msgid ","
-msgstr ""
+#: ../../include/functions_alerts.php:253 ../../include/functions.php:926
+#: ../../include/functions.php:1037 ../../include/functions_db.php:1195
+#: ../../enterprise/extensions/cron/functions.php:42
+#: ../../enterprise/include/functions_reporting_pdf.php:187
+#: ../../operation/reporting/reporting_viewer.php:225
+#: ../../operation/reporting/reporting_xml.php:212
+msgid "Unknown"
+msgstr "Desconhecido"
 
-#: ../../include/functions.php:456 ../../include/functions.php:458
+#: ../../include/functions_alerts.php:501
+#: ../../include/functions_alerts.php:502
+#: ../../include/functions_alerts.php:503
+#: ../../include/functions_alerts.php:504 ../../include/functions.php:498
+#: ../../include/functions.php:500
 #: ../../operation/visual_console/render_view.php:78
 #: ../../operation/visual_console/render_view.php:79
 #: ../../operation/visual_console/render_view.php:80
@@ -4349,532 +4682,545 @@ msgstr ""
 msgid "minutes"
 msgstr "minutos"
 
-#: ../../include/functions.php:468 ../../include/functions.php:470
+#: ../../include/functions.php:194
+msgid "You don't have access"
+msgstr "Não tem acesso"
+
+#: ../../include/functions.php:198
+msgid "You don't have enough permission to access this resource"
+msgstr "Não tem permissão necessária para acessar este recurso"
+
+#: ../../include/functions.php:214 ../../include/functions.php:218
+msgid "Unmanaged error"
+msgstr "Erro não gerenciado"
+
+#: ../../include/functions.php:402
+msgid "."
+msgstr "."
+
+#: ../../include/functions.php:404
+msgid ","
+msgstr ","
+
+#: ../../include/functions.php:510 ../../include/functions.php:512
 msgid "months"
 msgstr "meses"
 
-#: ../../include/functions.php:765 ../../include/functions.php:847
-#: ../../include/functions_db.php:1865
-msgid "Recovery"
-msgstr ""
-
-#: ../../include/functions.php:769 ../../include/functions.php:851
+#: ../../include/functions.php:794
 msgid "Alert Ctrl."
-msgstr ""
+msgstr "Controle de Alerta"
 
-#: ../../include/functions.php:771 ../../include/functions.php:853
+#: ../../include/functions.php:796 ../../include/functions.php:860
 msgid "Firing days"
+msgstr "Dias para disparo"
+
+#: ../../include/functions.php:853
+msgid "Fires every"
+msgstr "Disparar toda"
+
+#: ../../include/functions.php:862
+msgid "Firing times"
+msgstr "Horas para disparo"
+
+#: ../../include/functions.php:877
+msgid "times"
 msgstr ""
 
-#: ../../include/functions.php:901 ../../include/functions_db.php:1952
+#: ../../include/functions.php:880
+#: ../../operation/agentes/estado_alertas.php:107
+msgid "Alert disabled"
+msgstr "Alerta desativado"
+
+#: ../../include/functions.php:883 ../../include/functions_db.php:2065
 #: ../../operation/snmpconsole/snmp_view.php:337
 #: ../../operation/agentes/bulbs.php:37
-#: ../../operation/agentes/estado_agente.php:320
-#: ../../operation/agentes/estado_alertas.php:142
-#: ../../operation/agentes/estado_alertas.php:190
+#: ../../operation/agentes/estado_agente.php:308
+#: ../../operation/agentes/estado_alertas.php:106
 msgid "Alert not fired"
 msgstr "Alerta não disparado"
 
-#: ../../include/functions.php:912
-#: ../../operation/reporting/reporting_viewer.php:148
+#: ../../include/functions.php:899
+#: ../../operation/reporting/reporting_viewer.php:147
 #: ../../operation/reporting/reporting_xml.php:169
 msgid "Simple graph"
 msgstr "Gráfico simples"
 
-#: ../../include/functions.php:913
+#: ../../include/functions.php:900
 #: ../../enterprise/include/functions_reporting_pdf.php:151
-#: ../../operation/reporting/reporting_viewer.php:162
+#: ../../operation/reporting/reporting_viewer.php:161
 #: ../../operation/reporting/reporting_xml.php:175
 msgid "Custom graph"
 msgstr "Gráfico customizado"
 
-#: ../../include/functions.php:914
+#: ../../include/functions.php:901
 #: ../../enterprise/include/functions_reporting_pdf.php:164
-#: ../../operation/reporting/reporting_viewer.php:193
+#: ../../operation/reporting/reporting_viewer.php:192
 #: ../../operation/reporting/reporting_xml.php:193
-#: ../../operation/agentes/ver_agente.php:235
+#: ../../operation/agentes/ver_agente.php:223
 #: ../../operation/agentes/sla_view.php:47
 #: ../../operation/agentes/sla_view.php:148
 msgid "S.L.A"
 msgstr "S.L.A."
 
-#: ../../include/functions.php:915
+#: ../../include/functions.php:902
 #: ../../enterprise/include/functions_reporting_pdf.php:215
-#: ../../operation/reporting/reporting_viewer.php:257
+#: ../../operation/reporting/reporting_viewer.php:256
 #: ../../operation/reporting/reporting_xml.php:225
 msgid "Event report"
 msgstr "Relatório de eventos"
 
-#: ../../include/functions.php:916
+#: ../../include/functions.php:903
 #: ../../enterprise/include/functions_reporting_pdf.php:226
-#: ../../operation/reporting/reporting_viewer.php:273
+#: ../../operation/reporting/reporting_viewer.php:272
 #: ../../operation/reporting/reporting_xml.php:233
 msgid "Alert report"
 msgstr "Relatório de alertas"
 
-#: ../../include/functions.php:917
+#: ../../include/functions.php:904
 #: ../../enterprise/include/functions_reporting_pdf.php:249
-#: ../../operation/reporting/reporting_viewer.php:287
+#: ../../operation/reporting/reporting_viewer.php:286
 #: ../../operation/reporting/reporting_xml.php:240
 msgid "Monitor report"
 msgstr "Relatório de monitores"
 
-#: ../../include/functions.php:921
+#: ../../include/functions.php:908
 #: ../../enterprise/include/functions_reporting_pdf.php:285
-#: ../../operation/reporting/reporting_viewer.php:350
+#: ../../operation/reporting/reporting_viewer.php:349
 #: ../../operation/reporting/reporting_xml.php:262
 msgid "Sumatory"
 msgstr ""
 
-#: ../../include/functions.php:922
+#: ../../include/functions.php:909
 msgid "General group report"
-msgstr ""
+msgstr "Relatório geral do grupo"
 
-#: ../../include/functions.php:924
+#: ../../include/functions.php:911
 #: ../../enterprise/include/functions_reporting_pdf.php:324
-#: ../../operation/reporting/reporting_viewer.php:392
+#: ../../operation/reporting/reporting_viewer.php:391
 #: ../../operation/reporting/reporting_xml.php:281
 msgid "Agents detailed view"
-msgstr ""
+msgstr "Visualização detalhada de agentes"
 
-#: ../../include/functions.php:939 ../../include/functions.php:1048
-#: ../../include/functions_db.php:1135
-#: ../../enterprise/extensions/cron/functions.php:42
-#: ../../enterprise/include/functions_reporting_pdf.php:187
-#: ../../operation/reporting/reporting_viewer.php:226
-#: ../../operation/reporting/reporting_xml.php:212
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../../include/functions.php:1053
+#: ../../include/functions.php:1042
 msgid "Alert ceased"
-msgstr ""
+msgstr "Alerta terminado"
 
-#: ../../include/functions.php:1054
+#: ../../include/functions.php:1043
 msgid "Alert manual validation"
-msgstr ""
+msgstr "Validação manual de alerta"
 
-#: ../../include/functions.php:1055
+#: ../../include/functions.php:1044
 msgid "Recon host detected"
-msgstr ""
+msgstr "Host de reconhecimento detectado"
 
-#: ../../include/functions.php:1057
-msgid "Error"
-msgstr ""
-
-#: ../../include/functions_db.php:1123
+#: ../../include/functions_db.php:1183
 msgid "Software agent data"
 msgstr "Dados do agente de software"
 
-#: ../../include/functions_db.php:1126
+#: ../../include/functions_db.php:1186
 msgid "Software agent monitor"
 msgstr "Monitores do agente de software"
 
-#: ../../include/functions_db.php:1129
+#: ../../include/functions_db.php:1189
 msgid "Network agent data"
 msgstr "Dados do agente de rede"
 
-#: ../../include/functions_db.php:1132
+#: ../../include/functions_db.php:1192
 msgid "Network agent monitor"
 msgstr "Monitores do agente de rede"
 
-#: ../../include/functions_db.php:1744
+#: ../../include/functions_db.php:1856
 msgid "Wrong module type"
-msgstr ""
+msgstr "Tipo inválido de módulo"
 
-#: ../../include/functions_db.php:1860
+#: ../../include/functions_db.php:1973
 msgid "Tt"
 msgstr ""
 
-#: ../../include/functions_db.php:1861
-msgid "Firing"
-msgstr ""
-
-#: ../../include/functions_db.php:1864
+#: ../../include/functions_db.php:1977
 msgid "Desc"
-msgstr ""
+msgstr "Desc"
 
-#: ../../include/functions_db.php:1866
+#: ../../include/functions_db.php:1979
 msgid "MinMax.Al"
 msgstr ""
 
-#: ../../include/functions_db.php:1867
-msgid "Days"
-msgstr ""
-
-#: ../../include/functions_db.php:1868
+#: ../../include/functions_db.php:1981
 #: ../../operation/snmpconsole/snmp_view.php:385
 msgid "Fired"
-msgstr ""
+msgstr "Disparado"
 
-#: ../../include/functions_reporting.php:353
+#: ../../include/functions_reporting.php:349
 msgid "Alert description"
-msgstr ""
+msgstr "Descrição do alerta"
 
-#: ../../include/functions_reporting.php:354
-#: ../../include/functions_reporting.php:550
-#: ../../operation/agentes/estado_alertas.php:65
-#: ../../operation/agentes/estado_alertas.php:165
+#: ../../include/functions_reporting.php:350
+#: ../../include/functions_reporting.php:552
 msgid "Times Fired"
 msgstr "Número de vezes lançada"
 
-#: ../../include/functions_reporting.php:398
+#: ../../include/functions_reporting.php:396
 #: ../../enterprise/include/functions_reporting_pdf.php:236
 msgid "Total alerts monitored"
-msgstr ""
+msgstr "Total de alertas monitorados"
 
 #: ../../include/functions_reporting.php:445
 #: ../../enterprise/include/functions_reporting_pdf.php:311
 msgid "Total monitors"
-msgstr ""
+msgstr "Total de monitores"
 
 #: ../../include/functions_reporting.php:446
 #: ../../enterprise/include/functions_reporting_pdf.php:312
 msgid "Monitors down on period"
-msgstr ""
+msgstr "Monitores indisponíveis no período"
 
 #: ../../include/functions_reporting.php:481
-#: ../../include/functions_reporting.php:585
+#: ../../include/functions_reporting.php:587
 msgid "Monitor"
-msgstr ""
+msgstr "Monitor"
 
-#: ../../include/functions_reporting.php:524
+#: ../../include/functions_reporting.php:526
 #: ../../enterprise/include/functions_reporting_pdf.php:293
 msgid "Agents in group"
-msgstr ""
+msgstr "Agentes no grupo"
 
-#: ../../include/functions_reporting.php:586
+#: ../../include/functions_reporting.php:588
 msgid "Last failure"
-msgstr ""
+msgstr "Última falha"
 
-#: ../../include/functions_reporting.php:679
+#: ../../include/functions_reporting.php:683
 #: ../../enterprise/include/functions_reporting_pdf.php:342
-#: ../../operation/agentes/estado_grupo.php:218
 msgid "Monitors"
 msgstr "Monitores"
 
+#: ../../include/functions_ui.php:37
+msgid "Request successfully processed"
+msgstr "Requisição processada com sucesso"
+
+#: ../../include/functions_ui.php:40
+msgid "Error processing request"
+msgstr "Erro processando a requisição"
+
 #: ../../enterprise/extensions/cron.php:43
 msgid "Send custom report by email"
-msgstr ""
+msgstr "Enviar relatório customizado por email"
 
 #: ../../enterprise/extensions/cron.php:55
 msgid "Cron jobs"
-msgstr ""
+msgstr "Tarefas agendadas"
 
 #: ../../enterprise/extensions/cron/functions.php:13
 msgid "Not scheduled"
-msgstr ""
+msgstr "Não agendado"
 
 #: ../../enterprise/extensions/cron/functions.php:14
 msgid "Hourly"
-msgstr ""
+msgstr "De hora em hora"
 
 #: ../../enterprise/extensions/cron/functions.php:15
 msgid "Daily"
-msgstr ""
+msgstr "Diariamente"
 
 #: ../../enterprise/extensions/cron/functions.php:16
 msgid "Weekly"
-msgstr ""
+msgstr "Semanalmente"
 
 #: ../../enterprise/extensions/cron/functions.php:17
 msgid "Monthly"
-msgstr ""
+msgstr "Mensalmente"
 
 #: ../../enterprise/extensions/cron/functions.php:18
 msgid "Yearly"
-msgstr ""
+msgstr "Anualmente"
 
 #: ../../enterprise/extensions/cron/functions.php:128
 msgid "Report"
-msgstr ""
+msgstr "Relatório"
 
 #: ../../enterprise/extensions/cron/functions.php:129
 msgid "This is the automatic generated report"
-msgstr ""
+msgstr "Esse é o relatório gerado automaticamente"
 
 #: ../../enterprise/extensions/cron/functions.php:132
 msgid "Open the attached file to view it"
-msgstr ""
+msgstr "Abra o arquivo anexado para visualizá-lo"
 
 #: ../../enterprise/extensions/cron/functions.php:134
 msgid "Generated at"
-msgstr ""
+msgstr "Gerado em"
 
 #: ../../enterprise/extensions/cron/functions.php:138
 msgid "Please do not answer or reply to this email"
-msgstr ""
+msgstr "Favor não responder este email"
 
 #: ../../enterprise/extensions/cron/main.php:55
 msgid "Cron extension is not running"
-msgstr ""
+msgstr "A extensão do cron não está em execução"
 
 #: ../../enterprise/extensions/cron/main.php:56
 msgid "Cron extension has never run or it's not configured well"
 msgstr ""
+"A extensão do cron nunca foi executada ou não está configurada adequadamente"
 
 #: ../../enterprise/extensions/cron/main.php:57
 msgid ""
 "This extension relies on a proper setup of cron, the time-based scheduling "
 "service"
 msgstr ""
+"Essa extensão depende de uma configuração adequada no cron, o agendador de "
+"tarefas"
 
 #: ../../enterprise/extensions/cron/main.php:59
 msgid "Please, add the following line to your crontab file"
-msgstr ""
+msgstr "Por favor, adicione a seguinte linha no seu arquivo crontab"
 
 #: ../../enterprise/extensions/cron/main.php:65
 msgid "Last execution"
-msgstr ""
+msgstr "Última execução"
 
 #: ../../enterprise/extensions/cron/main.php:71
 msgid "Cron extension is running"
-msgstr ""
+msgstr "A extensão do cron está rodando"
 
 #: ../../enterprise/extensions/cron/main.php:80
 msgid "Scheduled jobs"
-msgstr ""
+msgstr "Tarefas agendadas"
 
 #: ../../enterprise/extensions/cron/main.php:86
 #: ../../enterprise/extensions/cron/main.php:125
 msgid "Task"
-msgstr ""
+msgstr "Tarefa"
 
 #: ../../enterprise/extensions/cron/main.php:87
 #: ../../enterprise/extensions/cron/main.php:128
 msgid "Scheduled"
-msgstr ""
+msgstr "Agendado"
 
 #: ../../enterprise/extensions/cron/main.php:88
 msgid "Last run"
-msgstr ""
+msgstr "Última execução"
 
 #: ../../enterprise/extensions/cron/main.php:97
 msgid "Force run"
-msgstr ""
+msgstr "Forçar execução"
 
 #: ../../enterprise/extensions/cron/main.php:113
 msgid "Add new job"
-msgstr ""
+msgstr "Adicionar nova tarefa"
 
 #: ../../enterprise/extensions/cron/main.php:131
 msgid "Parameters"
-msgstr ""
+msgstr "Parâmetros"
 
-#: ../../enterprise/godmode/menu.php:16
+#: ../../enterprise/godmode/menu.php:11
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:49
 msgid "Inventory modules"
-msgstr ""
+msgstr "Módulos de inventário"
 
-#: ../../enterprise/godmode/menu.php:28
+#: ../../enterprise/godmode/menu.php:17
 msgid "SNMP trap editor"
-msgstr ""
+msgstr "Editor de trap SNMP"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:49
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:145
 msgid "SNMP Trap Editor"
-msgstr ""
+msgstr "Editor de trap SNMP"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:68
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:175
 #: ../../operation/snmpconsole/snmp_view.php:173
-#: ../../operation/events/events.php:127
+#: ../../operation/events/events.php:132
 msgid "Severity"
-msgstr ""
+msgstr "Severidade"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:79
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:81
 msgid "update"
-msgstr ""
+msgstr "atualizar"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:82
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:83
 msgid "create"
-msgstr ""
+msgstr "criar"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:59
 msgid "Error parsing MIB"
-msgstr ""
+msgstr "Erro decodificando a MIB"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:112
 msgid "Successfully added trap custom values"
-msgstr ""
+msgstr "Valores customizados adicionados com sucesso à trap"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:114
 msgid "Error adding trap custom values"
-msgstr ""
+msgstr "Erro ao adicionar valores customizados à trap"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:122
 msgid "Successfully updated trap custom values"
-msgstr ""
+msgstr "Valores customizados da trap atualizados com sucesso"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:124
 msgid "Error updating trap custom values"
-msgstr ""
+msgstr "Erro ao atualizar valores customizados da trap"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:131
 msgid "Successfully deleted trap custom values"
-msgstr ""
+msgstr "Valores customizados da trap removidos com sucesso"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:133
 msgid "Error deleting trap custom values"
-msgstr ""
+msgstr "Erro ao remover valores customizados da trap"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:138
 msgid "Unsupported file type"
-msgstr ""
+msgstr "Tipo de arquivo não suportado"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:151
 msgid "Load MIB"
-msgstr ""
+msgstr "Carregar MIB"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:153
 msgid "Upload MIB"
-msgstr ""
-
-#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:178
-#: ../../enterprise/godmode/agentes/inventory_manager.php:164
-msgid "Actions"
-msgstr ""
+msgstr "Subir MIB"
 
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:204
 msgid "There are no trap custom values defined"
-msgstr ""
+msgstr "Não existem valores customizados definidos para trap"
 
 #: ../../enterprise/godmode/setup/setup.php:14
 msgid "Forward SNMP traps to agent (if exist)"
-msgstr ""
+msgstr "Encaminhas traps SNMP para o agente (caso exista)"
 
 #: ../../enterprise/godmode/agentes/configurar_agente.php:18
 #: ../../enterprise/godmode/agentes/inventory_manager.php:37
-#: ../../enterprise/operation/menu.php:19
+#: ../../enterprise/operation/menu.php:12
 #: ../../enterprise/operation/snmpconsole/snmp_view.php:18
 #: ../../enterprise/operation/agentes/configurar_agente.php:18
 #: ../../enterprise/operation/agentes/ver_agente.php:18
 #: ../../enterprise/operation/agentes/agent_inventory.php:28
 #: ../../enterprise/operation/inventory/inventory.php:29
 msgid "Inventory"
-msgstr ""
+msgstr "Inventário"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:45
 msgid "Successfully added inventory module"
-msgstr ""
+msgstr "Módulo de inventário adicionado com sucesso"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:47
 msgid "Error adding inventory module"
-msgstr ""
+msgstr "Erro adicionando módulo de inventário"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:55
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:59
 msgid "Successfully deleted inventory module"
-msgstr ""
+msgstr "Módulo de inventário adicionado com sucesso"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:57
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:61
 msgid "Error deleting inventory module"
-msgstr ""
+msgstr "Erro ao remover módulo de inventário"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:71
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:50
 msgid "Successfully updated inventory module"
-msgstr ""
+msgstr "Módulo de inventário atualizado com sucesso"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:73
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:52
 msgid "Error updating inventory module"
-msgstr ""
+msgstr "Erro atualizado módulo de inventário"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:89
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:35
 msgid "Inventory module error"
-msgstr ""
+msgstr "Erro no módulo de inventário"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:111
 #: ../../enterprise/godmode/agentes/inventory_manager.php:162
 msgid "Target"
-msgstr ""
+msgstr "Destino"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:129
 msgid "Update all"
-msgstr ""
+msgstr "Atualizar todos"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:145
 msgid "Inventory Modules"
-msgstr ""
+msgstr "Módulos de inventário"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:153
 #: ../../enterprise/operation/agentes/agent_inventory.php:35
 msgid "No inventory modules found"
-msgstr ""
+msgstr "Nenhum módulo de inventário encontrado"
 
 #: ../../enterprise/godmode/agentes/agent_manager.php:11
 msgid "Inventory Server"
-msgstr ""
+msgstr "Servidor de inventário"
 
 #: ../../enterprise/godmode/agentes/agent_manager.php:12
 msgid ""
 "You must select an Inventory Server for the Agent, so it can work properly "
 "with this kind of modules"
 msgstr ""
+"Você deve selecionar um servidor de inventário para o agente, de forma que "
+"ele possa trabalhar adequadamente com este tipo de módulos"
 
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:40
 msgid "Successfully created inventory module"
-msgstr ""
+msgstr "Módulo de inventário criado com sucesso"
 
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:42
 msgid "Error creating inventory module"
-msgstr ""
+msgstr "Erro criando módulo de inventário"
 
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:66
 msgid "Module management > Inventory modules"
-msgstr ""
+msgstr "Gerenciamento de módulos > Módulos de inventário"
 
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:81
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:62
 msgid "Interpreter"
-msgstr ""
+msgstr "Interpretador"
 
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:92
 msgid "There are no defined inventory modules"
-msgstr ""
+msgstr "Não existem módulos de inventário definidos"
 
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:65
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:169
-#: ../../operation/reporting/reporting_viewer.php:202
+#: ../../operation/reporting/reporting_viewer.php:201
 #: ../../operation/reporting/reporting_xml.php:197
 msgid "There are no SLAs defined"
-msgstr ""
+msgstr "Não existem SLAs definidos"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:172
-#: ../../operation/agentes/estado_alertas.php:60
+#: ../../operation/agentes/estado_alertas.php:122
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:173
 msgid "SLA result"
-msgstr ""
+msgstr "Resultado do SLA"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:182
-#: ../../operation/reporting/reporting_viewer.php:220
+#: ../../operation/reporting/reporting_viewer.php:219
 msgid "SLA Limit"
-msgstr ""
+msgstr "Limite do SLA"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:201
 msgid "SLA final result: "
-msgstr ""
+msgstr "Resultador final do SLA: "
 
 #: ../../enterprise/include/functions_reporting_pdf.php:203
-#: ../../operation/reporting/reporting_viewer.php:243
-#: ../../operation/agentes/estado_grupo.php:219
+#: ../../operation/reporting/reporting_viewer.php:242
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: ../../enterprise/include/functions_reporting_pdf.php:206
-#: ../../operation/reporting/reporting_viewer.php:245
-#: ../../operation/agentes/estado_grupo.php:221
+#: ../../operation/reporting/reporting_viewer.php:244
 msgid "Fail"
 msgstr "Falhou"
 
@@ -4888,13 +5234,13 @@ msgstr ""
 
 #: ../../enterprise/dashboard/main_dashboard.php:122
 #: ../../operation/snmpconsole/snmp_view.php:170
-#: ../../operation/events/events.php:183
+#: ../../operation/events/events.php:188
 msgid "Default"
-msgstr ""
+msgstr "Padrão"
 
 #: ../../enterprise/dashboard/main_dashboard.php:161
 msgid "Add tab"
-msgstr ""
+msgstr "Adicionar aba"
 
 #: ../../enterprise/dashboard/main_dashboard.php:165
 msgid "Add widget"
@@ -4910,15 +5256,15 @@ msgstr ""
 
 #: ../../enterprise/dashboard/widgets/example.php:16
 msgid "Welcome message to Pandora FMS"
-msgstr ""
+msgstr "Mensagem de boas-vinda do Pandora FMS"
 
 #: ../../enterprise/dashboard/widgets/example.php:20
 msgid "Welcome"
-msgstr ""
+msgstr "Bem-vindo"
 
 #: ../../enterprise/dashboard/widgets/example.php:22
 msgid "Welcome to Pandora FMS"
-msgstr ""
+msgstr "Bem-vindo ao Pandora FMS"
 
 #: ../../enterprise/dashboard/widgets/example.php:23
 msgid ""
@@ -4937,23 +5283,26 @@ msgid ""
 "To delete this message, click on the delete button on top right corner of "
 "this element."
 msgstr ""
+"Para remover esta mensagem, clique no botão remover no canto superior "
+"direito deste elemento"
 
 #: ../../enterprise/dashboard/widgets/example.php:26
 msgid ""
 "To do so, just click on the title and drag and drop it to the desired place."
 msgstr ""
+"Para fazê-lo apenas clieque no título e arraste e solte no local desejado"
 
 #: ../../enterprise/dashboard/widgets/example.php:28
 msgid "Thanks for using Pandora FMS"
-msgstr ""
+msgstr "Obrigado por utilizar o Pandora FMS"
 
 #: ../../enterprise/dashboard/widgets/monitor_health.php:11
 msgid "Show a list of global monitor health"
-msgstr ""
+msgstr "Mostra uma lista global do monitor de saúde"
 
 #: ../../enterprise/dashboard/widgets/monitor_health.php:72
 msgid "of monitors UP"
-msgstr ""
+msgstr "dos monitores ativos"
 
 #: ../../enterprise/dashboard/widgets/monitor_health.php:74
 msgid "of modules with updated data"
@@ -4973,56 +5322,56 @@ msgstr "de alertas não disparados"
 
 #: ../../enterprise/operation/reporting/custom_reporting.php:13
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #: ../../enterprise/operation/agentes/agent_inventory.php:28
 msgid "Pandora Agents "
-msgstr ""
+msgstr "Agentes Pandora "
 
 #: ../../enterprise/operation/inventory/inventory.php:154
 msgid "No relevant data"
-msgstr ""
+msgstr "Nenhum dado relevante"
 
-#: ../../operation/reporting/reporting_viewer.php:112
+#: ../../operation/reporting/reporting_viewer.php:111
 msgid "Invalid date selected"
-msgstr ""
+msgstr "Data inválida selecionada"
 
-#: ../../operation/reporting/reporting_viewer.php:117
+#: ../../operation/reporting/reporting_viewer.php:116
 msgid "Selected date is older than current date"
-msgstr ""
+msgstr "Data selecionada é mais antiga que a data atual"
 
-#: ../../operation/reporting/graph_viewer.php:138
-#: ../../operation/reporting/graph_viewer.php:146
+#: ../../operation/reporting/graph_viewer.php:112
+#: ../../operation/reporting/graph_viewer.php:120
 msgid "Graph defined"
-msgstr ""
+msgstr "Gráfico definido"
 
-#: ../../operation/reporting/graph_viewer.php:147
+#: ../../operation/reporting/graph_viewer.php:121
 msgid "Zoom x1"
-msgstr ""
+msgstr "Ampliar 1x"
 
-#: ../../operation/reporting/graph_viewer.php:148
+#: ../../operation/reporting/graph_viewer.php:122
 msgid "Zoom x2"
-msgstr ""
+msgstr "Ampliar 2x"
 
-#: ../../operation/reporting/graph_viewer.php:149
+#: ../../operation/reporting/graph_viewer.php:123
 msgid "Zoom x3"
-msgstr ""
+msgstr "Ampliar 2x"
 
-#: ../../operation/reporting/graph_viewer.php:159
+#: ../../operation/reporting/graph_viewer.php:133
 msgid "Custom graph viewer"
 msgstr "Visualizador de imagens customizadas"
 
-#: ../../operation/reporting/graph_viewer.php:167
+#: ../../operation/reporting/graph_viewer.php:142
 msgid "Graph name"
 msgstr "Nome do gráfico"
 
 #: ../../operation/reporting/custom_reporting.php:45
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
 #: ../../operation/reporting/custom_reporting.php:46
 msgid "XML"
-msgstr ""
+msgstr "XML"
 
 #: ../../operation/incidents/incident.php:58
 msgid "Incident successfully deleted"
@@ -5034,11 +5383,11 @@ msgstr "Houve um problema ao eliminar o incidente"
 
 #: ../../operation/incidents/incident.php:62
 msgid "Incident successfully owned"
-msgstr ""
+msgstr "Incidente adquirido com sucesso"
 
 #: ../../operation/incidents/incident.php:62
 msgid "There was a problem becoming owner of incident"
-msgstr ""
+msgstr "Houve um problema ao tentar adquirir o incidente"
 
 #: ../../operation/incidents/incident.php:93
 msgid "Incident successfully updated"
@@ -5050,7 +5399,7 @@ msgstr "Houve um problema ao atualizar o incidente"
 
 #: ../../operation/incidents/incident.php:117
 msgid "Error creating incident"
-msgstr ""
+msgstr "Erro ao criar incidente"
 
 #: ../../operation/incidents/incident.php:168
 #: ../../operation/incidents/incident_statistics.php:30
@@ -5066,19 +5415,19 @@ msgstr "Todos os incidentes"
 
 #: ../../operation/incidents/incident.php:198
 msgid "All priorities"
-msgstr ""
+msgstr "Todas as prioridades"
 
 #: ../../operation/incidents/incident.php:219
 msgid "No incidents match your search filter"
-msgstr ""
+msgstr "Nenhum incidente casa com seu filtro de busca"
 
 #: ../../operation/incidents/incident.php:252
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: ../../operation/incidents/incident.php:258
 #: ../../operation/incidents/incident_detail.php:239
-#: ../../operation/events/events.php:246
+#: ../../operation/events/events.php:264
 msgid "Source"
 msgstr "Origem"
 
@@ -5089,21 +5438,21 @@ msgstr "Dono"
 
 #: ../../operation/incidents/incident.php:306
 msgid "Delete incidents"
-msgstr ""
+msgstr "Remover incidentes"
 
 #: ../../operation/incidents/incident.php:307
 msgid "Become owner"
-msgstr ""
+msgstr "Adquirir"
 
 #: ../../operation/incidents/incident.php:317
 #: ../../operation/incidents/incident_detail.php:206
-#: ../../operation/events/events.php:403
+#: ../../operation/events/events.php:432
 msgid "Create incident"
 msgstr "Criar incidente"
 
 #: ../../operation/incidents/incident_statistics.php:30
-#: ../../operation/menu.php:158 ../../operation/menu.php:180
-#: ../../operation/menu.php:224
+#: ../../operation/menu.php:103 ../../operation/menu.php:117
+#: ../../operation/menu.php:144
 msgid "Statistics"
 msgstr "Estatísticas"
 
@@ -5133,7 +5482,7 @@ msgstr "Nota adicionada corretamente"
 
 #: ../../operation/incidents/incident_detail.php:68
 msgid "Error adding note"
-msgstr ""
+msgstr "Erro ao adicionar nota"
 
 #: ../../operation/incidents/incident_detail.php:84
 msgid "Note successfully deleted"
@@ -5141,37 +5490,39 @@ msgstr "Nota eliminada corretamente"
 
 #: ../../operation/incidents/incident_detail.php:84
 msgid "Error deleting note"
-msgstr ""
+msgstr "Erro ao remover nota"
 
 #: ../../operation/incidents/incident_detail.php:100
 msgid "File successfully deleted from database"
-msgstr ""
+msgstr "Arquivo removido do banco de dados com sucesso"
 
 #: ../../operation/incidents/incident_detail.php:100
 msgid "Unable to delete file"
-msgstr ""
+msgstr "Não foi possível remover o arquivo"
 
 #: ../../operation/incidents/incident_detail.php:105
 msgid "No description available"
-msgstr ""
+msgstr "Nenhuma descrição disponível"
 
 #: ../../operation/incidents/incident_detail.php:133
 msgid "File could not be saved due to database error"
-msgstr ""
+msgstr "O arquivo não pode ser salvo devido a um erro no banco de dados"
 
 #: ../../operation/incidents/incident_detail.php:144
 msgid "File uploaded"
-msgstr ""
+msgstr "Arquivo carregado"
 
 #: ../../operation/incidents/incident_detail.php:144
 msgid ""
 "File could not be saved. Contact the Pandora Administrator for more "
 "information"
 msgstr ""
+"O arquivo não pode ser salvo. Entre em contato com um administrador do "
+"Pandora para mais informações"
 
 #: ../../operation/incidents/incident_detail.php:203
 msgid "Incident details"
-msgstr ""
+msgstr "Detalhes do incidente"
 
 #: ../../operation/incidents/incident_detail.php:220
 msgid "Opened at"
@@ -5184,7 +5535,7 @@ msgstr "Atualizado em"
 
 #: ../../operation/incidents/incident_detail.php:273
 msgid "Creator"
-msgstr ""
+msgstr "Criador"
 
 #: ../../operation/incidents/incident_detail.php:291
 msgid "Update incident"
@@ -5192,7 +5543,7 @@ msgstr "Atualizar incidente"
 
 #: ../../operation/incidents/incident_detail.php:295
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: ../../operation/incidents/incident_detail.php:306
 msgid "Add note"
@@ -5217,7 +5568,7 @@ msgstr "Arquivos anexos"
 
 #: ../../operation/incidents/incident_detail.php:396
 msgid "Add attachment"
-msgstr ""
+msgstr "Adicionar anexo"
 
 #: ../../operation/incidents/incident_detail.php:402
 msgid "Upload"
@@ -5229,17 +5580,19 @@ msgstr "Selecione um critério de busca"
 
 #: ../../operation/incidents/incident_search.php:35
 msgid "Created by:"
-msgstr ""
+msgstr "Criado por:"
 
 #: ../../operation/incidents/incident_search.php:39
 msgid "Search text"
-msgstr ""
+msgstr "Procurar texto"
 
 #: ../../operation/incidents/incident_search.php:45
 msgid ""
 "(*) The text search will look for all words entered as a substring in the "
 "title and description of each incident"
 msgstr ""
+"(*) A busca por texto irá procurar por todas as palavras fornecidas como sub-"
+"strings do título e descrição de cada incidente"
 
 #: ../../operation/servers/view_server_detail.php:51
 #: ../../operation/servers/view_server.php:37
@@ -5252,7 +5605,7 @@ msgstr "Progresso"
 
 #: ../../operation/servers/view_server_detail.php:104
 msgid "Force"
-msgstr ""
+msgstr "Forçar"
 
 #: ../../operation/servers/view_server_detail.php:113
 msgid "Done"
@@ -5264,7 +5617,7 @@ msgstr "Pendente"
 
 #: ../../operation/servers/view_server_detail.php:142
 msgid "This server has no recon tasks assigned"
-msgstr ""
+msgstr "Este servidor não tem nenhuma tarefa de reconhecimento designada"
 
 #: ../../operation/servers/view_server.php:55
 #: ../../operation/agentes/tactical.php:221
@@ -5282,27 +5635,27 @@ msgstr "Versão"
 #: ../../operation/servers/view_server.php:90
 #: ../../operation/agentes/tactical.php:241
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #: ../../operation/servers/view_server.php:100
 msgid "SNMP server"
-msgstr ""
+msgstr "Servidor SNMP"
 
 #: ../../operation/servers/view_server.php:118
 msgid "Master server"
-msgstr ""
+msgstr "Servidor Principal"
 
 #: ../../operation/servers/view_server.php:121
 msgid "MD5 check"
-msgstr ""
+msgstr "Checagem MD5"
 
 #: ../../operation/visual_console/render_view.php:63
 msgid "Full screen mode"
-msgstr ""
+msgstr "Modo tela cheia"
 
 #: ../../operation/visual_console/render_view.php:67
 msgid "Back to normal mode"
-msgstr ""
+msgstr "Voltar ao modo normal"
 
 #: ../../operation/visual_console/render_view.php:76
 #: ../../operation/visual_console/render_view.php:77
@@ -5319,9 +5672,9 @@ msgstr "atualizar"
 
 #: ../../operation/visual_console/render_view.php:119
 msgid "Until refresh"
-msgstr ""
+msgstr "Até atualizar"
 
-#: ../../operation/visual_console/index.php:24 ../../operation/menu.php:102
+#: ../../operation/visual_console/index.php:24 ../../operation/menu.php:59
 msgid "Visual console"
 msgstr "Console virtual"
 
@@ -5337,69 +5690,69 @@ msgstr "Elementos"
 
 #: ../../operation/visual_console/index.php:60
 msgid "No layouts found"
-msgstr ""
+msgstr "Nenhum layout encontrado"
 
-#: ../../operation/menu.php:48 ../../operation/agentes/tactical.php:50
+#: ../../operation/menu.php:35 ../../operation/agentes/tactical.php:50
 msgid "Tactical view"
 msgstr "Visão tática"
 
-#: ../../operation/menu.php:55 ../../operation/agentes/estado_grupo.php:32
+#: ../../operation/menu.php:38 ../../operation/agentes/estado_grupo.php:32
 msgid "Group view"
 msgstr "Visão do grupo"
 
-#: ../../operation/menu.php:62 ../../operation/agentes/networkmap.php:252
+#: ../../operation/menu.php:41 ../../operation/agentes/networkmap.php:250
 msgid "Network Map"
-msgstr ""
+msgstr "Mapa de rede"
 
-#: ../../operation/menu.php:76
+#: ../../operation/menu.php:46
 msgid "Alert detail"
 msgstr "Detalhes dos alertas"
 
-#: ../../operation/menu.php:83
+#: ../../operation/menu.php:49
 msgid "Monitor detail"
 msgstr "Detalhes dos monitores"
 
-#: ../../operation/menu.php:90 ../../operation/agentes/exportdata.php:236
+#: ../../operation/menu.php:52 ../../operation/agentes/exportdata.php:235
 msgid "Export data"
 msgstr "Exportar dados"
 
-#: ../../operation/menu.php:151
-msgid "Search incident"
-msgstr "Buscar incidente"
+#: ../../operation/menu.php:101
+msgid "Search incidents"
+msgstr "Procurar incidentes"
 
-#: ../../operation/menu.php:185
+#: ../../operation/menu.php:120
 msgid "RSS"
-msgstr ""
+msgstr "RSS"
 
-#: ../../operation/menu.php:191
+#: ../../operation/menu.php:124
 msgid "CSV File"
-msgstr ""
+msgstr "Arquivo CSV"
 
-#: ../../operation/menu.php:196
+#: ../../operation/menu.php:128
 msgid "Marquee"
-msgstr ""
+msgstr "Texto rolante"
 
-#: ../../operation/menu.php:206
+#: ../../operation/menu.php:134
 msgid "View users"
 msgstr "Ver usuários"
 
-#: ../../operation/menu.php:215
+#: ../../operation/menu.php:139
 msgid "Edit my user"
 msgstr "Editar meu usuário"
 
-#: ../../operation/menu.php:235 ../../operation/snmpconsole/snmp_view.php:99
+#: ../../operation/menu.php:151 ../../operation/snmpconsole/snmp_view.php:99
 msgid "SNMP console"
 msgstr "Console SNMP"
 
-#: ../../operation/menu.php:244 ../../operation/messages/message.php:58
+#: ../../operation/menu.php:157 ../../operation/messages/message.php:58
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../../operation/menu.php:253
+#: ../../operation/menu.php:163
 msgid "Messages to groups"
 msgstr "Mensagens aos grupos"
 
-#: ../../operation/menu.php:287
+#: ../../operation/menu.php:177
 msgid "Custom graphs"
 msgstr "Gráficos customizados"
 
@@ -5409,27 +5762,27 @@ msgstr "Evento eliminado corretamente"
 
 #: ../../operation/snmpconsole/snmp_view.php:51
 msgid "Error removing event"
-msgstr ""
+msgstr "Erro ao remover o evento"
 
 #: ../../operation/snmpconsole/snmp_view.php:64
 msgid "Event successfully updated"
-msgstr ""
+msgstr "Evento atualizado com sucesso"
 
 #: ../../operation/snmpconsole/snmp_view.php:64
 msgid "Error updating event"
-msgstr ""
+msgstr "Erro ao atualizar o evento"
 
 #: ../../operation/snmpconsole/snmp_view.php:101
-#: ../../operation/agentes/networkmap.php:254
-#: ../../operation/events/events.php:99
+#: ../../operation/agentes/networkmap.php:252
+#: ../../operation/events/events.php:106
 msgid "Normal screen"
-msgstr ""
+msgstr "Tela normal"
 
 #: ../../operation/snmpconsole/snmp_view.php:104
-#: ../../operation/agentes/networkmap.php:256
-#: ../../operation/events/events.php:102
+#: ../../operation/agentes/networkmap.php:254
+#: ../../operation/events/events.php:109
 msgid "Full screen"
-msgstr ""
+msgstr "Tela cheia"
 
 #: ../../operation/snmpconsole/snmp_view.php:113
 msgid "There are no SNMP traps in database"
@@ -5437,138 +5790,134 @@ msgstr "Não foi definido nenhum agente SNMP"
 
 #: ../../operation/snmpconsole/snmp_view.php:118
 msgid "Toggle filters"
-msgstr ""
+msgstr "Alternar filtros"
 
 #: ../../operation/snmpconsole/snmp_view.php:130
 #: ../../operation/snmpconsole/snmp_view.php:387
 msgid "Not fired"
-msgstr ""
+msgstr "Não disparados"
 
 #: ../../operation/snmpconsole/snmp_view.php:130
 msgid "fired"
-msgstr ""
+msgstr "disparados"
 
 #: ../../operation/snmpconsole/snmp_view.php:160
 msgid "Search value"
-msgstr ""
-
-#: ../../operation/snmpconsole/snmp_view.php:208
-msgid "Value"
-msgstr ""
+msgstr "Localizar valor"
 
 #: ../../operation/snmpconsole/snmp_view.php:211
 msgid "Custom"
-msgstr ""
+msgstr "Customizado"
 
 #: ../../operation/snmpconsole/snmp_view.php:269
 #: ../../operation/snmpconsole/snmp_view.php:381
 msgid "Not validated"
-msgstr ""
+msgstr "Não validado"
 
 #: ../../operation/snmpconsole/snmp_view.php:271
 #: ../../operation/snmpconsole/snmp_view.php:379
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #: ../../operation/snmpconsole/snmp_view.php:288
 msgid "View agent details"
-msgstr ""
+msgstr "Ver detalhes do agente"
 
 #: ../../operation/snmpconsole/snmp_view.php:346
 #: ../../operation/snmpconsole/snmp_view.php:368
 #: ../../operation/snmpconsole/snmp_view.php:391
-#: ../../operation/agentes/estado_alertas.php:67
-#: ../../operation/events/events.php:380
+#: ../../operation/agentes/estado_alertas.php:126
+#: ../../operation/agentes/estado_alertas.php:187
+#: ../../operation/events/events.php:408
 msgid "Validate"
 msgstr "Validar"
 
 #: ../../operation/snmpconsole/snmp_view.php:349
 #: ../../operation/snmpconsole/snmp_view.php:372
 msgid "Are you sure"
-msgstr ""
+msgstr "Você tem certeza"
 
 #: ../../operation/snmpconsole/snmp_view.php:360
 msgid "No matching traps found"
-msgstr ""
+msgstr "Nenhuma trap encontrada"
 
-#: ../../operation/agentes/networkmap.php:252
+#: ../../operation/agentes/networkmap.php:250
 #: ../../operation/agentes/status_monitor.php:33
 #: ../../operation/agentes/estado_generalagente.php:41
 #: ../../operation/agentes/estado_grupo.php:32
 #: ../../operation/agentes/estado_ultimopaquete.php:42
 #: ../../operation/agentes/exportdata.php:96
-#: ../../operation/agentes/exportdata.php:235
+#: ../../operation/agentes/exportdata.php:234
 #: ../../operation/agentes/estado_agente.php:38
-#: ../../operation/agentes/estado_alertas.php:43
-#: ../../operation/agentes/estado_alertas.php:115
+#: ../../operation/agentes/estado_alertas.php:78
 #: ../../operation/agentes/tactical.php:50
 msgid "Pandora Agents"
 msgstr "Agentes do Pandora"
 
-#: ../../operation/agentes/networkmap.php:271
+#: ../../operation/agentes/networkmap.php:269
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
-#: ../../operation/agentes/networkmap.php:275
+#: ../../operation/agentes/networkmap.php:273
 msgid "No Overlap"
 msgstr ""
 
-#: ../../operation/agentes/networkmap.php:279
+#: ../../operation/agentes/networkmap.php:277
 msgid "Simple"
-msgstr ""
+msgstr "Simples"
 
-#: ../../operation/agentes/networkmap.php:283
+#: ../../operation/agentes/networkmap.php:281
 msgid "Regenerate"
-msgstr ""
+msgstr "Recriar"
 
-#: ../../operation/agentes/networkmap.php:298
+#: ../../operation/agentes/networkmap.php:296
 msgid "Zoom"
-msgstr ""
+msgstr "Ampliar"
 
-#: ../../operation/agentes/networkmap.php:306
+#: ../../operation/agentes/networkmap.php:304
 msgid "Distance between nodes"
-msgstr ""
+msgstr "Distância entre os nós"
 
-#: ../../operation/agentes/networkmap.php:312
+#: ../../operation/agentes/networkmap.php:310
 msgid "Font"
-msgstr ""
+msgstr "Fonte"
 
-#: ../../operation/agentes/networkmap.php:352
-#: ../../operation/agentes/networkmap.php:361
+#: ../../operation/agentes/networkmap.php:350
+#: ../../operation/agentes/networkmap.php:359
 msgid "Map could not be generated"
-msgstr ""
+msgstr "O mapa não pode ser gerado"
 
 #: ../../operation/agentes/status_monitor.php:33
-#: ../../operation/agentes/estado_monitores.php:115
+#: ../../operation/agentes/estado_monitores.php:103
 msgid "Full list of Monitors"
 msgstr "Lista completa de monitores"
 
 #: ../../operation/agentes/status_monitor.php:64
 msgid "Monitor status"
-msgstr ""
+msgstr "Status do monitor"
 
 #: ../../operation/agentes/status_monitor.php:67
-#: ../../operation/agentes/ver_agente.php:82
+#: ../../operation/agentes/ver_agente.php:81
 #: ../../operation/agentes/tactical.php:113
 msgid "Monitors down"
-msgstr ""
+msgstr "Monitores inativos"
 
 #: ../../operation/agentes/status_monitor.php:68
 msgid "Monitors up"
-msgstr ""
+msgstr "Monitores ativos"
 
 #: ../../operation/agentes/status_monitor.php:69
 #: ../../operation/agentes/tactical.php:118
 msgid "Monitors unknown"
-msgstr ""
+msgstr "Monitores indefinidos"
 
 #: ../../operation/agentes/status_monitor.php:88
 msgid "Free text"
-msgstr ""
+msgstr "Texto livre"
 
 #: ../../operation/agentes/status_monitor.php:176
 msgid "Module Name"
-msgstr ""
+msgstr "Nome do módulo"
 
 #: ../../operation/agentes/status_monitor.php:231
 msgid "This group doesn't have any monitor"
@@ -5584,7 +5933,7 @@ msgstr "Acessibilidade para o agente (24h)"
 
 #: ../../operation/agentes/estado_generalagente.php:51
 msgid "Events generated -by module-"
-msgstr ""
+msgstr "Eventos gerados - pelo módulo -"
 
 #: ../../operation/agentes/estado_generalagente.php:60
 msgid "Refresh data"
@@ -5592,49 +5941,49 @@ msgstr "Atualizar dados"
 
 #: ../../operation/agentes/estado_generalagente.php:61
 msgid "Flag"
-msgstr ""
+msgstr "Sinalizar"
 
-#: ../../operation/agentes/estado_generalagente.php:92
+#: ../../operation/agentes/estado_generalagente.php:94
 msgid "Agent Version"
 msgstr "Versão do agente"
 
-#: ../../operation/agentes/estado_generalagente.php:96
-msgid "Total packets"
-msgstr "Número total de pacotes"
-
-#: ../../operation/agentes/estado_generalagente.php:100
+#: ../../operation/agentes/estado_generalagente.php:98
 msgid "Remote"
 msgstr "Remota"
 
-#: ../../operation/agentes/estado_generalagente.php:127
+#: ../../operation/agentes/estado_generalagente.php:125
 msgid "Next agent contact"
 msgstr "Contato seguinte com o agente"
 
 #: ../../operation/agentes/status_events.php:29
 msgid "Latest events for this agent"
-msgstr ""
+msgstr "Últimos eventos para este agente"
 
-#: ../../operation/agentes/estado_grupo.php:122
+#: ../../operation/agentes/estado_grupo.php:120
 msgid "There are no defined groups"
-msgstr ""
+msgstr "Não existem grupos definidos"
 
-#: ../../operation/agentes/estado_grupo.php:164
-msgid "Modules bad"
-msgstr ""
+#: ../../operation/agentes/estado_grupo.php:162
+msgid "Modules critical"
+msgstr "Módulos críticos"
 
-#: ../../operation/agentes/estado_grupo.php:168
-msgid "Modules OK"
-msgstr ""
+#: ../../operation/agentes/estado_grupo.php:166
+msgid "Modules normal"
+msgstr "Módulos normais"
 
-#: ../../operation/agentes/estado_grupo.php:178
+#: ../../operation/agentes/estado_grupo.php:170
+msgid "Modules warning"
+msgstr "Módulos de alerta"
+
+#: ../../operation/agentes/estado_grupo.php:180
 msgid "Agents down"
-msgstr ""
+msgstr "Agentes indisponíveis"
 
-#: ../../operation/agentes/estado_grupo.php:183
+#: ../../operation/agentes/estado_grupo.php:185
 msgid "Disabled alerts"
-msgstr ""
+msgstr "Alertas desabilitados"
 
-#: ../../operation/agentes/estado_grupo.php:214
+#: ../../operation/agentes/estado_grupo.php:218
 msgid "Agents"
 msgstr "Agentes"
 
@@ -5649,7 +5998,7 @@ msgstr "int"
 #: ../../operation/agentes/estado_ultimopaquete.php:56
 #: ../../operation/agentes/exportdata.php:175
 #: ../../operation/agentes/datos_agente.php:75
-#: ../../operation/agentes/ver_agente.php:217
+#: ../../operation/agentes/ver_agente.php:205
 msgid "Data"
 msgstr "Dados"
 
@@ -5661,69 +6010,30 @@ msgstr "Gráfico"
 msgid "Raw Data"
 msgstr "Dados"
 
-#: ../../operation/agentes/estado_monitores.php:81
-#: ../../operation/agentes/bulbs.php:27
-#: ../../operation/agentes/sla_view.php:107
-#: ../../operation/agentes/estado_agente.php:294
-msgid "Change between Green/Red state"
-msgstr "Alterna entre os estados verde e vermelho"
+#: ../../operation/agentes/estado_ultimopaquete.php:221
+msgid "This agent doesn't have any module"
+msgstr "Este agente não tem nenhum módulo definido"
 
-#: ../../operation/agentes/estado_monitores.php:83
-#: ../../operation/agentes/bulbs.php:25
-#: ../../operation/agentes/sla_view.php:109
-#: ../../operation/agentes/sla_view.php:188
-#: ../../operation/agentes/estado_agente.php:292
-msgid "At least one monitor fails"
-msgstr "Ao menos um monitor falhou"
+#: ../../operation/agentes/estado_monitores.php:76
+msgid "WARNING"
+msgstr "AVISO"
 
-#: ../../operation/agentes/estado_monitores.php:85
-#: ../../operation/agentes/bulbs.php:23
-#: ../../operation/agentes/sla_view.php:111
-#: ../../operation/agentes/sla_view.php:186
-#: ../../operation/agentes/estado_agente.php:297
-msgid "All Monitors OK"
-msgstr "Todos os monitores OK"
+#: ../../operation/agentes/estado_monitores.php:78
+msgid "CRITICAL"
+msgstr "CRÍTICO"
 
-#: ../../operation/agentes/estado_monitores.php:113
+#: ../../operation/agentes/estado_monitores.php:80
+msgid "NORMAL"
+msgstr "NORMAL"
+
+#: ../../operation/agentes/estado_monitores.php:101
 msgid "This agent doesn't have any active monitors"
-msgstr ""
-
-#: ../../operation/agentes/estado_monitores.php:120
-msgid "This agent doesn't have any active data modules"
-msgstr ""
-
-#: ../../operation/agentes/estado_monitores.php:122
-msgid "Full list of Data Modules"
-msgstr ""
-
-#: ../../operation/agentes/exportdata.php:54
-msgid "Sunday"
-msgstr "Domingo"
-
-#: ../../operation/agentes/exportdata.php:54
-msgid "Monday"
-msgstr "Segunda-feira"
-
-#: ../../operation/agentes/exportdata.php:54
-msgid "Tuesday"
-msgstr "Terça-feira"
-
-#: ../../operation/agentes/exportdata.php:54
-msgid "Wednesday"
-msgstr "Quarta-feira"
+msgstr "Este agente não tem nenhum monitor ativado"
 
 #: ../../operation/agentes/exportdata.php:54
 msgid "Thurdsday"
 msgstr "Quinta-feira"
 
-#: ../../operation/agentes/exportdata.php:54
-msgid "Friday"
-msgstr "Sábado"
-
-#: ../../operation/agentes/exportdata.php:54
-msgid "Saturday"
-msgstr "Domingo"
-
 #: ../../operation/agentes/exportdata.php:60
 msgid "One hour"
 msgstr "Hora"
@@ -5745,19 +6055,14 @@ msgstr "Dados do agente "
 #: ../../operation/agentes/exportdata.php:118
 #: ../../operation/agentes/exportdata.php:138
 msgid "from"
-msgstr ""
-
-#: ../../operation/agentes/exportdata.php:118
-#: ../../operation/agentes/exportdata.php:138
-msgid "to"
-msgstr ""
+msgstr "de"
 
 #: ../../operation/agentes/exportdata.php:120
 msgid "Download file"
 msgstr "Baixar arquivo"
 
 #: ../../operation/agentes/exportdata.php:122
-#: ../../operation/agentes/exportdata.php:208
+#: ../../operation/agentes/exportdata.php:207
 msgid "No module has been selected"
 msgstr "Não foi selecionado nenhum módulo"
 
@@ -5769,48 +6074,63 @@ msgstr " desde "
 msgid " to "
 msgstr " até "
 
-#: ../../operation/agentes/exportdata.php:287
+#: ../../operation/agentes/exportdata.php:286
 msgid "Begin date (*)"
 msgstr "Data de início (*)"
 
-#: ../../operation/agentes/exportdata.php:294
+#: ../../operation/agentes/exportdata.php:293
 msgid "End date (*)"
 msgstr "Data final (*)"
 
-#: ../../operation/agentes/exportdata.php:301
+#: ../../operation/agentes/exportdata.php:300
 msgid "Export type"
 msgstr "Tipo de exportação"
 
-#: ../../operation/agentes/exportdata.php:305
+#: ../../operation/agentes/exportdata.php:304
 msgid "Data table"
 msgstr "Tabela de dados"
 
-#: ../../operation/agentes/exportdata.php:306
+#: ../../operation/agentes/exportdata.php:305
 msgid "Standalone CSV ascii file"
 msgstr "Formato CSV"
 
-#: ../../operation/agentes/exportdata.php:307
+#: ../../operation/agentes/exportdata.php:306
 msgid "Average per hour/day"
 msgstr "Média por hora/dia"
 
-#: ../../operation/agentes/exportdata.php:313
+#: ../../operation/agentes/exportdata.php:312
 msgid "Export"
 msgstr "Exportar"
 
+#: ../../operation/agentes/bulbs.php:23
+#: ../../operation/agentes/sla_view.php:111
+#: ../../operation/agentes/sla_view.php:186
+#: ../../operation/agentes/estado_agente.php:294
+msgid "All Monitors OK"
+msgstr "Todos os monitores OK"
+
+#: ../../operation/agentes/bulbs.php:25
+#: ../../operation/agentes/sla_view.php:109
+#: ../../operation/agentes/sla_view.php:188
+msgid "At least one monitor fails"
+msgstr "Ao menos um monitor falhou"
+
+#: ../../operation/agentes/bulbs.php:27
+#: ../../operation/agentes/sla_view.php:107
+msgid "Change between Green/Red state"
+msgstr "Alterna entre os estados verde e vermelho"
+
 #: ../../operation/agentes/bulbs.php:31
-#: ../../operation/agentes/estado_agente.php:309
 msgid "Agent without monitors"
 msgstr "Agente sem monitores"
 
 #: ../../operation/agentes/bulbs.php:33
-#: ../../operation/agentes/estado_agente.php:301
-#: ../../operation/agentes/estado_agente.php:307
+#: ../../operation/agentes/estado_agente.php:297
 msgid "Agent without data"
 msgstr "Agente sem dados"
 
 #: ../../operation/agentes/bulbs.php:35
-#: ../../operation/agentes/estado_agente.php:299
-#: ../../operation/agentes/estado_agente.php:305
+#: ../../operation/agentes/estado_agente.php:287
 msgid "Agent down"
 msgstr "Agente caiu"
 
@@ -5818,55 +6138,85 @@ msgstr "Agente caiu"
 msgid "Received data from"
 msgstr "Dados recebidos de"
 
-#: ../../operation/agentes/ver_agente.php:52
+#: ../../operation/agentes/ver_agente.php:51
 msgid "Main IP"
-msgstr ""
+msgstr "IP Principal"
 
-#: ../../operation/agentes/ver_agente.php:58
+#: ../../operation/agentes/ver_agente.php:57
 msgid "Last remote contact"
-msgstr ""
+msgstr "Último contato remoto"
+
+#: ../../operation/agentes/ver_agente.php:147
+#: ../../operation/agentes/estado_alertas.php:89
+msgid "Alert(s) validated"
+msgstr "Alerta(s) validadado(s)"
+
+#: ../../operation/agentes/ver_agente.php:147
+#: ../../operation/agentes/estado_alertas.php:89
+msgid "Error processing alert(s)"
+msgstr "Erro processando alerta(s)"
 
 #: ../../operation/agentes/ver_agente.php:186
-msgid "View mode"
-msgstr "Modo visualizar"
-
-#: ../../operation/agentes/ver_agente.php:198
 msgid "Manage"
 msgstr "Gerenciar"
 
-#: ../../operation/agentes/ver_agente.php:208
+#: ../../operation/agentes/ver_agente.php:196
 msgid "Main"
 msgstr "Principal"
 
 #: ../../operation/agentes/sla_view.php:34
 msgid "SLA view"
-msgstr ""
+msgstr "Visualizar SLA"
 
 #: ../../operation/agentes/sla_view.php:42
 msgid "Automatic SLA for monitors"
-msgstr ""
+msgstr "SLA automático para monitores"
 
 #: ../../operation/agentes/sla_view.php:142
 msgid "User-defined SLA items"
-msgstr ""
+msgstr "Items de SLA definidos por usuário"
 
-#: ../../operation/agentes/estado_agente.php:331
+#: ../../operation/agentes/estado_agente.php:290
+msgid "At least one module in CRITICAL status"
+msgstr "Ao menos um módulo com status CRÍTICO"
+
+#: ../../operation/agentes/estado_agente.php:292
+msgid "At least one module in WARNING status"
+msgstr "Ao menos um módulo com status de AVISO"
+
+#: ../../operation/agentes/estado_agente.php:319
 msgid "There are no agents included in this group"
 msgstr "Não há nenhum agente incluído neste grupo"
 
-#: ../../operation/agentes/estado_alertas.php:43
-#: ../../operation/agentes/estado_alertas.php:53
-#: ../../operation/agentes/estado_alertas.php:115
+#: ../../operation/agentes/estado_alertas.php:78
 msgid "Full list of Alerts"
 msgstr "Lista completa de alertas"
 
-#: ../../operation/agentes/estado_alertas.php:143
-msgid "Combined alert"
-msgstr ""
+#: ../../operation/agentes/estado_alertas.php:81
+msgid "Full list of alerts"
+msgstr "Lista completa de alertas"
 
-#: ../../operation/agentes/estado_alertas.php:208
-msgid "No agent included in this group has any assigned alert"
-msgstr "Nenhum agente deste grupo tem algum alerta definido"
+#: ../../operation/agentes/estado_alertas.php:105
+#: ../../operation/agentes/estado_alertas.php:106
+#: ../../operation/agentes/estado_alertas.php:107
+msgid "Click to filter"
+msgstr "Clique para filtrar"
+
+#: ../../operation/agentes/estado_alertas.php:136
+msgid "Single alerts"
+msgstr "Alertas individuais"
+
+#: ../../operation/agentes/estado_alertas.php:160
+msgid "No simple alerts found"
+msgstr "Nenhum alerta simples encontrado"
+
+#: ../../operation/agentes/estado_alertas.php:163
+msgid "Combined alerts"
+msgstr "Alertas combinados"
+
+#: ../../operation/agentes/estado_alertas.php:182
+msgid "No combined alerts found"
+msgstr "Nenhum alerta combinado encontrado"
 
 #: ../../operation/agentes/tactical.php:100
 #: ../../operation/agentes/tactical.php:103
@@ -5875,11 +6225,11 @@ msgstr "Checagens do monitor"
 
 #: ../../operation/agentes/tactical.php:108
 msgid "Monitors good"
-msgstr ""
+msgstr "Monitores OK"
 
 #: ../../operation/agentes/tactical.php:123
 msgid "Monitors not init"
-msgstr ""
+msgstr "Monitores não inicializados"
 
 #: ../../operation/agentes/tactical.php:140
 #: ../../operation/agentes/tactical.php:143
@@ -5888,31 +6238,31 @@ msgstr "Checagens dos dados"
 
 #: ../../operation/agentes/tactical.php:148
 msgid "Data good"
-msgstr ""
+msgstr "Dados OK"
 
 #: ../../operation/agentes/tactical.php:153
 msgid "Data down"
-msgstr ""
+msgstr "Dados indisponíveis"
 
 #: ../../operation/agentes/tactical.php:158
 msgid "Data unknown"
-msgstr ""
+msgstr "Dados indefinidos"
 
 #: ../../operation/agentes/tactical.php:163
 msgid "Data not init"
-msgstr ""
+msgstr "Dados não inicializados"
 
 #: ../../operation/agentes/tactical.php:183
 msgid "Total Agents"
-msgstr ""
+msgstr "Total de agentes"
 
 #: ../../operation/agentes/tactical.php:188
 msgid "Total Checks"
-msgstr ""
+msgstr "Total de verificações"
 
 #: ../../operation/agentes/tactical.php:193
 msgid "Uninitialized modules"
-msgstr ""
+msgstr "Módulos não inicializados"
 
 #: ../../operation/agentes/tactical.php:216
 msgid "Tactical server information"
@@ -5920,137 +6270,154 @@ msgstr "Visão tática do servidor"
 
 #: ../../operation/agentes/tactical.php:222
 msgid "Lag"
-msgstr ""
+msgstr "Atraso"
 
-#: ../../operation/events/event_statistics.php:33
+#: ../../operation/events/event_statistics.php:32
 msgid "Events statistics"
 msgstr "Estatísticas de eventos"
 
-#: ../../operation/events/event_statistics.php:37
+#: ../../operation/events/event_statistics.php:36
 msgid "Event graph"
 msgstr "Gráfico de eventos"
 
-#: ../../operation/events/event_statistics.php:40
+#: ../../operation/events/event_statistics.php:39
 msgid "Event graph by user"
 msgstr "Gráfico de eventos por usuário"
 
-#: ../../operation/events/event_statistics.php:43
+#: ../../operation/events/event_statistics.php:44
+#: ../../operation/events/event_statistics.php:48
 msgid "Event graph by group"
 msgstr "Gráfico de eventos por grupo"
 
 #: ../../operation/events/events.php:38
 msgid "Events successfully deleted"
-msgstr ""
+msgstr "Eventos removidos com sucesso"
 
 #: ../../operation/events/events.php:38
 msgid "There was an error deleting events"
-msgstr ""
+msgstr "Houve um erro removendo os eventos"
 
 #: ../../operation/events/events.php:45
 msgid "Events successfully validated"
-msgstr ""
+msgstr "Eventos validados com sucesso"
 
 #: ../../operation/events/events.php:45
 msgid "There was an error validating events"
-msgstr ""
+msgstr "Houve um erro validando os eventos"
 
-#: ../../operation/events/events.php:71
+#: ../../operation/events/events.php:73
 msgid "System Events"
-msgstr ""
+msgstr "Eventos do sistema"
 
-#: ../../operation/events/events.php:96
+#: ../../operation/events/events.php:103
 msgid "Main event view"
-msgstr ""
+msgstr "Visualização principal de eventos"
 
-#: ../../operation/events/events.php:105
+#: ../../operation/events/events.php:112
 msgid "Event control filter"
-msgstr ""
+msgstr "Filtrar controle de eventos"
 
-#: ../../operation/events/events.php:122
+#: ../../operation/events/events.php:127
 msgid "Event type"
-msgstr ""
+msgstr "Tipo de evento"
 
-#: ../../operation/events/events.php:132
+#: ../../operation/events/events.php:137
 msgid "Event status"
-msgstr ""
+msgstr "Status de evento"
 
-#: ../../operation/events/events.php:134
+#: ../../operation/events/events.php:139
 msgid "All event"
-msgstr ""
+msgstr "Todos os eventos"
 
-#: ../../operation/events/events.php:135
+#: ../../operation/events/events.php:140
 msgid "Only validated"
-msgstr ""
+msgstr "Apenas validados"
 
-#: ../../operation/events/events.php:136
+#: ../../operation/events/events.php:141
 msgid "Only pending"
-msgstr ""
-
-#: ../../operation/events/events.php:144
-msgid "Free search"
-msgstr ""
+msgstr "Apenas pendentes"
 
 #: ../../operation/events/events.php:149
+msgid "Free search"
+msgstr "Busca livre"
+
+#: ../../operation/events/events.php:154
 msgid "Agent search"
+msgstr "Buscar agente"
+
+#: ../../operation/events/events.php:191
+msgid "Max. hours old"
+msgstr "Max. horas"
+
+#: ../../operation/events/events.php:198
+msgid "User ack."
 msgstr ""
 
-#: ../../operation/events/events.php:195
+#: ../../operation/events/events.php:213
 msgid "Marquee display"
 msgstr ""
 
-#: ../../operation/events/events.php:197
+#: ../../operation/events/events.php:215
 msgid "RSS Events"
 msgstr ""
 
-#: ../../operation/events/events.php:281
+#: ../../operation/events/events.php:298
 msgid "Alert Recovered"
 msgstr ""
 
-#: ../../operation/events/events.php:284
+#: ../../operation/events/events.php:301
 msgid "Manual Alert Validation"
 msgstr ""
 
-#: ../../operation/events/events.php:287
-msgid "Monitor Up"
+#: ../../operation/events/events.php:304
+msgid "Going up Warning"
 msgstr ""
 
-#: ../../operation/events/events.php:290
-msgid "Monitor Down"
+#: ../../operation/events/events.php:307
+msgid "Going up Critical"
 msgstr ""
 
-#: ../../operation/events/events.php:293
+#: ../../operation/events/events.php:310
+msgid "Going to Normal"
+msgstr ""
+
+#: ../../operation/events/events.php:313
+msgid "Going down Warning"
+msgstr ""
+
+#: ../../operation/events/events.php:317
 msgid "Alert Fired"
 msgstr ""
 
-#: ../../operation/events/events.php:299
+#: ../../operation/events/events.php:323
 msgid "Host Detected (Recon)"
 msgstr ""
 
-#: ../../operation/events/events.php:302
+#: ../../operation/events/events.php:326
 msgid "New Agent"
 msgstr ""
 
-#: ../../operation/events/events.php:306
+#: ../../operation/events/events.php:330
 msgid "Unknown type"
 msgstr ""
 
-#: ../../operation/events/events.php:332
+#: ../../operation/events/events.php:356
 msgid "SNMP"
 msgstr "SNMP"
 
-#: ../../operation/events/events.php:393
+#: ../../operation/events/events.php:422
 msgid "Validated event"
 msgstr "Evento validado"
 
-#: ../../operation/events/events.php:395
+#: ../../operation/events/events.php:424
 msgid "Not validated event"
 msgstr "Evento não validado"
 
-#: ../../operation/events/events.php:399
+#: ../../operation/events/events.php:428
 msgid "Validate event"
 msgstr "Validar evento"
 
-#: ../../operation/events/events.php:401
+#: ../../operation/events/events.php:430
 msgid "Delete event"
 msgstr "Eliminar evento"
 
@@ -6227,15 +6594,39 @@ msgstr "Sem Assunto"
 #~ msgid "Started at"
 #~ msgstr "Iniciado em"
 
+#~ msgid "Manage config."
+#~ msgstr "Gerenciar conf."
+
+#~ msgid "System Audit Log"
+#~ msgstr "Auditoria do sistema"
+
+#~ msgid "Language Code for Pandora"
+#~ msgstr "Código de linguagem para o Pandora"
+
+#~ msgid "Show unknown modules in global view"
+#~ msgstr "Mostrar módulos desconhecidos em visão global"
+
+#~ msgid "Show last fired alerts in global view"
+#~ msgstr "Mostrar alertas disparados na visão global"
+
 #~ msgid "There was a problem deleting module"
 #~ msgstr "Houve um problema ao apagar o módulo"
 
+#~ msgid "This agent doesn't have any alert"
+#~ msgstr "Este agente não tem nenhum alerta definido"
+
+#~ msgid "No modules has been selected"
+#~ msgstr "Não foram selecionados módulos"
+
 #~ msgid "You must select modules and/or alerts for copy operation"
 #~ msgstr "Você deve selecionar módulos e/ou alertas como objeto da cópia"
 
 #~ msgid " in agent "
 #~ msgstr " no agente "
 
+#~ msgid "Delete Data"
+#~ msgstr "Apagar dados"
+
 #~ msgid "Deleting data"
 #~ msgstr "Apagando dados"
 
@@ -6245,6 +6636,9 @@ msgstr "Sem Assunto"
 #~ msgid "Copy"
 #~ msgstr "Copiar"
 
+#~ msgid "There was a problem deleting agent"
+#~ msgstr "Houve um problema ao apagar o agente"
+
 #~ msgid "Press here to get DB Info as text"
 #~ msgstr "Clique aqui para ver informações da Base de Dados em formato texto"
 
@@ -6284,6 +6678,9 @@ msgstr "Sem Assunto"
 #~ msgid "Packets one day old"
 #~ msgstr "Pacotes com menos de 24 horas"
 
+#~ msgid "Total packets"
+#~ msgstr "Número total de pacotes"
+
 #~ msgid "Purge data over 90 days"
 #~ msgstr "Apagar os dados com mais de três meses"
 
@@ -6299,6 +6696,15 @@ msgstr "Sem Assunto"
 #~ msgid "Database Statistics per Agent"
 #~ msgstr "Estatísticas da Base de Dados por agente"
 
+#~ msgid "Maximum equal to minimum"
+#~ msgstr "Máximo igual ao mínimo"
+
+#~ msgid "Purge data out these limits"
+#~ msgstr "Apagar dados fora destes limites"
+
+#~ msgid "Alerts defined in Pandora"
+#~ msgstr "Alertas definidos no Pandora"
+
 #~ msgid "ok"
 #~ msgstr "Ok"
 
@@ -6356,6 +6762,12 @@ msgstr "Sem Assunto"
 #~ msgid "There are no defined layouts"
 #~ msgstr "Não há mais layouts definidos"
 
+#~ msgid "Search incident"
+#~ msgstr "Buscar incidente"
+
+#~ msgid "SNMP alerts"
+#~ msgstr "Alertas SNMP"
+
 #~ msgid "Custom value"
 #~ msgstr "Valor do usuário"
 
@@ -6365,6 +6777,12 @@ msgstr "Sem Assunto"
 #~ msgid "Last 24 Hours"
 #~ msgstr "Últimas 24 Horas"
 
+#~ msgid "View mode"
+#~ msgstr "Modo visualizar"
+
+#~ msgid "No agent included in this group has any assigned alert"
+#~ msgstr "Nenhum agente deste grupo tem algum alerta definido"
+
 #~ msgid "Event validation failed"
 #~ msgstr "Validação do evento falhou"
 
diff --git a/pandora_console/operation/agentes/sla_view.php b/pandora_console/operation/agentes/sla_view.php
index 712e39cb02..a40af9fa59 100644
--- a/pandora_console/operation/agentes/sla_view.php
+++ b/pandora_console/operation/agentes/sla_view.php
@@ -44,7 +44,7 @@ if (mysql_num_rows ($result_t)) {
 	echo "<tr><th>X</th>";
 	echo "<th>".__('Type')."</th>
 	<th>".__('Module name')."</th>
-	<th>".__('S.L.A')."</th>
+	<th>".__('S.L.A.')."</th>
 	<th>".__('Status')."</th>
 	<th>".__('Interval')."</th>
 	<th>".__('Last contact')."</th>";
@@ -145,7 +145,7 @@ if (mysql_num_rows ($result_t)) {
 	echo "<tr>";
 	echo "<th>" . __('Type') . "</th>";
 	echo "<th>" . __('Module name') . "</th>";
-	echo "<th>" . __('S.L.A') . "</th>";
+	echo "<th>" . __('S.L.A.') . "</th>";
 	echo "<th>" . __('Status') . "</th>";
 	
 	while ($module_data = mysql_fetch_array($result_t)){
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index bbe72e488f..4e373001b2 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -214,7 +214,7 @@ if ($tab == "sla") {
 } else {
 	echo "<li class='nomn'>";
 }
-echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=sla&id_agente=$id_agente'><img src='images/images.png' class='top' border=0> ".__('S.L.A')." </a>";
+echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=sla&id_agente=$id_agente'><img src='images/images.png' class='top' border=0> ".__('S.L.A.')." </a>";
 echo "</li>";
 
 // Group tab
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 78274edff1..9a5c64203b 100644
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -189,7 +189,7 @@ foreach ($contents as $content) {
 		$table->colspan[0][0] = 2;
 		$table->style[1] = 'text-align: right';
 		$data = array ();
-		$data[0] = '<h4>'.__('S.L.A').'</h4>';
+		$data[0] = '<h4>'.__('S.L.A.').'</h4>';
 		$data[1] = '<h4>'.human_time_description ($content['period']).'</h4>';;
 		$n = array_push ($table->data, $data);
 		
diff --git a/pandora_console/operation/reporting/reporting_xml.php b/pandora_console/operation/reporting/reporting_xml.php
index ac972178b5..e9a7044563 100644
--- a/pandora_console/operation/reporting/reporting_xml.php
+++ b/pandora_console/operation/reporting/reporting_xml.php
@@ -186,7 +186,7 @@ foreach ($contents as $content) {
 		break;
 	case 3:
 	case 'SLA':
-		$data["title"] = __('S.L.A');
+		$data["title"] = __('S.L.A.');
 		
 		$slas = get_db_all_rows_field_filter ('treport_content_sla_combined','id_report_content', $content['id_rc']);
 		if ($slas === false) {