calculate
/
calculate-utils-3-client
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Обновление перевода

Browse Source
develop 3.3.0.2
Mike Khiretskiy 9 years ago
parent 65ed2597e9
commit ee3cc1cf05
6 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

18
pym/client/client.py
Unescape View File

@ -331,12 +331,12 @@ class Client(commandServer, encrypt, Desktop):
-rlpt -x -v -v -v %s/ %s/'%(excludePaths, userHome, remoteProfile)
else:
raise ClientError(
_("Method syncUser: option sync=%s is incorrect")%str(sync))
_("Method syncUser: wrong option sync=%s")%str(sync))
if execStr:
host = "<i>" + host +"</i>"
if sync == "login":
rsync = RsyncProgressBar(\
_("Receiving the file list from %s") % host,
_("Fetching the file list from %s") % host,
_("Fetching the user profile from %s") % host,
execStr,self)
else:
@ -626,7 +626,7 @@ class Client(commandServer, encrypt, Desktop):
os.chown(userdir, uid, gid)
os.chmod(userdir,0700)
except OSError:
raise ClientError(_("Error creating the directory")+". "+
raise ClientError(_("Failed to create the directory")+". "+
_("Permission denied: '%s'")%userdir)
return True
@ -650,7 +650,7 @@ class Client(commandServer, encrypt, Desktop):
if not self.mountSleepRes(host, userName, userPwd,
res, rpath,uid,gid):
raise ClientError(
_("Failed to mount Samba resource [%s]")%res)
_("Failed to mount the Samba volume [%s]")%res)
else:
return True
@ -1117,12 +1117,12 @@ class Client(commandServer, encrypt, Desktop):
# apply system templates
self.applyTemplates(None,False)
if hostAuth:
self.printSUCCESS(_("The workstation is configured for work "
self.printSUCCESS(_("The workstation was configured for work "
"in the domain"))
currentVersion = self.clVars.Get("cl_ver")
self.clVars.Write("os_remote_auth", hostAuth, True)
else:
self.printSUCCESS(_("The workstation is configured for work "
self.printSUCCESS(_("The workstation was configured for work "
"outside the domain"))
self.clVars.Delete("os_remote_auth")
return True
@ -1177,7 +1177,7 @@ class Client(commandServer, encrypt, Desktop):
domain = reduce(lambda x,y:x if x else y,domains,"")
foundMountRemote = isMount(pathRemote)
if foundMountRemote:
self.printWARNING(_("Samba resource [%s] mounted")%"remote")
self.printWARNING(_("Samba volume [%s] mounted")%"remote")
return True
else:
if not (domain and pwdRemote):
@ -1189,9 +1189,9 @@ class Client(commandServer, encrypt, Desktop):
if not self.mountSambaRes(domain,"client",pwdRemote,
"remote",pathRemote):
self.printERROR(
_("Failed to mount Samba resource [%s]")%"remote")
_("Failed to mount the Samba volume [%s]")%"remote")
return False
self.printSUCCESS(_("Samba resource [%s] mounted") % "remote")
self.printSUCCESS(_("Samba volume [%s] mounted") % "remote")
return True
def clientPasswd(self,userLogin,uid,gid,homeDir,password,curPassword):

12
pym/client/utils/cl_client.py
Unescape View File

@ -56,12 +56,12 @@ class ClClientAction(Action):
},
# машина не доменная
{'name':'only_mount:localpc',
'warning':__("This computer is not in the domain"),
'warning':__("This workstation is not in the domain"),
'condition':lambda Get:not Get('cl_remote_host')
},
# проверить может ли указанный сервер являться доменом
{'name':'domain:check_domain',
'message':__("Check {cl_remote_host_new} for domain resources"),
'message':__("Checking {cl_remote_host_new} for domain resources"),
'method':'Client.checkDomainServer(cl_remote_host_new,os_net_domain)',
},
# получить пароль для ввода в домен (или воспользоваться кэшированным)
@ -133,17 +133,17 @@ class ClClientAction(Action):
},
# сообщения о результатах работы действия
{'name':'domain:success',
'message':__("Computer added to domain {cl_remote_host}")
'message':__("Workstation added to domain {cl_remote_host}")
},
{'name':'domain:failed',
'error':__("Failed to add the computer to domain {cl_remote_host}"),
'error':__("Failed to add the workstation to domain {cl_remote_host}"),
'depend':Tasks.failed() & Tasks.hasnot("interrupt"),
},
{'name':'undomain:success',
'message':__("Computer removed from domain {cl_remote_host}")
'message':__("Workstation removed from domain {cl_remote_host}")
},
{'name':'undomain:failed',
'error':__("Failed to remove the computer from the domain"),
'error':__("Failed to remove the workstation from the domain"),
'depend':Tasks.failed() & Tasks.hasnot("interrupt"),
},
]

