From 1893f0098f500662703b93331cf18796ded44390 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Fri, 21 Jun 2013 09:30:18 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B0=D0=BD=D0=B3=D0=BB=D0=B8=D0=B9=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calculate/lib/cl_template.py   |  6 +++---
 calculate/lib/format/diff.py   |  2 +-
 calculate/lib/utils/common.py  |  2 +-
 calculate/lib/variables/env.py | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/calculate/lib/cl_template.py b/calculate/lib/cl_template.py
index c205448..054ddb6 100644
--- a/calculate/lib/cl_template.py
+++ b/calculate/lib/cl_template.py
@@ -3091,7 +3091,7 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction):
         return textTemplateTmp
         self.printERROR(_(funArgv))
         raise TemplatesInterrupt(_("Execution of templates was "
-                                   "interrupted with the error"),
+                                   "interrupted with an error"),
                                  TemplatesInterrupt.ABORT)
 
     def getElogTimestamp(self):
@@ -4317,7 +4317,7 @@ gettext -d cl_template "$*"
             self.printWARNING("")
             self.printWARNING(_("Headers of directory templates and headers "
                          "of files on the first level should include "
-                         "an action variable."))
+                         "an action variable"))
             self.printWARNING(_("Example:"))
             self.printWARNING("# Calculate ac_install_merge==on")
         return skipDirs + skipTemplates
@@ -4577,7 +4577,7 @@ gettext -d cl_template "$*"
         self.filesApply = map(lambda x:autoUpdateDict.get(x,x),self.filesApply)
         if filter(lambda x:"._cfg" in x, self.filesApply):
             self.printWARNING(_("Some config files need updating. "
-                                "Perform dispatch-conf."))
+                                "Perform run dispatch-conf."))
             if self.dispatchConf and \
                 self.objVar.Get('cl_dispatch_conf') == 'dispatch' and \
                 self.objVar.Get('cl_ebuild_phase') == '':
diff --git a/calculate/lib/format/diff.py b/calculate/lib/format/diff.py
index 70d056b..76634b3 100644
--- a/calculate/lib/format/diff.py
+++ b/calculate/lib/format/diff.py
@@ -49,7 +49,7 @@ class diff(_error):
             if patchDryRun.success():
                 return ""
         else:
-            self.setError(_("Patch failed"))
+            self.setError(_("Correction failed"))
             return False
         patchRun = process('/usr/bin/patch',
                   '-p%d'%i,cwd=rootPath)
diff --git a/calculate/lib/utils/common.py b/calculate/lib/utils/common.py
index d9bb232..6a0526d 100644
--- a/calculate/lib/utils/common.py
+++ b/calculate/lib/utils/common.py
@@ -439,7 +439,7 @@ def mountEcryptfs(userName,userPwd,userDir):
         else:
             raise Exception
     except:
-        raise CommonError(_("Failed to unwrap passphrase"))
+        raise CommonError(_("Failed to unwrap the passphrase"))
 
     # добавить passphrase в ключи ядра
     p = process('/usr/bin/ecryptfs-add-passphrase', '--fnek', '-',stderr=STDOUT)
diff --git a/calculate/lib/variables/env.py b/calculate/lib/variables/env.py
index c5f5598..f69d2c6 100644
--- a/calculate/lib/variables/env.py
+++ b/calculate/lib/variables/env.py
@@ -212,14 +212,14 @@ class VariableClDispatchConf(Variable):
     metavalue = "METHOD"
 
     def init(self):
-        self.help = "'usenew' - " +_("use new config files") +\
-                    ",\n'skip' - " + _("skip the update config files") +\
+        self.help = "'usenew' - " +_("use the new config files") +\
+                    ",\n'skip' - " + _("skip the update of config files") +\
                     ",\n'dispatch' - " + _("manually update config files")
-        self.label = _("Update config files method")
+        self.label = _("Method for updating config files")
 
     def choice(self):
-        return [("usenew",_("Use new config files")),
-                ("skip",_("Skip the update config files")),
+        return [("usenew",_("Use the new config files")),
+                ("skip",_("Skip the update of config files")),
                 ("dispatch",_("Manually update config files"))]
 
 class VariableClWsdl(Variable):