Module: check_mk
Branch: master
Commit: b27690fe3f0ded6fecbefd964ed44518c27e5b84
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b27690fe3f0ded…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Jan 8 11:40:28 2014 +0100
Fixed several description texts
---
web/htdocs/wato.py | 2 +-
web/plugins/userdb/ldap.py | 6 +++---
web/plugins/views/availability.py | 2 +-
web/plugins/views/painters.py | 2 +-
web/plugins/wato/check_mk_configuration.py | 6 +++---
web/plugins/wato/check_parameters.py | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 28fadd3..33fa821 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -14810,7 +14810,7 @@ def is_alias_used(my_group, my_name, aliasname):
for groupname, group in all_groups.items():
for key, value in group.items():
if value == aliasname and (my_group != groupname or my_name != key):
- return False, _("This alias is already used in the %s group %s
.") % (groupname, key)
+ return False, _("This alias is already used in the %s group
%s.") % (groupname, key)
# Timeperiods
timeperiods = load_timeperiods()
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index 9af7443..27a6a64 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -800,8 +800,8 @@ ldap_attribute_plugins['auth_expire'] = {
ldap_attribute_plugins['pager'] = {
'title': _('Pager'),
- 'help': _('This plugin synchronizes a field of the users ldap account to
the pager attribute '
- 'of the WATO user accounts, which is then forwarded to Nagios and can
be used'
+ 'help': _('This plugin synchronizes a field of the users LDAP account to
the pager attribute '
+ 'of the WATO user accounts, which is then forwarded to the monitoring
core and can be used'
'for notifications. By default the LDAP attribute
<tt>mobile</tt> is used.'),
'needed_attributes': lambda params: [ params.get('attr',
ldap_attr('mobile')) ],
'convert': lambda plugin, params, user_id, ldap_user, user: \
@@ -831,7 +831,7 @@ def register_user_attribute_sync_plugins():
'parameters': [
('attr', TextAscii(
title = _("LDAP attribute to sync"),
- help = _("The LDAP attribute which contents shal be synced into
this custom attribute."),
+ help = _("The LDAP attribute whose contents shall be synced
into this custom attribute."),
default_value = lambda: ldap_attr(attr),
)),
],
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index 1176517..cad0c2d 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -354,7 +354,7 @@ avoption_entries = [
( "short_intervals",
"single",
Integer(
- title = _("Short Time Intervalls"),
+ title = _("Short Time Intervals"),
minvalue = 0,
unit = _("sec"),
label = _("Ignore intervals shorter or equal"),
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index 18f1165..3f28e1d 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -484,7 +484,7 @@ multisite_painters["service_description"] = {
}
multisite_painters["service_display_name"] = {
- "title" : _("Service alternative dislay name"),
+ "title" : _("Service alternative display name"),
"short" : _("Display name"),
"columns" : ["service_display_name"],
"paint" : lambda row: (None, row["service_display_name"]),
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index e0bed14..4dd0e20 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -733,7 +733,7 @@ register_configvar(group,
("scope", DropdownChoice(
title = _("Search Scope"),
help = _("Scope to be used in group related LDAP searches. In most
cases "
- "<tt>Search whole subtree below the base
DN</tt> "
+ "<i>Search whole subtree below the base DN</i>
"
"is the best choice. It searches for matching objects in
the given base "
"recursively."),
choices = [
@@ -747,8 +747,8 @@ register_configvar(group,
title = _("Search Filter"),
help = _("Using this option you can define an optional LDAP filter
which is used "
"during group related LDAP searches. It can be used to only
handle a "
- "subset of the groups below the given base
DN.<br><br> "
- "e. g. <tt>(objectclass=group)</tt>"),
+ "subset of the groups below the given base
DN.<br><br>"
+ "e.g. <tt>(objectclass=group)</tt>"),
size = 80,
default_value = lambda: userdb.ldap_filter('groups', False),
attrencode = True,
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index bf522e2..e43c7ba 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -2444,7 +2444,7 @@ register_check_parameters(
register_check_parameters(
subgroup_applications,
"veeam_backup",
- _("Veeam Time since last Backup"),
+ _("Veeam: Time since last Backup"),
Dictionary(
elements = [
("age",
@@ -3456,7 +3456,7 @@ register_check_parameters(
),
( "upper",
Tuple(
- help = _("Upper levels for the FAN speed of a hardware
device"),
+ help = _("Upper levels for the Fan speed of a hardware
device"),
title = _("Upper levels"),
elements = [
Integer(title = _("warning if above"), unit =
u"rpm", default_value = 8000),