Module: check_mk
Branch: master
Commit: 0fff0cb74cf677b6ebeb298333e352ad5404ee85
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fff0cb74cf677…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Mon Aug 19 10:32:02 2013 +0200
wording fixes
---
web/htdocs/wato.py | 2 +-
web/plugins/views/availability.py | 4 ++--
web/plugins/wato/check_parameters.py | 14 +++++++-------
web/plugins/wato/globals_notification.py | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index e4d489e..cce26d6 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -12965,7 +12965,7 @@ def mode_bi_edit_rule(phase):
( "params",
ListOfStrings(
title = _("Parameters"),
- help = _("Parameters are used in order to make rules more flexible. The must "
+ help = _("Parameters are used in order to make rules more flexible. They must "
"be named like variables in programming languages. For example you can "
"make your rule have the two parameters <tt>HOST</tt> and <tt>INST</tt>. "
"When calling the rule - from an aggergation or a higher level rule - "
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index df09db3..d546309 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -213,8 +213,8 @@ avoption_entries = [
ListChoice(
title = _("Aggregations"),
choices = [
- ( "min", _("minimal duration" )),
- ( "max", _("maximal duration" )),
+ ( "min", _("minimum duration" )),
+ ( "max", _("maximum duration" )),
( "avg", _("average duration" )),
( "cnt", _("count" )),
]
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index fe107ca..c2862e3 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -293,7 +293,7 @@ register_rule(group + '/' + subgroup_inventory,
('descr', TextAscii(
title = _('Service Description'),
help = _('<p>The service description may contain one or more occurances of <tt>%s</tt>. If you do this, then the pattern must be a regular '
- 'expression and be prefixed with ~. For each %s in the description, the expression has to contain one "group". A group '
+ 'expression and be prefixed with ~. For each <tt>%s</tt> in the description, the expression has to contain one "group". A group '
'is a subexpression enclosed in brackets, for example <tt>(.*)</tt> or <tt>([a-zA-Z]+)</tt> or <tt>(...)</tt>. When the inventory finds a process '
'matching the pattern, it will substitute all such groups with the actual values when creating the check. That way one '
'rule can create several checks on a host.</p>'
@@ -1222,7 +1222,7 @@ register_check_parameters(
( "remote_port", Integer(title = _("Remote port number"), minvalue = 1, maxvalue = 65535, )),
( "min_states",
Tuple(
- title = _("Number of minimum connections or listeners"),
+ title = _("Minimum number of connections or listeners"),
elements = [
Integer(title = _("Warning if above")),
Integer(title = _("Critical if above")),
@@ -1231,7 +1231,7 @@ register_check_parameters(
),
( "max_states",
Tuple(
- title = _("Number of maximum connections or listeners"),
+ title = _("Maximum number of connections or listeners"),
elements = [
Integer(title = _("Warning if above")),
Integer(title = _("Critical if above")),
@@ -1450,9 +1450,9 @@ register_check_parameters(
( "assumed_speed_in",
OptionalDropdownChoice(
title = _("Assumed input speed"),
- help = _("If the automatic detection of the incoming link speed does not work "
+ help = _("If the automatic detection of the link speed does not work "
"or the switch's capabilities are throttled because of the network setup "
- "you can set the assummend incoming speed here."),
+ "you can set the assumed speed here."),
choices = [
( None, _("ignore speed") ),
( 10000000, "10 MBit/s" ),
@@ -1469,9 +1469,9 @@ register_check_parameters(
( "assumed_speed_out",
OptionalDropdownChoice(
title = _("Assumed output speed"),
- help = _("If the automatic detection of the outgoing speed does not work "
+ help = _("If the automatic detection of the link speed does not work "
"or the switch's capabilities are throttled because of the network setup "
- "you can set the assummend outgoing speed here."),
+ "you can set the assumed speed here."),
choices = [
( None, _("ignore speed") ),
( 10000000, "10 MBit/s" ),
diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py
index 9b9950f..d0bc461 100644
--- a/web/plugins/wato/globals_notification.py
+++ b/web/plugins/wato/globals_notification.py
@@ -33,8 +33,8 @@ register_configvar(group,
"notification_logging",
DropdownChoice(
title = _("Debug notifications"),
- help = _("When notification debugging is on, then in the notification logfile "
- "in <tt>%s</tt> additional information will be logged." %
+ help = _("When notification debugging is on, additional information will be "
+ "logged in the notification logfile <tt>%s</tt>." %
(defaults.var_dir + "/notify/notify.log")),
choices = [
( 0, _("No logging")),