[checkmk-commits] Fixed some spellings and formulations

Module: check_mk Branch: master Commit: a29a37aad50546042021645e34f1877221a7c504 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29a37aad50546… Author: Konstantin Büttner &lt;kb(a)mathias-kettner.de&gt; Date: Tue Apr 26 13:26:58 2016 +0200 Fixed some spellings and formulations Conflicts: web/htdocs/metrics.py --- web/htdocs/metrics.py | 2 +- web/plugins/dashboard/dashlets.py | 2 +- web/plugins/views/painters.py | 2 +- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index d92b21c..172fdbd3a 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1467,7 +1467,7 @@ def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_opti else: raise MKGeneralException(_("Failed to calculate a graph definition.")) except MKLivestatusNotFoundError: - html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot reander graphs: cannot fetch data via Livestatus"))) + html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot render graphs: cannot fetch data via Livestatus"))) return # When the legend is enabled, we need to reduce the height by the height of the legend to diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 70d8d23..f32bcba 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -827,7 +827,7 @@ dashlet_types["snapin"] = { "parameters" : [ ('snapin', DropdownChoice( title = _('Snapin'), - help = _('Choose the snapin you like to show.'), + help = _('Choose the snapin you would like to show.'), choices = dashlet_snapin_get_snapins, )), ], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index e888ce4..4c04472 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -783,7 +783,7 @@ def paint_cache_info(row): cache_interval = row["service_cache_interval"] cache_age = time.time() - cached_at percentage = 100.0 * cache_age / cache_interval - return "", _("Cache generated %s ago, cache interval: %s, elapsed cache livetime: %s") % ( + return "", _("Cache generated %s ago, cache interval: %s, elapsed cache lifespan: %s") % ( age_human_readable(cache_age), age_human_readable(cache_interval), percent_human_redable(percentage)) multisite_painters["svc_check_cache_info"] = { diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 44664f2..98695eb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2166,11 +2166,11 @@ register_rule(group, register_rule(group, "non_inline_snmp_hosts", title = _("Hosts not using Inline-SNMP"), - help = _("Check_MK has an efficicient SNMP implementation called Inline-SNMP which reduces the " - "load produced by SNMP monitoring on the monitoring host significant. This option is " + help = _("Check_MK has an efficient SNMP implementation called Inline SNMP which reduces the " + "load produced by SNMP monitoring on the monitoring host significantly. This option is " "enabled by default for all SNMP hosts and it is a good idea to keep this default " - "settings. However, there are SNMP devices which have problems with this SNMP " - "implementation. You can use this rule to disable Inline-SNMP for these hosts.")) + "setting. However, there are SNMP devices which have problems with this SNMP " + "implementation. You can use this rule to disable Inline SNMP for these hosts.")) register_rule(group,