From 75da453e9cfe6e65b253680b1af160e65cb693b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 7 Oct 2010 18:09:46 +0400 Subject: [PATCH] Fix translate. --- i18n/cl_lib_ru.mo | Bin 409 -> 24306 bytes pym/cl_opt.py | 6 +++--- pym/cl_template.py | 20 ++++++++++---------- pym/format/xml_gconf.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/i18n/cl_lib_ru.mo b/i18n/cl_lib_ru.mo index 323ab4b8af04a08c3c5d788961f4eac269453e71..bd2cc04cf186edd60c0b33c71f0f79157a68bed9 100644 GIT binary patch literal 24306 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

Wg6RoAb)W;on7y!nQ;8#l}&Z|AgkV10eG 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 Zp~Srj*JTWwDxKm=5!yCQX8A_L{{f}m;gSFV delta 139 zcmeygmvJU@=sh8psSH5C1jI5xtOLZXKx_lVAP@k=EI=Fx#HNf43}HZ;2Z(!sY#@RI zkbW@8NX;pjT%#Q*XkejhV61CstYBzhWn!sqU_AMr_B!U$lC;VFIx4&u=3m%%Vb6tq K7dtQZFaQA0IvVf* 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'))