Синхронизация переводов

client/client.py

@@ -420,7 +420,7 @@ class Client(commandServer, encrypt, Desktop):
                     return False
             elif stat.S_ISSOCK(os.stat(delFile)[stat.ST_MODE]):
                 os.remove(delFile)
-        self.printSUCCESS(_("Clean local user profile"))
+        self.printSUCCESS(_("Cleaning the local user profile"))
         return True
 
     def syncLoginProfile(self,host,uid,gid,homeDir,resourceName,
@@ -701,7 +701,7 @@ class Client(commandServer, encrypt, Desktop):
                        where='cl_client_user_mount_name', eq=resourceName,
                        limit=1)
         if not isMount(resourcePath):
-            raise ClientError(_("%s is not mounted")%resourcePath)
+            raise ClientError(_("Unable to mount %s")%resourcePath)
         movedPath = path.join(resourcePath, movedDir)
         movedLink = path.join(userHome,movedDir)
         dirs = []
@@ -1127,7 +1127,7 @@ class Client(commandServer, encrypt, Desktop):
             self.clVars.Write("os_remote_auth", hostAuth, True)
         else:
             self.printSUCCESS(_("The workstation is configured for work "
-                              "without the domain"))
+                              "outside the domain"))
             self.clVars.Delete("os_remote_auth")
             self.clVars.Delete("os_remote_client")
         return True

client/utils/cl_client.py

@@ -143,7 +143,7 @@ class ClClientAction(Action):
           'message':__("Computer removed from domain {cl_remote_host}")
          },
          {'name':'undomain:failed',
-          'error':__("Failed to remove the computer from domain"),
+          'error':__("Failed to remove the computer from the domain"),
           'depend':Tasks.failed() & Tasks.hasnot("interrupt"),
          },
          ]

client/utils/cl_client_sync.py

@@ -219,7 +219,7 @@ class ClClientSyncLoginAction(Action):
          },
          # синхронизация профиля завершилась успешно
          {'name':'domain_sync:success_sync',
-          'message':__("Get the user profile from domain"),
+          'message':__("User profile fetched from the domain"),
           'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"success")',
           'depend': Tasks.success_all('sync_remote','unpack_links') |
                     Tasks.success()
@@ -258,7 +258,7 @@ class ClClientSyncLogoutAction(Action):
           'condition':lambda Get: (Get('os_remote_auth') and 
                                    Get('cl_remote_host') and 
                                    Get('desktop.ur_domain_set') == 'on'),
-          'else_message':__("The local profile is used")
+          'else_message':__("The local profile will be used")
          },
          # проверка на попытку отключить ресурсы пользователя в X сессии
          {'name':'domain_user:in_xsession',
@@ -275,7 +275,7 @@ class ClClientSyncLogoutAction(Action):
          {'name':'domain_user:check_mount',
           'condition':lambda Get:any(x and isMount(x) 
                               for x in Get('cl_client_user_mount_path')),
-          'else_error':__("User remote resources not found")
+          'else_error':__("Remote user resources not found")
          },
          # установить время выхода из сеанса
          {'name':'domain_user:set_logout_date',
@@ -285,11 +285,11 @@ class ClClientSyncLogoutAction(Action):
          {'name':'domain_user:domain_sync',
           'condition':lambda Get:Get('cl_client_sync_status') == 'success' and
                                  Get('cl_client_sync') == 'on',
-          'else_warning':__("Profile will not be upload to domain")
+          'else_warning':__("The profile will not be uploaded to domain")
          },
          # переместить файлы из профиля в Moved
          {'name':'domain_user:move_home_dir',
-          'message':__("Moving not profile files to Home/Moved directory"),
+          'message':__("Moving non-profile files to Home/Moved directory"),
           'method':'Client.moveHomeDir(ur_home_path,"Moved","homes",'
                    'cl_moved_skip_path)',
          },
@@ -317,7 +317,7 @@ class ClClientSyncLogoutAction(Action):
          },
          # удалить пользовательские ключи ядра
          {'name':'domain_user!:clear_user_key',
-          'message':__("Clearing user key"),
+          'message':__("Clearing user keys"),
           'method':'Client.clearUserKey(ur_login)'
          },
          # отключить пользовательские ресурсы

client/variables/client.py

@@ -619,7 +619,7 @@ class VariableClClientSyncReplicationSet(SyncHelper,ReadonlyVariable):
                         where='cl_client_user_mount_name',
                         eq='remote_profile',limit=1)
         if self.Get('cl_action') == 'login' and not isMount(profilePath):
-            raise VariableError(_("Remote profile is not mounted"))
+            raise VariableError(_("Remote profile not mounted"))
         return "on" if self.checkNeedSync(self.Get('ur_home_path'),profilePath,
                     self.Get('cl_client_sync_time'),
                     self.Get('cl_client_sync_status'),
@@ -638,7 +638,7 @@ class VariableClClientSyncLocalSet(SyncHelper,ReadonlyVariable):
                         where='cl_client_user_mount_name',
                         eq='unix',limit=1)
         if self.Get('cl_action') == 'login' and not isMount(profilePath):
-            raise VariableError(_("Remote profile is not mounted"))
+            raise VariableError(_("Remote profile not mounted"))
         return "on" if self.checkNeedSync(self.Get('ur_home_path'),profilePath,
                     self.Get('cl_client_sync_time'),
                     self.Get('cl_client_sync_status'),