Обновлены переводы

develop 3.3.0.3
Mike Khiretskiy 9 years ago
parent bbf0820f23
commit 3fb6384f52

@ -90,9 +90,9 @@ class Desktop:
if error:
# заархивировать текущий профиль и удалить его
if recreateOnError:
self.printSUCCESS(_("Recreating encrypted data"))
self.printSUCCESS(_("Recovering encrypted data"))
if self.getMountUserPaths(userDir):
raise DesktopError(_("Failed to use directory encryption"))
raise DesktopError(_("Failed to encrypt the directory"))
for source in (userDir,ecryptfsPath):
if path.exists(source):
if listDirectory(source):
@ -115,9 +115,9 @@ class Desktop:
if isBootstrapDataOnly(userDir):
if childMounts(userDir):
raise DesktopError(
_("Failed to create the encrypted user profile")+
_("Failed to create an encrypted user profile")+
_(": ")+
_("User home directory contains mount points"))
_("The home directory contains mount points"))
# поместить данные во временный tarfile
calculateName = ".calculate"
calculatePath = path.join(userDir,calculateName)
@ -147,7 +147,7 @@ class Desktop:
with open(bakArchName,'w') as f:
f.write(tf.read())
raise DesktopError(str(e)+
_("Failed to create the encrypted user profile"))
_("Failed to create an encrypted user profile"))
finally:
if tf:
tf.close()
@ -185,7 +185,7 @@ class Desktop:
userName = self.clVars.Get("ur_login")
homeDir = self.clVars.Get("ur_home_path")
if not homeDir:
raise DesktopError(_("Failed to determine home directory"))
raise DesktopError(_("Failed to determine the home directory"))
dirStart, dirEnd = path.split(homeDir)
mountProfileDir = path.join(dirStart, ".%s" %dirEnd)
mountRemoteProfileDir = path.join(dirStart, ".%s.remote" %dirEnd)
@ -264,7 +264,7 @@ class Desktop:
raise DesktopError(_("Unable to detect the X session"))
if process("su",urLogin,"-c",
("DISPLAY=:%s "%display)+logoutCommand).failed():
raise DesktopError(_("Unable send logout command"))
raise DesktopError(_("Unable to send the logout command"))
return True
def waitLogout(self,urLogin,waitTime,postWaitTime=5):

@ -32,8 +32,8 @@ class ClDesktopLogoutAction(Action):
# ошибки, которые отображаются без подробностей
native_error = (FilesError,DesktopError,TemplatesError)
successMessage = __("The user logged out from the session!")
failedMessage = __("Unable to logout the user")
successMessage = __("User logged out!")
failedMessage = __("Unable to log out")
interruptMessage = __("Logout manually interrupted")
# список задач для действия
@ -42,7 +42,7 @@ class ClDesktopLogoutAction(Action):
'method':'Desktop.userLogout(cl_desktop_login)',
},
{'name':'wait_logout',
'message':__("Waiting for completion of the user logout"),
'message':__("Waiting for the logout"),
'method':'Desktop.waitLogout(cl_desktop_login,300)'}
]
@ -53,7 +53,8 @@ class ClDesktopAction(Action):
# ошибки, которые отображаются без подробностей
native_error = (FilesError,DesktopError,TemplatesError)
successMessage = __("User account {ur_login} is configured")
successMessage = __("User account {ur_login} has been "
"successfully configured")
failedMessage = __("Failed to configure the user account")
interruptMessage = __("Configuration manually interrupted")

@ -302,9 +302,9 @@ class VariableClDesktopLogin(VariableUrLogin):
def check(self,value):
"""Does user exist"""
if not value in self.choice() and self.Get('cl_action') == 'logout':
raise VariableError(_("X session users not found"))
raise VariableError(_("No X session user found"))
if value == "":
raise VariableError(_("Need to specify user"))
raise VariableError(_("Please specify the user name"))
try:
pwd.getpwnam(value).pw_gid
except:
@ -376,8 +376,8 @@ class VariableClDesktopForceSetupSet(Variable):
value = "off"
def init(self):
self.label = _("Force setup")
self.help = _("force setup")
self.label = _("Force configuration")
self.help = _("force configuration")
class VariableClDesktopFacePath(Variable):
"""Путь к стандартным иконкам пользователей"""

@ -60,7 +60,7 @@ class Wsdl(WsdlBase):
'groups':[
lambda group:group(_("User logout"),
normal=('cl_desktop_login',),
next_label=_("Perform"))]},
next_label=_("Execute"))]},
#
# настроить пользовательский сеанс
#
@ -70,7 +70,7 @@ class Wsdl(WsdlBase):
# категория метода
'category':__('Desktop'),
# заголовок метода
'title':__("Configure User"),
'title':__("User Account Configuration"),
# иконка для графической консоли
'image':'user-desktop,preferences-desktop',
# метод присутствует в графической консоли
@ -92,9 +92,9 @@ class Wsdl(WsdlBase):
'cl_protect_use_set!':'off'},
# описание груп (список лямбда функций)
'groups':[
lambda group:group(_("Configure user"),
lambda group:group(_("User account configuration"),
normal=('ur_login',),
expert=('cl_desktop_force_setup_set','cl_verbose_set',
'cl_templates_locate'),
next_label=_("Perform"))]},
next_label=_("Execute"))]},
]

Loading…
Cancel
Save