diff --git a/i18n/cl_lib_ru.mo b/i18n/cl_lib_ru.mo index 323ab4b..bd2cc04 100644 Binary files a/i18n/cl_lib_ru.mo and b/i18n/cl_lib_ru.mo differ diff --git a/pym/cl_opt.py b/pym/cl_opt.py index fb3c064..61ef616 100644 --- a/pym/cl_opt.py +++ b/pym/cl_opt.py @@ -274,11 +274,11 @@ class opt(optparse.OptionParser): {'longOption':"filter", 'optVal':"FILTER", 'help':_("filtered variables (as a regular expression is used *), \ -is used in conjunction with the options '-v - vars'") +is used in conjunction with the options '-v --vars'") }, {'longOption':"xml", - 'help':_("output variables in the form of XML, \ -is used in conjunction with the option '-v - vars'") + 'help':_("output variables in the format of XML, \ +is used in conjunction with the option '-v --vars'") }] color_control = \ diff --git a/pym/cl_template.py b/pym/cl_template.py index de80ace..698b266 100644 --- a/pym/cl_template.py +++ b/pym/cl_template.py @@ -3101,8 +3101,8 @@ or 'lower' or 'capitalize'")) cl_overriding.exit(1) if len(valueVar) != len(valueElementVar): cl_overriding.printERROR(\ - _("size %s is not equal to the size of %s")\ - %(nameVar, nameElementVar)) + _("size %(name)s is not equal to the size of %(nameElement)s")\ + %{'name':nameVar, 'nameElement':nameElementVar}) self.printErrTemplate() cl_overriding.exit(1) index = None @@ -3584,8 +3584,8 @@ variable 'cl-name'")) for skipDir in skipDirs: setWARNING(" "*6 + skipDir) setWARNING("") - setWARNING(_("Headers directory and template files first level \ -should include a check of the variable 'cl-name'.")) + setWARNING(_("Headers directory and template files first level "\ + "should include of the 'cl-name' variable.")) setWARNING(_("Example:")) setWARNING("# Calculate cl_name==calculate-install") return skipDirs + skipTemplates @@ -4953,8 +4953,8 @@ class iniParser(_error, templateFormat): classObj = self.getClassObj("plasma") else: if nameFomat == "plasma": - self.setError(_("In the file %s (format - 'plasma'), \ - write the variable in the format 'samba'")\ + self.setError(_("In the file %s (format - 'plasma'), "\ + "write the variable in the format 'samba'")\ %self.iniFile) return False # формат samba @@ -5055,8 +5055,8 @@ class iniParser(_error, templateFormat): formatPlasma = True else: if nameFomat == "plasma": - self.setError(_("In the file %s (format - 'plasma'), \ - get the variable in the format 'samba'")\ + self.setError(_("In the file %s (format - 'plasma'), "\ + "get the variable in the format 'samba'")\ %self.iniFile) return False # формат samba @@ -5119,8 +5119,8 @@ class iniParser(_error, templateFormat): formatPlasma = True else: if nameFomat == "plasma": - self.setError(_("In the file %s (format - 'plasma'), \ - get all variables in the format 'samba'")\ + self.setError(_("In the file %s (format - 'plasma'), "\ + "get all variables in the format 'samba'")\ %self.iniFile) return False # формат samba diff --git a/pym/format/xml_gconf.py b/pym/format/xml_gconf.py index 1d13853..e581535 100644 --- a/pym/format/xml_gconf.py +++ b/pym/format/xml_gconf.py @@ -119,7 +119,7 @@ class xml_gconf(xml_xfce): else: if not tagName == "entry": self.setError(_("The text is not a valid gconf-XML format \ -(found '<%s>..'")%(tagName,tagName)) +(found '<%(tag)s>..'")%{'tag':tagName}) return False if not n.hasAttribute("name"): self.setError(_('Not found arrtibute "name" in tag entry'))