[checkmk-commits] Check_MK Git: check_mk: Fixed some further help texts and descriptions

Module: check_mk Branch: master Commit: a17d61a1fd29c002865597b13934c8a966d7a2f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a17d61a1fd29c0… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Jan 8 00:47:53 2014 +0100 Fixed some further help texts and descriptions --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- web/htdocs/wato.py | 10 +++++----- web/plugins/sidebar/wato.py | 2 +- web/plugins/views/availability.py | 2 +- web/plugins/views/filters.py | 2 +- web/plugins/wato/active_checks.py | 2 +- web/plugins/wato/check_mk_configuration.py | 4 ++-- web/plugins/wato/check_parameters.py | 4 ++-- web/plugins/wato/datasource_programs.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 579731b..2038676 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1385,7 +1385,7 @@ if mkeventd_enabled: config.declare_permission_section("mkeventd", _("Event Console")) config.declare_permission("mkeventd.config", - _("Configuration of event console "), + _("Configuration of Event Console "), _("This permission allows to configure the global settings " "of the event console."), ["admin"]) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2238712..28fadd3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6072,7 +6072,7 @@ def mode_ldap_config(phase): new_value = valuespec.from_html_vars(varname) valuespec.validate_value(new_value, varname) if current_settings.get(varname) != new_value: - msg = _("Changed ldap configuration variable %s to %s.") \ + msg = _("Changed LDAP configuration variable %s to %s.") \ % (varname, valuespec.value_to_text(new_value)) log_pending(SYNC, None, "edit-configvar", msg) current_settings[varname] = new_value @@ -6207,7 +6207,7 @@ def mode_ldap_config(phase): return True, _('Found all %d groups.') % num tests = [ - (_('Connect'), test_connect), + (_('Connection'), test_connect), (_('User Base-DN'), test_user_base_dn), (_('Count Users'), test_user_count), (_('Group Base-DN'), test_group_base_dn), @@ -7555,7 +7555,7 @@ def mode_edit_site_globals(phase): c = wato_confirm( _("Removing site-specific configuration variable"), _("Do you really want to remove the configuration variable <b>%s</b> " - "of the specifi configuration of this site and that way use the global value " + "of the specific configuration of this site and that way use the global value " "of <b><tt>%s</tt></b>?") % (varname, valuespec.value_to_text(def_value))) else: @@ -11965,7 +11965,7 @@ def mode_edit_rule(phase, new = False): return (back_mode, (new and _("Created new rule in ruleset '%s' in folder %s") - or _("Editor rule in ruleset '%s' in folder %s")) % + or _("Edited rule in ruleset '%s' in folder %s")) % (rulespec["title"], new_rule_folder["title"])) if rulespec.get("help"): @@ -13278,7 +13278,7 @@ def mode_bi_rules(phase): elif html.var("_del_aggr"): nr = int(html.var("_del_aggr")) c = wato_confirm(_("Confirm aggregation deletion"), - _("Do you really want to delete the aggregation number <b>%s</b>") % (nr+1)) + _("Do you really want to delete the aggregation number <b>%s</b>?") % (nr+1)) if c: del aggregations[nr] log_audit(None, "bi-delete-aggregation", _("Deleted BI aggregation number %d") % (nr+1)) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 539eed3..418af3f 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -246,7 +246,7 @@ def render_wato_foldertree(): render_tree_folder(user_folders.values()[0], 'wato_tree_click') sidebar_snapins['wato_foldertree'] = { - 'title' : _('Foldertree (standalone)'), + 'title' : _('Tree of Folders'), 'description' : _('This snapin shows the folders defined in WATO. It can be used to open views filtered by the WATO folder. It works standalone, without interaction with any other snapin.'), 'render' : render_wato_foldertree, 'allowed' : [ 'admin', 'user', 'guest' ], diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 8db618f..1176517 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1719,7 +1719,7 @@ def handle_delete_annotations(): if not annotation: return - if not html.confirm(_("Are you sure that you want to delete the annotation '%s'" % annotation["text"])): + if not html.confirm(_("Are you sure that you want to delete the annotation '%s'?" % annotation["text"])): return delete_annotation(annotations, site_host_svc, fromtime, untiltime) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 00d64be..36663ee 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -71,7 +71,7 @@ declare_filter(201, FilterText("service", _("Service (exact match)"), declare_filter(202, FilterText("service_display_name", _("Service alternative display name"), "service", "service_display_name", "service_display_name", "~~"), _("Alternative display name of the service, regex match")) -declare_filter(101, FilterText("hostgroupnameregex", _("Hostgroup)"), "hostgroup", "hostgroup_name", "hostgroup_name", "~~"), +declare_filter(101, FilterText("hostgroupnameregex", _("Hostgroup"), "hostgroup", "hostgroup_name", "hostgroup_name", "~~"), _("Search field allowing regular expressions and partial matches on the names of hostgroups")) declare_filter(101, FilterText("servicegroupnameregex", _("Servicegroup"), "servicegroup", "servicegroup_name", "servicegroup_name", "~~"), diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index dd13411..9f61da3 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -182,7 +182,7 @@ register_rule(group, TextAscii( title = _("Expected Address"), allow_empty = False, - help = _("Optional IP-ADDRESS you expect the DNS server to return. HOST" + help = _("Optional IP-Address you expect the DNS server to return. The host " "must end with a dot (.) " )), ), ( "expected_authority", diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 84f08f6..e0bed14 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -646,8 +646,8 @@ register_configvar(group, )), ("scope", DropdownChoice( title = _("Search Scope"), - help = _("Scope to be used in LDAP searches. In most cases <tt>Search whole subtree below " - "the base DN</tt> is the best choice. " + help = _("Scope to be used in LDAP searches. In most cases <i>Search whole subtree below " + "the base DN</i> is the best choice. " "It searches for matching objects recursively."), choices = [ ("sub", _("Search whole subtree below the base DN")), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4fe0971..bf522e2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3447,7 +3447,7 @@ register_check_parameters( elements = [ ("lower", Tuple( - help = _("Lower levels for the FAN speed of a hardware device"), + help = _("Lower levels for the fan speed of a hardware device"), title = _("Lower levels"), elements = [ Integer(title = _("warning if below"), unit = u"rpm"), @@ -3761,7 +3761,7 @@ register_check_parameters( ), ("level_high", Tuple( - title = _("Higher levels"), + title = _("Upper levels"), elements = [ Integer(title = _( "Warning if above"), unit=_("l/s")), Integer(title = _( "Critical if above"), unit=_("l/s")) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 301932d..c906850 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -152,7 +152,7 @@ register_rule(group, Integer( title = _("Port Number"), default_value=8161 ), ListChoice( choices = [ - ("piggybag", _("Run in piggybag mode")), + ("piggybag", _("Run in piggyback mode")), ], allow_empty = True )