Update translate

master3.3
Mike Hiretsky 12 years ago
parent db43317ca2
commit d2f9ff4837

@ -773,11 +773,11 @@ class Install(color_print):
# join templates
if self.clVars.Get('os_install_pxe') == 'on':
self.startTask(
_("Configuring the PXE install"),progress=True)
_("Configuring PXE install"),progress=True)
self.applyTemplatesFlash('/')
else:
self.startTask(
_("Configuring the Flash install"),progress=True)
_("Configuring Flash install"),progress=True)
self.applyTemplatesFlash(self.targetDistr.getDirectory())
self.endTask()
self.closeClTemplate()
@ -819,8 +819,8 @@ class Install(color_print):
if process('/bin/umount',mountDir).success():
break
else:
self.printWARNING(_("Unable umount %s")%mountDir)
self.printWARNING(_("Unable to umount %s")%mountDir)
try:
os.rmdir(mountDir)
except:
self.printWARNING(_("Unable remove directory %s")%mountDir)
self.printWARNING(_("Unable to remove directory %s")%mountDir)

@ -162,7 +162,7 @@ class VariableOsInstallX11VideoDrv(VideoVariable):
if self.Get('cl_action') == 'system':
availDrvs = self.Get('os_install_x11_video_available')
if not value in availDrvs:
raise VariableError(_("Only drivers % are available")%
raise VariableError(_("Only %s drivers are available")%
",".join(availDrvs))
else:
if not value in getInstalledVideo(prefix="/") and \
@ -189,7 +189,7 @@ class VariableOsInstallX11Composite(VideoVariable):
opt = ['--composite']
def init(self):
self.help = _("set the composite")
self.help = _("toggle composite")
self.label = _("Composite")
def get(self):

@ -414,8 +414,7 @@ class VariableClAutopartitionDevice(AutopartitionHelper,Variable):
def check(self,valuelist):
if self.Get('cl_autopartition_set') == "on":
if not valuelist:
raise VariableError(_("For autopartition, please select "
"the install device"))
raise VariableError(_("For autopartition, please select the device"))
useDisks = self.Select('os_disk_parent',
where='os_disk_mount',ne='')
for value in valuelist:
@ -467,7 +466,7 @@ class VariableClAutopartitionScheme(AutopartitionHelper,Variable,AutoPartition):
def init(self):
self.help = _("autopartition options")
self.label = _("Autopartion options")
self.label = _("Autopartition options")
def choice(self):
return [

@ -595,7 +595,7 @@ class LocationHelper:
"""
if self.Get('cl_autopartition_set') == "on":
return \
_("Locations are not available with autopartitioning")
_("The layout is not available with autopartitioning")
return ""
class VariableOsLocationData(LocationHelper,TableVariable):
@ -618,7 +618,7 @@ class VariableOsLocationData(LocationHelper,TableVariable):
"DIR directory. If set to 'none', the mount point will "
"not be moved. To create a bind mount point, you have "
"to specify the source directory as DISK")
self.label = _("Locations")
self.label = _("Layout")
def set(self,value):
return sorted(value,key=lambda x:x and x[0])
@ -883,11 +883,9 @@ class VariableOsLocationDest(LocationHelper,Variable):
if osInstallRootType == "flash":
if filter(lambda x: x and x != '/', value):
raise VariableError(
_("The Flash install is not supported for "
"multipartition install"))
_("Flash install does not support multipartition mode"))
if filter(lambda x: x == "swap",value):
raise VariableError(_("The Flash install is not supported "
"for swap disks"))
raise VariableError(_("Flash install does not support swap disks"))
########################################
# check install on member of RAID or LVM
########################################
@ -898,8 +896,7 @@ class VariableOsLocationDest(LocationHelper,Variable):
installTypes)
if memberData:
raise VariableError(
_("Unable to use active {typepart} member {part} "
"for installation").format(
_("Unable to use {part} partition used by active {typepart} for installation").format(
typepart=checkType.upper(),
part=memberData[0][0]))
@ -964,7 +961,7 @@ class VariableOsLocationFormat(LocationHelper,Variable):
for dev,mp,fs in devMpFs:
if dev.startswith('/') and not dev.startswith('/dev/') and fs:
raise VariableError(
_("Bind mount points does not use filesystem"))
_("The bind mount point does not use filesystem"))
# check compatible fs for mount point only root dirs
if dev.startswith('/dev/') and mp and (mp.count('/') == 1 or
mp == '/var/calculate'):
@ -973,7 +970,7 @@ class VariableOsLocationFormat(LocationHelper,Variable):
raise VariableError(
_("The filesystem for '%(mp)s' should not be '%(opt)s'")
%{'mp':mp, 'opt':fs}+" "+
_("for the {typedisk} install").format(
_("for {typedisk} install").format(
typedisk=osInstallRootType))
if mp == "swap" and fs != "swap":
raise VariableError(
@ -1033,7 +1030,7 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
# partition use in current system
if diskMount.get(dev,''):
raise VariableError(
_("{device} should, but cannot be formatted, as it is "
_("{device} must but cannot be formatted, as it is "
"mounted to {mountpoint} on the current system").format(
device=dev,mountpoint=diskMount.get(dev,'')))
if isMount(dev):
@ -1043,12 +1040,12 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
# but user select non-format
if not self.isTrue(isformat):
raise VariableError(
_("{device} should be formatted").format(
_("{device} must be formatted").format(
device=dev))
if self.isTrue(isformat):
if not mp:
raise VariableError(
_("No need to format the unused device {dev}").format(
_("No need to format unused device {dev}").format(
dev=dev))
if fs in unavailFS:
raise VariableError(
@ -1058,8 +1055,7 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
_("Bind mount points should not be formatted"))
elif diskMount.get(dev,"") and isformat:
raise VariableError(
_("{device} cannot be formatted, as it is "
"mounted to {mountpoint} on the current system"
_("{device} must but cannot be formatted, as it is mounted to {mountpoint} on the current system"
).format(
device=dev,mountpoint=diskMount.get(dev,'')))
elif isMount(dev):
@ -1152,7 +1148,7 @@ class VariableClUuidSet(Variable):
Unavailable for flash installation
"""
if self.Get('os_install_root_type') == 'flash':
return _("UUID using unavailable for Flash install")
return _("Impossible to use UUID for Flash install")
#############################################################
# Install disk parameters
@ -1488,7 +1484,7 @@ class VariableOsInstallMbr(LocationHelper,Variable):
if rootType == "flash":
if len(value) > 1:
raise VariableError(
_("For the Flash install, you need only one disk"))
_("For Flash install, you need only one disk"))
for mbrDisk in value:
if self.Get('cl_autopartition_set') == 'on':
tableOnBootDisk = self.Get('cl_autopartition_table')
@ -1497,12 +1493,11 @@ class VariableOsInstallMbr(LocationHelper,Variable):
where="os_device_dev",eq=mbrDisk,limit=1)
if not tableOnBootDisk:
raise VariableError(
_("Disk '%s' need a partition table for the boot record")%
_("Disk '%s' needs a partition table for the boot record")%
mbrDisk)
if rootType == "flash":
if tableOnBootDisk == "gpt":
raise VariableError(_("For the Flash install, you "
"need a disk with a dos table"))
raise VariableError(_("You need a disk with a dos table for Flash install"))
if value:
if self.Get('os_grub2_path'):
self.checkForGrub2()
@ -1518,7 +1513,7 @@ class VariableOsInstallMbr(LocationHelper,Variable):
sort="DESC",limit=1)
if "lvm-raid" in grubDiskType:
raise VariableError(
_("Grub does not support booting from a RAID assembled from LVM")
_("Grub does not support booting from a RAID assembled from a LVM")
+ ". " +
_("Try to use a separate /boot partition"))
if grubDiskType.count("raid")>1:
@ -1539,8 +1534,7 @@ class VariableOsInstallMbr(LocationHelper,Variable):
sort="DESC",limit=1)
if "lvm" in bootDiskType or "raid" in bootDiskType:
raise ValueError(
_("Legacy grub requires a separate /boot partition to "
"support boot from RAID or LVM"))
_("Legacy grub requires a separate /boot partition to support boot from a RAID or a LVM"))
if bootDiskFormat in ("btrfs","nilfs2"):
raise ValueError(
_("To support booting from %s, legacy grub needs a "

@ -356,7 +356,7 @@ class VariableClImageArchMachine(Variable,DistroRepository):
def choice(self):
return [("",_("Not used"))]+\
[("auto",_("Automatic"))] + \
[("auto",_("Auto"))] + \
[(x,x) for x in self.available_arch]
def humanReadable(self):

@ -40,7 +40,7 @@ class VariableOsInstallKernelScheduler(Variable):
metavalue = "SCHEDULER"
def init(self):
self.help = _("set the I/O scheduler")
self.help = _("toggle the I/O scheduler")
self.label = _("I/O scheduler")
def get(self):

@ -38,7 +38,7 @@ class LocaleVariable(ReadonlyVariable,Locale):
"""
if self.Get('os_install_root_type') == 'flash':
return \
_("Locale configuration unavailable for the Flash install")
_("Locale configuration unavailable for Flash install")
return ""
class VariableOsInstallLinguas(LocaleVariable):
@ -180,7 +180,7 @@ class VariableOsInstallClockTimezone(LocaleVariable):
def check(self,value):
if not value or not path.isfile(path.join(
"/usr/share/zoneinfo",value)):
raise VariableError(_("the %s timezone is wrong")%value)
raise VariableError(_("Wrong timezone %s")%value)
def generateComments(self,tzs):
"""

@ -44,7 +44,7 @@ class NetHelper:
"""
if self.Get('os_install_root_type') == 'flash':
return \
_("Network configuration is unavailable for the Flash install")
_("Network configuration is unavailable for Flash install")
if self.routing and not self.Select('os_install_net_interfaces',
where='os_install_net_dhcp_set',
eq='off',limit=1):
@ -666,7 +666,7 @@ class VariableOsInstallNetDns(VariableOsInstallNetDnsSearch):
def check(self,value):
reIp = re.compile(ip.IP_ADDR)
if any(ifilterfalse(reIp.match,value.split(','))):
raise VariableError(_("Wrong IP addresses for DNS"))
raise VariableError(_("Wrong IP address for DNS"))
def humanReadable(self):
return self.Get() or (_("Get via DHCP")

@ -72,7 +72,7 @@ class VariableOsInstallScratch(Variable):
# scratch not use for falsh and multipartition
if self.Get('os_install_root_type') == "flash":
raise VariableError(
_("The Flash install is not supported in the builder mode"))
_("Flash install does not support the builder mode"))
if filter(lambda x: not x in ('/','swap'),
self.Get('os_install_disk_mount')):
raise VariableError(
@ -84,7 +84,7 @@ class VariableOsInstallScratch(Variable):
Unavailable for flash installation
"""
if self.Get('os_install_root_type') == 'flash':
return _("The Flash install is not supported in the builder mode")
return _("Flash install does not support the builder mode")
class VariableOsFormatType(ReadonlyVariable):
"""
@ -121,7 +121,7 @@ class VariableClMigrateRootPwd(UserHelper,Variable):
untrusted = True
def init(self):
self.help = _("to specify root password")
self.help = _("specify the root password")
self.label = _("Root password")
def get(self):
@ -154,7 +154,7 @@ class VariableClMigrateRootPwd(UserHelper,Variable):
def check(self,value):
if not value:
raise PasswordError(_("Missed a password for user %s")%"root")
raise PasswordError(_("Password for user %s missing")%"root")
class VariableClMigrateData(UserHelper,TableVariable):
"""
@ -263,7 +263,7 @@ class VariableClMigrateUserPwd(UserHelper,Variable):
for user,pwd in zip(self.Get('cl_migrate_user'),value):
if not pwd:
raise PasswordError(
_("Missed a password for user %s")%user)
_("Password for user %s missing")%user)
def set(self,value):
"""
@ -526,8 +526,8 @@ class VariableClLive(Variable):
opt = ['--live']
def init(self):
self.label = _("Configure only dynamic options")
self.help = _("configure only dynamic options")
self.label = _("Configure dynamic options only")
self.help = _("configure dynamic options only")
class VariableOsInstallPxe(ReadonlyVariable):
"""
@ -540,12 +540,11 @@ class VariableOsInstallPxe(ReadonlyVariable):
if value == "on":
if self.Get('os_linux_system') != "server":
raise VariableError(
_("The PXE install is available for Calculate Directory "
"Server only")+'.')
_("PXE install is available for Calculate Directory Server only")+'.')
for pkg in ['net-misc/dhcp','net-ftp/tftp-hpa','net-fs/nfs-utils']:
if not isPkgInstalled(pkg):
raise VariableError(
_("For the PXE install, you need to install package %s")
_("For PXE install, you need to install package %s")
%pkg)
try:
config = cl_template.iniParser('/etc/calculate/calculate.env')
@ -555,8 +554,7 @@ class VariableOsInstallPxe(ReadonlyVariable):
except:
pass
raise VariableError(
_("The PXE install is only available if the DHCP service has "
"been configured first"))
_("PXE install is only available if the DHCP service has been configured first"))
class VariableOsInstallPxePath(Variable):
"""
@ -567,5 +565,5 @@ class VariableOsInstallPxePath(Variable):
opt = ['--pxe-path']
def init(self):
self.label = _("Path for installation")
self.help = _("path for the PXE install")
self.label = _("Installation path")
self.help = _("path for PXE install")

Loading…
Cancel
Save