22
pym/client/utils/cl_client_sync.py
Unescape View File

@ -114,7 +114,7 @@ class ClClientSyncLoginAction(Action):
'cl_client_profile_name,ur_uid,ur_gid)',
'condition':lambda Get:Get('cl_client_sync_replication_set') == 'on',
'else_message':__("The local user profile does not "
"need to be synchronized with remote domain")
"need to be synchronized with the remote domain")
},
# монтируем профиль локального домена, если локальный профиль
# старее удаленного доменного или актуальный профиль
@ -133,7 +133,7 @@ class ClClientSyncLoginAction(Action):
'ur_gid,ur_home_path,"unix",cl_client_profile_name)',
'condition':lambda Get:Get('cl_client_sync_local_set') == 'on',
'else_message':__("The local user profile does not "
"need to be synchronized with local domain")
"need to be synchronized with the local domain")
},
# ошибка синхронизации с локальным доменом
{'name':'local_sync_error',
@ -151,7 +151,7 @@ class ClClientSyncLoginAction(Action):
'method':'Client.waitingArchFile(cl_client_pack_time,'
'cl_client_profile_name,"remote_profile")',
'failed_warning':__("Failed to find the profile "
"archive from {cl_replication_host}")
"archive of {cl_replication_host}")
},
# распаковать архив из удаленного домена и удалить
# файлы которые отсутствуют в удаленном профиле
@ -185,8 +185,8 @@ class ClClientSyncLoginAction(Action):
# синхронизировать локальный профиль с локальным доменом
# как запасной профиль
{'name':'pack_remote:fallback_warning',
'warning':__("Error synchronizing with the remote server "
"{cl_replication_host}"),
'warning':__("Error synchronizing with the "
"{cl_replication_host} remote server"),
'depend': ~Tasks.success_one_of('unpack_profile','sync_remote')
},
{'name':'pack_remote:fallback_sync',
@ -201,7 +201,7 @@ class ClClientSyncLoginAction(Action):
# сообщение о том, что будет использоваться запасной профиль
# с локального домена
{'name':'fallback_sync!:fallback_success',
'message': __("Get a user fallback profile from the "
'message': __("Got a user fallback profile from the "
"{cl_remote_host} domain")
},
# ошибка синхронизации профиль не готов! к использованию
@ -228,7 +228,7 @@ class ClClientSyncLoginAction(Action):
# во время синхронизации профиля произошли ошибки, которые не
# гарантируют целостность профиля
{'name':'domain_sync:error_sync',
'warning':__("Changings in the user profile will not "
'warning':__("User profile modifications will not "
"be saved to the domain"),
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"error")',
'depend': Tasks.hasnot('success_sync','failed')
@ -263,14 +263,14 @@ class ClClientSyncLogoutAction(Action):
},
# проверка на попытку отключить ресурсы пользователя в X сессии
{'name':'domain_user:in_xsession',
'error':__("User {ur_login} is already in X session"),
'error':__("User {ur_login} is already on the X session"),
'condition':lambda Get:Get('ur_login') in \
Get('desktop.cl_desktop_online_user'),
},
# проверить наличие домашней директории
{'name':'domain_user:check_homedir',
'condition':lambda Get:path.exists(Get('ur_home_path')),
'else_error':__("User home directory {ur_home_path} not found"),
'else_error':__("Home directory {ur_home_path} not found"),
},
# проверить наличие подключенных ресурсов
{'name':'domain_user:check_mount',
@ -286,11 +286,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':__("The profile will not be uploaded to domain")
'else_warning':__("The profile will not be uploaded to the domain")
},
# переместить файлы из профиля в Moved
{'name':'domain_user:move_home_dir',
'message':__("Moving non-profile files to Home/Moved directory"),
'message':__("Moving non-profile files to the Home/Moved directory"),
'method':'Client.moveHomeDir(ur_home_path,"Moved","homes",'
'cl_moved_skip_path)',
},

6
pym/client/utils/cl_passwd.py
Unescape View File

@ -34,9 +34,9 @@ class ClPasswdAction(Action):
native_error = (FilesError,DesktopError,TemplatesError,ClientError)
successMessage = (__("{cl_client_login}'s password changed\n"
"The password will be changed when you log out"
"from the X session"))
failedMessage = __("Failed to change password")
"This modification will be applied when "
"you quit the X session"))
failedMessage = __("Failed to change the password")
interruptMessage = __("Password changing manually interrupted")
# список задач для действия

