[checkmk-commits] Check_MK Git: check_mk: Fixed some English texts

Mathias Kettner mk at mathias-kettner.de
Thu Feb 19 10:12:21 CET 2015


Module: check_mk
Branch: master
Commit: 8240bcf0c8ab4268dcf45116722ce0d8f05f5048
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8240bcf0c8ab4268dcf45116722ce0d8f05f5048

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Thu Feb 19 10:11:22 2015 +0100

Fixed some English texts

Conflicts:
	web/plugins/wato/check_mk_configuration.py

---

 web/htdocs/dashboard.py                    |    2 +-
 web/htdocs/wato.py                         |   12 ++++++------
 web/plugins/wato/active_checks.py          |    2 +-
 web/plugins/wato/check_mk_configuration.py |    8 ++++----
 web/plugins/wato/check_parameters.py       |    7 +++----
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index 2a0ba54..8a5aed9 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -933,7 +933,7 @@ def page_edit_dashlet():
     html.end_context_buttons()
 
     vs_general = Dictionary(
-        title = _('General'),
+        title = _('General Settings'),
         render = 'form',
         optional_keys = ['title', 'title_url'],
         elements = [
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index cc4bac1..d20c9ba 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3870,7 +3870,7 @@ def mode_bulk_inventory(phase):
         if not complete_folder:
             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.</p>"))
+                     "services to be checked on your hosts."))
         forms.header(_("Bulk discovery"))
         forms.section(_("Mode"))
         html.radiobutton("how", "new",     True,  _("Find only new services") + "<br>")
@@ -6830,12 +6830,12 @@ def mode_snapshot(phase):
                                                                             status.get("broken_text"))
                 elif not status.get("checksums") and not config.wato_upload_insecure_snapshots:
                     if status["type"] == "legacy":
-                        raise MKUserError("_upload_file", _('The integrity of this snapshot could not be verified.<br><br>'
+                        raise MKUserError("_upload_file", _('The integrity of this snapshot could not be verified. '
                                           'You are restoring a legacy snapshot which can not be verified. The snapshot contains '
-                                          'files which contain code that will be executed during runtime of the monitoring.<br><br>'
+                                          'files which contain code that will be executed during runtime of the monitoring. '
                                           'The upload of insecure snapshots is currently disabled in WATO. If you want to allow '
-                                          'the upload of insecure snapshots you can activate it in the Global Settings under<br>'
-                                          '<tt>Configuration GUI (WATO) -> Allow upload of insecure WATO snapshots</tt>'))
+                                          'the upload of insecure snapshots you can activate it in the Global Settings under '
+                                          '<i>Configuration GUI (WATO) -> Allow upload of insecure WATO snapshots</i>'))
                     else:
                        raise MKUserError("_upload_file", _('The integrity of this snapshot could not be verified.<br><br>'
                                           'If you restore a snapshot on the same site as where it was created, the checksum should '
@@ -6945,7 +6945,7 @@ def mode_snapshot(phase):
 
         html.write("<h3>" + _("Restore from uploaded file") + "</h3>")
         html.write(_("Only supports snapshots up to 100MB. If your snapshot is larger than 100MB please copy it into the sites "
-                   "backup directory <tt>%s/wato/snapshots</tt>. It will then show up in the snapshots table.<br><br>") % defaults.var_dir)
+                   "backup directory <tt>%s/wato/snapshots</tt>. It will then show up in the snapshots table.") % defaults.var_dir)
         html.begin_form("upload_form", method = "POST")
         html.upload_file("_upload_file")
         html.button("upload_button", _("Restore from file"), "submit")
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 213f2d2..dc126e6 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -1668,7 +1668,7 @@ register_rule(group,
             )),
         ] + mail_receiving_params + [
             ('mail_from', EmailAddress(
-                title = _('Sender email address'),
+                title = _('From: email address'),
             )),
             ('mail_to', EmailAddress(
                 title = _('Destination email address'),
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 6ab4429..1e3f1c9 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1315,7 +1315,7 @@ register_configvar(group,
         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 "
-                 "discovry - the service discovery check is automatically rescheduled in order "
+                 "discovery - the service discovery check is automatically rescheduled in order "
                  "to reflect the new service state correctly immediately."),
         default_value = True,
     ))
@@ -2485,9 +2485,9 @@ register_rule(group,
     Transform(
         CascadingDropdown(
             title = _("Check for correct version of Check_MK agent"),
-            help = _("If you want to make sure all of your Check_MK agents are running"
-                     " one specific version, you may set it by this rule. Agents running "
-                     " some different version return a none ok state then"),
+            help = _("Here you can make sure that all of your Check_MK agents are running"
+                     " one specific version. Agents running "
+                     " a different version return a non-OK state."),
             choices = [
                 ("ignore",   _("Ignore the version")),
                 ("site",     _("Same version as the monitoring site")),
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 0a6fc6b..3cf1574 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -1586,7 +1586,7 @@ register_check_parameters(
     Dictionary(
         elements = [
             ( "power", Tuple(
-                title = _("Power"),
+                title = _("Transmit Power"),
                 help = _("The operational transmit power"),
                 elements = [
                     Float(title = _("warning at or below"), unit = "dBmV", default_value = 5.0 ),
@@ -1626,8 +1626,8 @@ register_check_parameters(
                 default_value = [ 1, 2, 13 ],
                 )),
             ( "tx_power", Tuple(
-                title = _("Power"),
-                help = _(" The operational transmit power"),
+                title = _("Transmit Power"),
+                help = _("The operational transmit power"),
                 elements = [
                     Float(title = _("warning at"), unit = "dBmV", default_value = 20.0 ),
                     Float(title = _("critical at"), unit = "dBmV", default_value = 10.0 ),
@@ -2013,7 +2013,6 @@ register_check_parameters(
                      ( 'levels',
                             Tuple(
                                 title = _("Maximum Number of E-Mails in Queue"),
-                                help = _("This rule applies to the number of e-mails in the various Exchange Message Queues"),
                                 elements = [
                                     Integer(title = _("Warning at"), unit = _("E-Mails")),
                                     Integer(title = _("Critical at"), unit = _("E-Mails"))



More information about the checkmk-commits mailing list