From 9091151d546e5d749b47e2efce3ff651784fcc8c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 6 Nov 2002 13:20:21 +0000 Subject: replace "_" with "N" and "__" with "N_" rationale: - currently, we use _("xxx") as a shorthand for gettext("xxx"). It also used to call xgettext with --keyword=_ - alas, function &_ is global and not by package (notice esp. that _ is not exported in common.pm) - this lead to big ugly pb with packages defining their own &_, overriding common.pm's &_ - a fix is to set @::textdomains to add a new domain (the default being "libDrakX") but relying on the global "_" is still dangerous! --- perl-install/steps.pm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'perl-install/steps.pm') diff --git a/perl-install/steps.pm b/perl-install/steps.pm index 162bc6d57..e5a24413b 100644 --- a/perl-install/steps.pm +++ b/perl-install/steps.pm @@ -11,28 +11,28 @@ use common; my @installStepsFields = qw(text redoable onError hidden needs icon); #entered reachable toBeDone next done; my @installSteps = ( - selectLanguage => [ __("Choose your language"), 1, 1, '', '', 'language' ], - selectInstallClass => [ __("Select installation class"), 1, 1, '', '', '' ], - setupSCSI => [ __("Hard drive detection"), 1, 0, '', '', 'harddrive' ], - selectMouse => [ __("Configure mouse"), 1, 1, '', "selectInstallClass", 'mouse' ], - selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass", 'keyboard' ], - miscellaneous => [ __("Security"), 1, 1, '!$::expert', '', 'security' ], - doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass", 'partition' ], - formatPartitions => [ __("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", 'partition' ], - choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ], - installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ], - setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ], - addUser => [ __("Add a user"), 1, 1, '', "installPackages", 'user' ], - configureNetwork => [ __("Configure networking"), 1, 1, '', "formatPartitions", 'network' ], - summary => [ __("Summary"), 1, 0, '', "installPackages", 'summary' ], - configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ], - setupBootloader => [ __("Install bootloader"), 1, 0, '', "installPackages", 'bootloader' ], + selectLanguage => [ N_("Choose your language"), 1, 1, '', '', 'language' ], + selectInstallClass => [ N_("Select installation class"), 1, 1, '', '', '' ], + setupSCSI => [ N_("Hard drive detection"), 1, 0, '', '', 'harddrive' ], + selectMouse => [ N_("Configure mouse"), 1, 1, '', "selectInstallClass", 'mouse' ], + selectKeyboard => [ N_("Choose your keyboard"), 1, 1, '', "selectInstallClass", 'keyboard' ], + miscellaneous => [ N_("Security"), 1, 1, '!$::expert', '', 'security' ], + doPartitionDisks => [ N_("Setup filesystems"), 1, 0, '', "selectInstallClass", 'partition' ], + formatPartitions => [ N_("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", 'partition' ], + choosePackages => [ N_("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ], + installPackages => [ N_("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ], + setRootPassword => [ N_("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ], + addUser => [ N_("Add a user"), 1, 1, '', "installPackages", 'user' ], + configureNetwork => [ N_("Configure networking"), 1, 1, '', "formatPartitions", 'network' ], + summary => [ N_("Summary"), 1, 0, '', "installPackages", 'summary' ], + configureServices => [ N_("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ], + setupBootloader => [ N_("Install bootloader"), 1, 0, '', "installPackages", 'bootloader' ], if_((arch() !~ /alpha/) && (arch() !~ /ppc/), - createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages", 'bootdisk' ], + createBootdisk => [ N_("Create a bootdisk"), 1, 0, '', "installPackages", 'bootdisk' ], ), - configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"], 'X' ], - installUpdates => [ __("Install system updates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"], '' ], - exitInstall => [ __("Exit install"), 0, 0, '!$::expert && !$::live', '', 'exit' ], + configureX => [ N_("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"], 'X' ], + installUpdates => [ N_("Install system updates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"], '' ], + exitInstall => [ N_("Exit install"), 0, 0, '!$::expert && !$::live', '', 'exit' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; -- cgit v1.2.1