Module: check_mk
Branch: master
Commit: 2e9195f2143b7d21262963d57b28e18516caaeac
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e9195f2143b7d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Feb 5 10:26:31 2015 +0100
Fixed some english texts
Conflicts:
web/plugins/wato/check_parameters.py
---
web/htdocs/wato.py | 2 +-
web/plugins/wato/check_parameters.py | 6 +++---
web/plugins/wato/datasource_programs.py | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index dd4eae3..858ec79 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -18706,7 +18706,7 @@ def load_plugins():
config.declare_permission("wato.notifications",
_("Notification configuration"),
- _("This permission is needed for the new rule based notification
configuration via the WATO module <i>Notifications</i>.</b>"),
+ _("This permission is needed for the new rule based notification
configuration via the WATO module <i>Notifications</i>."),
[ "admin", ])
config.declare_permission("wato.snapshots",
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index aa8223f..bff87cf 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -4943,8 +4943,8 @@ register_rule(
"description. The UUID will be displayed in the
pluging output."))
),
],
- help = _("This rule controls if the UUID or alias is used in the service
description during "
- "inventory of Multipath devices on Linux."),
+ help = _("This rule controls wether the UUID or the alias is used in the
service description during "
+ "discovery of Multipath devices on Linux."),
),
match = 'dict',
)
@@ -5879,7 +5879,7 @@ register_check_parameters(
title = _("Temperature Trend Analysis"),
help = _("This rule enables and configures a trend analysis and
corresponding limits for devices, "
"which have their own limits configured on the device. It will only
work for supported "
- "checks, right now the adva_fsp_temp check"),
+ "checks, right now the <tt>adva_fsp_temp</tt>
check"),
elements = [
( "trend_range",
Optional(
diff --git a/web/plugins/wato/datasource_programs.py
b/web/plugins/wato/datasource_programs.py
index 79ba744..4da6710 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -197,12 +197,12 @@ register_rule(group,
optional_keys = False
),
title = _("Check NetApp via WebAPI"),
- help = _("This rule selects the NetApp agent instead of the normal Check_MK
Agent "
+ help = _("This rule selects the NetApp special agent instead of the normal
Check_MK Agent "
"and allows monitoring via the NetApp API. Right now only
<i>7-Mode</i> is supported, "
- "<i>Cluster Mode</i> is following soon. Important: To make
this special agent NetApp work "
- "you will have to provide two additional python files (NaServer.py,
NaElement.py) "
+ "<i>Cluster Mode</i> will follow soon. Important: To make
this special agent NetApp work "
+ "you will have to provide two additional python files
(<tt>NaServer.py</tt>, <tt>NaElement.py</tt>) "
"from the NetApp Manageability SDK. They need to be put into the site
directory "
- "<tt>~/local/lib/python</tt>. The user requires a number
of permissions for specific API classes. "
+ "into <tt>~/local/lib/python</tt>. The user requires a
number of permissions for specific API classes. "
"They are displayed if you call the agent with <tt>agent_netapp
--help</tt>. The agent itself "
"is located in the site directory under
<tt>~/share/check_mk/agents/special</tt>."),
match = 'first')