Sync translate

master3.3
Mike khiretskiy 10 years ago
parent 10380e2555
commit bbe80e2ddf

@ -149,7 +149,7 @@ class ClSetupBootAction(ClSetupSystemAction):
Get('os_install_scratch') == 'off') Get('os_install_scratch') == 'off')
}, },
{'name':'no_scratch', {'name':'no_scratch',
'warning':_("The builder mode is not longer supported"), 'warning':_("The builder mode is no longer supported"),
'condition':lambda Get:Get('os_install_scratch') == 'on' 'condition':lambda Get:Get('os_install_scratch') == 'on'
}, },
# изменить IO планировщик # изменить IO планировщик

@ -37,12 +37,12 @@ class VideoVariable(Variable):
""" """
xorg_need = True xorg_need = True
default_video = "default" default_video = "default"
driver_names = {'nvidia': _("Nvidia proprietary video driver"), driver_names = {'nvidia': _("NVidia proprietary video driver"),
'fglrx': _("Ati proprietary video driver"), 'fglrx': _("ATI proprietary video driver"),
'intel': _("Intel video driver"), 'intel': _("Intel video driver"),
'radeon': _("Ati open source video driver"), 'radeon': _("ATI open source video driver"),
'nouveau': _("Nvidia open source video driver"), 'nouveau': _("NVidia open source video driver"),
'default': _("X.Org Server auto-detect") 'default': _("X.Org Server auto detection")
} }
def uncompatible(self): def uncompatible(self):

@ -116,5 +116,5 @@ class VariableOsAudioDefault(Variable):
return _("Audio configuration unavailable for Flash install") return _("Audio configuration unavailable for Flash install")
if self.Get('os_install_alsa_set') == 'off': if self.Get('os_install_alsa_set') == 'off':
return \ return \
_("This distribution does not provide the alsa sound") _("This distribution does not provide the ALSA sound")
return "" return ""

@ -1725,8 +1725,8 @@ class VariableOsInstallMbr(LocationHelper,Variable):
raise VariableError(_("You need a disk with a dos " raise VariableError(_("You need a disk with a dos "
"table for Flash install")) "table for Flash install"))
if tableOnBootDisk == "dos" and useBtrfs: if tableOnBootDisk == "dos" and useBtrfs:
raise VariableError(_("You need a disk with a gpt " raise VariableError(_("You need a disk with a GPT table for "
"table for install on btrfs")) "install on a btrfs partition"))
if rootType in ("usb-hdd","hdd") and tableOnBootDisk == "gpt": if rootType in ("usb-hdd","hdd") and tableOnBootDisk == "gpt":
efisize = self.Select('os_disk_size', efisize = self.Select('os_disk_size',
where=['os_disk_id','os_disk_parent'], where=['os_disk_id','os_disk_parent'],
@ -1737,15 +1737,15 @@ class VariableOsInstallMbr(LocationHelper,Variable):
minsize = "%dMb" % (int(bios_grub_size) / Sizes.M) minsize = "%dMb" % (int(bios_grub_size) / Sizes.M)
if not efisize: if not efisize:
raise VariableError( raise VariableError(
_("Boot device must have BIOS Boot " _("Your boot device must have a BIOS Boot partition "
"partition ({minsize})").format(minsize=minsize)) "({minsize})").format(minsize=minsize))
# проверка размера EF02 при установке на btrfs # проверка размера EF02 при установке на btrfs
elif useBtrfs: elif useBtrfs:
if (efisize.isdigit() and bios_grub_size.isdigit() and if (efisize.isdigit() and bios_grub_size.isdigit() and
int(efisize) < int(bios_grub_size)): int(efisize) < int(bios_grub_size)):
raise VariableError( raise VariableError(
_("Boot device must have BIOS Boot partition " _("Your boot device must have a BIOS Boot "
"({minsize})").format(minsize=minsize)) "partition ({minsize})").format(minsize=minsize))
if value: if value:
if self.Get('os_grub2_path'): if self.Get('os_grub2_path'):
self.checkForGrub2() self.checkForGrub2()

Loading…
Cancel
Save