12
pym/client/variables/client.py
Unescape View File

@ -62,7 +62,7 @@ class VariableClRemoteHostNew(Variable):
if self.Get('cl_localhost_set') == 'off':
if self.Get('cl_remote_host') == '':
if not value:
raise VariableError(_("Need to specify the domain"))
raise VariableError(_("Please specify the domain"))
elif not isOpenPort(value,445):
raise VariableError(
_("The specified address is not available"))
@ -157,7 +157,7 @@ class VariableClLocalhostSet(Variable):
untrusted = True
def init(self):
self.label = _("Computer role")
self.label = _("Workstation role")
self.help = _("remove the domain connection settings")
def choice(self):
@ -167,9 +167,9 @@ class VariableClLocalhostSet(Variable):
def check(self,value):
if self.Get('cl_client_mount_set') == 'off':
if self.Get('cl_remote_host') == '' and value == "on":
raise VariableError(_("The computer is not in the domain"))
raise VariableError(_("The workstation is not in the domain"))
if self.Get('cl_remote_host') != '' and value == "off":
raise VariableError(_("The computer is already in the domain %s")
raise VariableError(_("The workstation is already in the domain %s")
%self.Get('cl_remote_host') + "\n" +
_("Before joining the domain, "
"you need to remove it from the previous domain"))
@ -271,10 +271,10 @@ class VariableClClientLogin(VariableUrLogin):
if not value in self.choice() and self.Get('cl_action') == 'logout':
raise VariableError(_("X session users not found"))
if value == "":
raise VariableError(_("Need to specify user"))
raise VariableError(_("Please specify the user"))
if value == "root" and self.Get('cl_action') == 'passwd':
raise VariableError(\
_("The action can be executed by a non-root user only"))
_("This action can be executed by a non-root user only"))
try:
pwd.getpwnam(value).pw_gid
except:

10
pym/client/wsdl_client.py
Unescape View File

@ -77,7 +77,7 @@ class Wsdl(WsdlBase):
'cl_templates_locate',
'cl_verbose_set',
'cl_dispatch_conf'),
next_label=_("Perform"))]},
next_label=_("Execute"))]},
#
# подключить удаленные ресурсы пользователя
#
@ -111,7 +111,7 @@ class Wsdl(WsdlBase):
'groups': [
lambda group: group(_("Domain user login"),
normal=('ur_login', 'cl_client_sync'),
next_label=_("Perform"))]},
next_label=_("Execute"))]},
#
# отключить удаленные ресурсы пользователя
#
@ -145,7 +145,7 @@ class Wsdl(WsdlBase):
'groups': [
lambda group: group(_("Domain user logout"),
normal=('ur_login', 'cl_client_sync'),
next_label=_("Perform"))]},
next_label=_("Execute"))]},
#
# сменить пароль доменного пользователя
#
@ -155,7 +155,7 @@ class Wsdl(WsdlBase):
# категория метода
'category': __('Client'),
# заголовок метода
'title': __("Change Password"),
'title': __("Password Modification"),
# иконка для графической консоли
'image': 'preferences-system-privacy,system-users',
# метод присутствует в графической консоли
@ -179,7 +179,7 @@ class Wsdl(WsdlBase):
'setvars': {'cl_action!': 'passwd'},
# описание груп (список лямбда функций)
'groups': [
lambda group: group(_("Change password"),
lambda group: group(_("Password modification"),
normal=('cl_client_login', 'ur_user_pw',
'ur_user_new_pw'),
next_label=_("Save"))]},

Write Preview
Loading…
Cancel
Save