Module: check_mk
Branch: master
Commit: 6f6623c69431d308b4225e0df160244559c10f9d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f6623c69431d3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Feb 9 11:06:19 2015 +0100
Fixed some englisch texts
---
web/htdocs/wato.py | 10 +++++-----
web/plugins/views/datasources.py | 3 +--
web/plugins/wato/active_checks.py | 6 +++---
web/plugins/wato/check_mk_configuration.py | 4 ++--
web/plugins/wato/check_parameters.py | 2 +-
web/plugins/wato/datasource_programs.py | 4 ++--
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 858ec79..7fd30f4 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6493,12 +6493,12 @@ def get_snapshot_status(snapshot, validate_checksums = False):
using_cmc = os.path.exists(defaults.omd_root +
'/etc/check_mk/conf.d/microcore.mk')
snapshot_cmc = 'conf.d/microcore.mk' in files
if using_cmc and not snapshot_cmc:
- raise MKGeneralException(_('You are currently using the Check_MK
Microcore, but this snapshot does not use the '
- 'Check_MK Microcore. If you need to migrate
your data, you could consider changing '
+ raise MKGeneralException(_('You are currently using the Check_MK Micro
Core, but this snapshot does not use the '
+ 'Check_MK Micro Core. If you need to migrate
your data, you could consider changing '
'the core, restoring the snapshot and changing
the core back again.'))
elif not using_cmc and snapshot_cmc:
- raise MKGeneralException(_('You are currently not using the Check_MK
Microcore, but this snapshot uses the '
- 'Check_MK Microcore. If you need to migrate
your data, you could consider changing '
+ raise MKGeneralException(_('You are currently not using the Check_MK
Micro Core, but this snapshot uses the '
+ 'Check_MK Micro Core. If you need to migrate
your data, you could consider changing '
'the core, restoring the snapshot and changing
the core back again.'))
def snapshot_secret():
@@ -9786,7 +9786,7 @@ def mode_edit_timeperiod(phase):
# Excludes
if other_tps:
forms.section(_("Exclude"))
- html.help(_('You can use other timeperiod defnitions to exclude the times
'
+ html.help(_('You can use other timeperiod definitions to exclude the times
'
'defined in the other timeperiods from this current
timeperiod.'))
vs_excl.render_input("exclude", timeperiod.get("exclude",
[]))
diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py
index 13af5fb..a861ae7 100644
--- a/web/plugins/views/datasources.py
+++ b/web/plugins/views/datasources.py
@@ -89,8 +89,7 @@ multisite_datasources["hostsbygroup"] = {
"keys" : [ "host_name", "host_downtimes" ],
"join" : ( "services", "host_name" ),
"idkeys" : [ "site", "hostgroup_name",
"host_name" ],
- "description" : _("Using this, datasources host rows might appear
multiple times depending "
- "on their membership in hostgroups."),
+ "description" : _("This datasource has a separate row for each group
membership that a host has."),
}
multisite_datasources["services"] = {
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 6c7bf48..213f2d2 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -1786,7 +1786,7 @@ register_rule(group,
('match_subject', RegExpUnicode(
title = _('Only process mails with matching subject'),
help = _('Use this option to not process all messages found
in the inbox, '
- 'but only the whones whose subject matches the given
regular expression. '),
+ 'but only the those whose subject matches the given
regular expression.'),
)),
('facility', DropdownChoice(
title = _("Events: Syslog facility"),
@@ -1805,8 +1805,8 @@ register_rule(group,
TextUnicode(
title = _("Specify the application"),
help = _("Use this text as application. You can use
macros like <tt>\\1</tt>, <tt>\\2</tt>, ... "
- "here when you configured <i>subject
matching</i> in this rule with a regex "
- "which declares match groups (using
braces)."),
+ "here when you configured <i>subject
matching</i> in this rule with a regular expression "
+ "that declares match groups (using
braces)."),
allow_empty = False,
),
]
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index 6d825cb..3fffbd5 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -974,10 +974,10 @@ register_configvar(group,
"password_policy",
Dictionary(
title = _('htpasswd: Password Policy'),
- help = _('You can define some rules which each user password must fit with.
By default '
+ help = _('You can define some rules to which each user password aher. By
default '
'all passwords are accepted, even ones which are made of only a
single character, '
'which is obviously a bad idea. Using this option you can enforce
your users '
- 'to choose more secure passwords of a minimal length having a
defined complexity.'),
+ 'to choose more secure passwords.'),
elements = [
('min_length', Integer(
title = _("Minimum password length"),
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index bff87cf..fe041c7 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -5105,7 +5105,7 @@ register_check_parameters(
"netapp_disks",
_("NetApp Broken/Spare Disk Ratio"),
Dictionary(
- help = _("You can set level of the broken to spare disk ratio. "
+ help = _("You can set a limit to the broken to spare disk ratio. "
"The ratio is calculated with <i>broken / (broken +
spare)</i>."),
elements = [
( "broken_spare_ratio",
diff --git a/web/plugins/wato/datasource_programs.py
b/web/plugins/wato/datasource_programs.py
index 4da6710..ca703ef 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -197,7 +197,7 @@ register_rule(group,
optional_keys = False
),
title = _("Check NetApp via WebAPI"),
- help = _("This rule selects the NetApp special agent instead of the normal
Check_MK Agent "
+ help = _("This rule set 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> 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>) "
@@ -284,7 +284,7 @@ register_rule(group,
"special_agents:ibmsvc",
Dictionary(
title = _("Check state of IBM SVC / V7000 storage systems"),
- help = _("This rule selects the ibmsvc agent instead of the normal Check_MK
Agent "
+ help = _("This rule set selects the <tt>ibmsvc</tt> agent
instead of the normal Check_MK Agent "
"and allows monitoring of IBM SVC / V7000 storage systems by
calling "
"ls* commands there over SSH. "
"Make sure you have SSH key authentication enabled for your
monitoring user. "