diff options
Diffstat (limited to 'perl-install/standalone/harddrake2')
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 59bb64847..f9506bbc6 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -50,10 +50,10 @@ my %fields = "pci_bus" => [ N("Bus PCI #"), N("the PCI bus on which the device is plugged") ], "pci_device" => [ N("PCI device #"), N("PCI device number") ], "pci_function" => [ N("PCI function #"), N("PCI function number") ], - "vendor" => [ N("Vendor ID"), N("this is the standard numerical identifiant of the vendor") ], - "id" => [ N("Device ID"), N("this is the numerical identifiant of the device") ], - "subvendor" => [ N("Sub vendor ID"), N("this is the minor numerical identifiant of the vendor") ], - "subid" => [ N("Sub device ID"), N("this is the minor numerical identifiant of the device") ], + "vendor" => [ N("Vendor ID"), N("this is the standard numerical identifier of the vendor") ], + "id" => [ N("Device ID"), N("this is the numerical identifier of the device") ], + "subvendor" => [ N("Sub vendor ID"), N("this is the minor numerical identifier of the vendor") ], + "subid" => [ N("Sub device ID"), N("this is the minor numerical identifier of the device") ], "usb_pci_device" =>, [ N("Device USB ID"), N("..") ], }, CPU => @@ -75,13 +75,13 @@ my %fields = "hlt_bug" => [ N("Halt bug"), N("Some of the early i486DX-100 chips cannot reliably return to operating mode after the \"halt\" instruction is used") ], "level" => [ N("Level"), N("sub generation of the cpu") ], - "model" => [ N("Model"), N("generation of the cpu (eg: 8 for PentiumIII, ...)") ], + "model" => [ N("Model"), N("generation of the cpu (eg: 8 for Pentium III, ...)") ], "model name" => [ N("Model name"), N("official vendor name of the cpu") ], "name" => [ N("Name"), N("the name of the CPU") ], "processor" => [ N("Processor ID"), N("the number of the processor") ], "stepping" => [ N("Model stepping"), N("stepping of the cpu (sub model (generation) number)") ], "vendor_id" => [ N("Vendor"), N("the vendor name of the processor") ], - "wp" => [ N("Write protection"), N("the WP flag in the CR0 register of the cpu enforce write proctection at the memory page level, thus enabling the processor to prevent unchecked kernel accesses to user memory (aka this is a bug guard)") ], + "wp" => [ N("Write protection"), N("the WP flag in the CR0 register of the cpu enforce write protection at the memory page level, thus enabling the processor to prevent unchecked kernel accesses to user memory (aka this is a bug guard)") ], }, FLOPPY => { @@ -154,7 +154,7 @@ my ($current_device, $current_class, $current_configurator); my %menus = ( 'options' => - #-PO: please keep all "/" charaters !!! + #-PO: please keep all "/" characters !!! N("/_Options"), 'help' => N("/_Help") ); @@ -169,7 +169,7 @@ my %menu_options = ( my @menu_items = ( [ N("/_File"), undef, undef, undef, '<Branch>' ], - [ N("/_File").N("/_Quit"), N("<control>Q"), \&quit_global, undef, '<StockItem>', 'gtk-quit' ], + [ N("/_File") . N("/_Quit"), N("<control>Q"), \&quit_global, undef, '<StockItem>', 'gtk-quit' ], [ join('', @{$menu_options{PRINTERS_DETECTION}}), undef, sub { $options{PRINTERS_DETECTION} = $check_boxes{PRINTERS_DETECTION}->get_active }, undef, '<CheckItem>' ], [ join('', @{$menu_options{MODEMS_DETECTION}}), undef, @@ -177,8 +177,8 @@ my @menu_items = [ join('', @{$menu_options{JAZZ_DETECTION}}), undef, sub { $options{JAZZ_DETECTION} = $check_boxes{JAZZ_DETECTION}->get_active }, undef, '<CheckItem>' ], [ $menus{help}, undef, undef, undef, '<Branch>' ], - [ $menus{help}.N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ], - [ $menus{help}.N("/_Fields description"), undef, sub { + [ $menus{help} . N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ], + [ $menus{help} . N("/_Fields description"), undef, sub { if ($current_device) { create_dialog(N("Harddrake help"), N("Description of the fields:\n\n") @@ -194,11 +194,11 @@ my @menu_items = }, undef, '<Item>' ], - [ $menus{help}.N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ], - [ $menus{help}.N("/_About..."), undef, sub { + [ $menus{help} . N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ], + [ $menus{help} . N("/_About..."), undef, sub { create_dialog(N("About Harddrake"), #-PO: Do not alter the <span ..> and </span> tags - N("This is HardDrake, a Mandrake hardware configuration tool.\n<span foreground=\"royalblue3\">Version:</span> %s + N("This is HardDrake, a Mandrakelinux hardware configuration tool.\n<span foreground=\"royalblue3\">Version:</span> %s <span foreground=\"royalblue3\">Author:</span> Thierry Vignaud <tvignaud\@mandrakesoft.com>\n\n", $harddrake::data::version) . "\n" . formatAlaTeX($::license), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}) }); }, undef, '<Item>' @@ -393,7 +393,7 @@ foreach (@classes) { if ($Ident eq "AUDIO") { require harddrake::sound; my $alter = harddrake::sound::get_alternative($_->{driver}); - my $alternative_drivers = join(':', @$alter) if $alter->[0] ne 'unknown'; + my $alternative_drivers = join(', ', @$alter) if $alter->[0] ne 'unknown'; $_->{alternative_drivers} = $alternative_drivers if $alternative_drivers; } if ($Ident eq "HARDDISK") { @@ -422,7 +422,7 @@ foreach (@classes) { my $custom_id = harddrake::data::custom_id($_, $title); foreach my $field (qw(devfs_device device)) { - $_->{$field} = '/dev/'.$_->{$field} if $_->{$field}; + $_->{$field} = "/dev/$_->{$field}" if $_->{$field}; } $tree_model->append_set($parent_iter, [ 1 => $custom_id, 2 => $index++ ]); push @data, [ $_, $Ident ]; @@ -484,7 +484,7 @@ sub lookup_field { sub titleFormat { my ($title) = @_; - [ $title . "\n", { 'weight' => Gtk2::Pango->PANGO_WEIGHT_BOLD, size => 14 * Gtk2::Pango->PANGO_SCALE } ]; + [ $title . "\n", { 'weight' => Gtk2::Pango->PANGO_WEIGHT_BOLD, scale => Gtk2::Pango->PANGO_SCALE_LARGE } ]; } sub rename_field { |