Module: check_mk
Branch: master
Commit: 5307aed1c96ca35d3321a0a68e68b65fddd2316c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5307aed1c96ca3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jan 23 10:49:32 2015 +0100
Fix several descriptive texts
---
web/htdocs/crashed_check.py | 2 +-
web/htdocs/wato.py | 2 +-
web/plugins/wato/check_parameters.py | 13 ++++++-------
web/plugins/wato/datasource_programs.py | 4 ++--
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/web/htdocs/crashed_check.py b/web/htdocs/crashed_check.py
index 7639e72..f3bf423 100644
--- a/web/htdocs/crashed_check.py
+++ b/web/htdocs/crashed_check.py
@@ -39,7 +39,7 @@ def output_box(title, content):
% html.attrencode(content).replace("\n",
"<br>"))
def page_crashed_check():
- html.header(_("Crash Check Report"), stylesheets=["status",
"pages",])
+ html.header(_("Crashed Check Report"), stylesheets=["status",
"pages",])
site = html.var("site")
host = html.var("host")
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index e4848e4..9b06bc9 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -8903,7 +8903,7 @@ def mode_notifications(phase):
if not current_settings.get("enable_rulebased_notifications"):
url =
'wato.py?mode=edit_configvar&varname=enable_rulebased_notifications'
html.show_warning(
- _("<p>Warning</b><br><br>Rule based notifications
are disabled in your global settings. "
+ _("<b>Warning</b><br><br>Rule based notifications
are disabled in your global settings. "
"The rules that you edit here will have affect only on notifications
that are "
"created by the Event Console. Normal monitoring alerts will
<b>not</b> use the "
"rule based notifications now."
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 62aec36..61a3774 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -3697,8 +3697,7 @@ register_check_parameters(
_("ORACLE Scheduler Job"),
Dictionary(
help = _("A scheduler job is an object in an ORACLE database which could be
"
- "compared to a cron job on unix. "
- "This rule allows you to define the maximum run duration and
state.."),
+ "compared to a cron job on Unix. "),
elements = [
( "run_duration",
Tuple(
@@ -3798,9 +3797,9 @@ register_check_parameters(
choices = [
( False, _("Disregard required mirror space as free space")),
( True, _("Regard required mirror space as free space")),],
- help = _("ASM calculates the free space depending on free_mb or require
mirror "
- "free space. Enable this option to set the check against
require "
- "mirror free space. This only works for normal or high
redundancy Disk Groups. "))
+ help = _("ASM calculates the free space depending on free_mb or
required mirror "
+ "free space. Enable this option to set the check against
required "
+ "mirror free space. This only works for normal or high
redundancy Disk Groups."))
),
],
hidden_keys = ["flex_levels"],
@@ -4537,11 +4536,11 @@ register_check_parameters(
elements = [
( "always_ok",
DropdownChoice(
+ title = _("Override Service State"),
choices = [
- ( False, _("Check show Errors in Case of degraded or offline
hosts")),
+ ( False, _("Check shows errors in case of degraded or offline
hosts")),
( True, _("Check always is in a OK State") )
],
- title = _("Overwrite Service State"),
)
)
],
diff --git a/web/plugins/wato/datasource_programs.py
b/web/plugins/wato/datasource_programs.py
index 5e65414..9e074af 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -407,8 +407,8 @@ register_rule(group,
register_rule(group,
"special_agents:hivemanager",
Tuple(
- title = _("Hivemanager"),
- help = _( "Connect to AeroHive HiveManger via a webcall to get a list of all
devices"),
+ title = _("Aerohive HiveManager"),
+ help = _( "Activate monitoring of host via a HTTP connect to the
HiveManager"),
elements = [
TextAscii(title = _("Username")),
Password( title = _("Password")),