From 5ee8a1d0db050e0aad3901fb7d977eaef89d826e Mon Sep 17 00:00:00 2001
From: Mike khiretskiy <mh@calculate.ru>
Date: Fri, 4 Oct 2013 10:39:22 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/utils/cl_setup.py          | 12 ++++++------
 install/variables/autopartition.py |  5 ++---
 install/variables/distr.py         |  2 +-
 install/variables/system.py        |  6 +++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/install/utils/cl_setup.py b/install/utils/cl_setup.py
index c5622dc..fab08b9 100644
--- a/install/utils/cl_setup.py
+++ b/install/utils/cl_setup.py
@@ -86,7 +86,7 @@ class ClSetupSystemAction(ClSetupVideoAction):
     """
     Объект настройки всех параметров системы
     """
-    templateTaskMessage = __("System are being configured")
+    templateTaskMessage = __("The system is being configured")
     successMessage = __("System configured!")
     failedMessage = __("Failed to configure the system!")
 
@@ -95,7 +95,7 @@ class ClSetupAudioAction(ClSetupSystemAction):
     Действие для настройки аудио параметров
     """
     addon_tasks = []
-    templateTaskMessage = __("Audio settings are being configured")
+    templateTaskMessage = __("The audio settings are being configured")
     successMessage = __("Audio settings configured!")
     failedMessage = __("Failed to configure the audio parameters!")
 
@@ -105,7 +105,7 @@ class ClSetupLocaleAction(ClSetupSystemAction):
     """
     addon_tasks = []
     templateTaskMessage = \
-        __("Localization and time options are being configured")
+        __("The localization and time options are being configured")
     successMessage = __("System configured!")
     failedMessage = __("Failed to configure the system!")
 
@@ -114,7 +114,7 @@ class ClSetupNetworkAction(ClSetupSystemAction):
     Действие для настройки аудио параметров
     """
     addon_tasks = []
-    templateTaskMessage = __("Network settings are being configured")
+    templateTaskMessage = __("The network settings are being configured")
     successMessage = __("Network settings configured!")
     failedMessage = __("Failed to configure the network settings!")
 
@@ -123,7 +123,7 @@ class ClSetupUsersAction(ClSetupSystemAction):
     Действие для настройки пользовательских параметров
     """
     addon_tasks = []
-    templateTaskMessage = __("User settings are being configured")
+    templateTaskMessage = __("The user settings are being configured")
     successMessage = __("User settings configured!")
     failedMessage = __("Failed to configure the user settings!")
 
@@ -131,7 +131,7 @@ class ClSetupBootAction(ClSetupSystemAction):
     """
     Действие для настройки параметров загрузки
     """
-    templateTaskMessage = __("Boot parameters are being configured")
+    templateTaskMessage = __("The boot parameters are being configured")
     successMessage = __("Boot parameters configured!")
     failedMessage = __("Failed to configure the boot parameters!")
 
diff --git a/install/variables/autopartition.py b/install/variables/autopartition.py
index 03e272b..321b1cd 100644
--- a/install/variables/autopartition.py
+++ b/install/variables/autopartition.py
@@ -530,12 +530,11 @@ class VariableClAutopartitionScheme(AutopartitionHelper,Variable,AutoPartition):
         else:
             if self.Get('cl_autopartition_table') == 'gpt' and not "grub" in value:
                 raise VariableError(
-                    _("The 'bios_grub' partition is needed for grub install"))
+                    _("A 'bios_grub' partition is needed to install grub"))
         if "grub" in value:
             if self.Get('cl_autopartition_table') != 'gpt':
                 raise VariableError(
-                    _("For the bios_grub partition, the partition table "
-                      "must be GPT"))
+                    _("The bios_grub partition need the partition table to be GPT"))
 
 
 class VariableClAutopartitionRootSize(AutopartitionHelper,Variable):
diff --git a/install/variables/distr.py b/install/variables/distr.py
index 7719972..5c23c17 100644
--- a/install/variables/distr.py
+++ b/install/variables/distr.py
@@ -293,7 +293,7 @@ class VariableClImageFilename(Variable,DistroRepository):
     def check(self,isoimage):
         """Set image file"""
         if self.Get('cl_action') == 'system' and not isoimage:
-            raise VariableError(_("Need to choice distribute image"))
+            raise VariableError(_("You need to select a distribution image"))
         imageData = Distributive().getInfo(isoimage)
         if not("os_linux_shortname" in imageData and \
                imageData.get('os_linux_build','') and \
diff --git a/install/variables/system.py b/install/variables/system.py
index c54bd87..4fc82e3 100644
--- a/install/variables/system.py
+++ b/install/variables/system.py
@@ -170,8 +170,8 @@ class VariableClInstallHomeCryptSet(UserHelper,Variable):
     untrusted = True
 
     def init(self):
-        self.help = _("crypt user profiles")
-        self.label = _("Crypt user profiles")
+        self.help = _("Encrypt user profiles")
+        self.label = _("Encrypt user profiles")
 
     def get(self):
         return ("off" if self.Get('cl_autologin')
@@ -180,7 +180,7 @@ class VariableClInstallHomeCryptSet(UserHelper,Variable):
     def check(self,value):
         if value == "on" and self.Get('cl_autologin'):
             raise VariableError(
-                _("Crypt user profile uncompatible with autologin"))
+                _("User profile encryption is uncompatible with autologin"))
 
 class VariableClMigrateData(UserHelper,TableVariable):
     """