Fix translate.

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, \
+         'help':_("output variables in the format of XML, \
-is used in conjunction with the option '-v - vars'")
+is used in conjunction with the option '-v --vars'")
         }]
 
     color_control = \

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")\
+                _("size %(name)s is not equal to the size of %(nameElement)s")\
-                  %(nameVar, nameElementVar))
+                  %{'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 \
+            setWARNING(_("Headers directory and template files first level "\
-should include a check of the variable 'cl-name'."))
+                         "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'), \
+                self.setError(_("In the file %s (format - 'plasma'), "\
-                                write the variable in the format 'samba'")\
+                                "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'), \
+                self.setError(_("In the file %s (format - 'plasma'), "\
-                                get the variable in the format 'samba'")\
+                                "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'), \
+                self.setError(_("In the file %s (format - 'plasma'), "\
-                                get all variables in the format 'samba'")\
+                                "get all variables in the format 'samba'")\
                                 %self.iniFile)
                 return False
             # формат samba

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 '<gconf><%s>..</%s></gconf>'")%(tagName,tagName))
+(found '<gconf><%(tag)s>..</%(tag)s></gconf>'")%{'tag':tagName})
                     return False
                 if not n.hasAttribute("name"):
                     self.setError(_('Not found arrtibute "name" in tag entry'))