Module: check_mk
Branch: master
Commit: 7a9226a54765473ad32bf2fbea687b36b44c6c60
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a9226a5476547…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Feb 23 10:49:56 2015 +0100
Fixed some english Texts
---
web/htdocs/wato.py | 10 +++++-----
web/plugins/wato/active_checks.py | 8 ++++----
web/plugins/wato/check_mk_configuration.py | 2 +-
web/plugins/wato/check_parameters.py | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 4cbfe4b..bcb7056 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3181,7 +3181,7 @@ def show_service_table(host, firsttime):
except Exception, e:
if config.debug:
raise
- html.show_error(_("Inventory failed for this host: %s") % e)
+ html.show_error(_("Service discovery failed for this host: %s") % e)
return
checktable.sort()
@@ -3676,7 +3676,7 @@ def mode_bulk_import(phase):
html.text_area('_hosts', cols = 70, rows = 10)
forms.section(_('Options'))
- html.checkbox('_do_service_detection', False, label = _('Perform
automatic service detection'))
+ html.checkbox('_do_service_detection', False, label = _('Perform
automatic service discovery'))
forms.end()
html.button('_import', _('Import'))
@@ -3881,7 +3881,7 @@ def mode_bulk_inventory(phase):
html.write(_("You have selected <b>%d</b> hosts for bulk
discovery. ") % len(hostnames))
html.write(_("Check_MK service discovery will automatically find and
configure "
"services to be checked on your hosts."))
- forms.header(_("Bulk discovery"))
+ forms.header(_("Bulk Discovery"))
forms.section(_("Mode"))
html.radiobutton("how", "new", True, _("Find only
new services") + "<br>")
html.radiobutton("how", "remove", False, _("Remove
obsolete services") + "<br>")
@@ -11626,8 +11626,8 @@ def load_notification_table():
( "only_hosts",
ListOfStrings(
title = _("Limit to the following
hosts"),
- help = _("Configure the hosts for this
notification. Without prefix, only exact, case sensitive matches,"
- "! for negation and ~ for regex
matches " ),
+ help = _("Configure the hosts for this
notification. Without prefix, only exact, case sensitive matches, "
+ "<tt>!</tt> for
negation and <tt>~</tt> for regex matches."),
orientation = "horizontal",
valuespec = RegExp(size = 20),
),
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index dc126e6..1f64d93 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -194,12 +194,12 @@ register_rule(group,
),
("remote_version",
TextAscii(
- title = _("Remote Version"),
+ title = _("Version of Server"),
help = _("Warn if string doesn't match expected server
version (ex: OpenSSH_3.9p1)"),
)),
("remote_protocol",
TextAscii(
- title = _("Remote Protocol"),
+ title = _("Protocol of Server"),
help = _("Warn if protocol doesn't match expected protocol
version (ex: 2.0)"),
)),
]
@@ -1420,8 +1420,8 @@ register_rule(group,
default_value = 'cookie',
choices = [
('cookie', _('Form (Cookie) based')),
- ('basic', _('HTTP basic')),
- ('digest', _('HTTP digest')),
+ ('basic', _('HTTP Basic')),
+ ('digest', _('HTTP Digest')),
],
)),
("timeout", Integer(
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index af5220a..63210bb 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1312,7 +1312,7 @@ register_configvar(group,
register_configvar(group,
"inventory_check_autotrigger",
Checkbox(
- title = _("Service Discovery triggers service discovery check"),
+ title = _("Service discovery triggers service discovery check"),
label = _("Automatically schedule service discovery check after service
configuration changes"),
help = _("When this option is enabled then after each change of the service
"
"configuration of a host via WATO - may it be via manual changes or
a bulk "
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 7da255c..43118a0 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -300,7 +300,7 @@ register_rule(group + '/' + subgroup_inventory,
register_rule(group + '/' + subgroup_inventory,
varname = "brocade_fcport_inventory",
- title = _("Brocade Port Inventory"),
+ title = _("Brocade Port Discovery"),
valuespec = Dictionary(
elements = [
("use_portname", Checkbox(
@@ -3091,7 +3091,7 @@ register_check_parameters(
),
( "guestToolsNotInstalled",
MonitoringState(
- title = _("VMware Tools has never been installed"),
+ title = _("VMware Tools have never been installed"),
default_value = 2,
)
),
@@ -3839,7 +3839,7 @@ register_check_parameters(
TextAscii(
title = _("Scheduler Job Name"),
help = _("Here you can set explicit Scheduler-Jobs by defining them via SID,
Job-Owner "
- "and Job-Name, separated by a dot, for example
<b>TUX12C.SYS.PURGE_LOG</b>"),
+ "and Job-Name, separated by a dot, for example
<tt>TUX12C.SYS.PURGE_LOG</tt>"),
regex = '.+\..+',
allow_empty = False),
None
@@ -5128,7 +5128,7 @@ register_check_parameters(
register_check_parameters(
subgroup_storage,
"drbd",
- _("DRBD roles and diskstates"),
+ _("DR:BD roles and diskstates"),
Dictionary(
elements = [
( "roles",