diff options
| -rw-r--r-- | perl-install/network/adsl.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 12 | ||||
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 6 | ||||
| -rw-r--r-- | perl-install/security/help.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/po/DrakX.pot | 98 | ||||
| -rwxr-xr-x | perl-install/standalone/drakboot | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakbug | 2 | ||||
| -rw-r--r-- | perl-install/standalone/drakedm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/drakperm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/draksplash | 6 | ||||
| -rw-r--r-- | perl-install/standalone/drakvpn | 14 | ||||
| -rwxr-xr-x | perl-install/standalone/drakxtv | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/scannerdrake | 14 | ||||
| -rw-r--r-- | perl-install/standalone/service_harddrake_confirm | 2 |
14 files changed, 86 insertions, 86 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 7c654f3fc..197635e5d 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -38,7 +38,7 @@ Some connections use pptp, a few use dhcp. If you don't know, choose 'use pppoe'"), data => [ { - label => N("ADSL connection type :"), val => \$wiz->{var}{adsl}{type}, list => [ sort values %l ] }, + label => N("ADSL connection type:"), val => \$wiz->{var}{adsl}{type}, list => [ sort values %l ] }, ], pre => sub { $wiz->{var}{adsl}{type} = $l{sagem}; # debug diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 78ca0181f..0f9540f18 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -758,7 +758,7 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n Some connections use pptp, a few use dhcp. If you don't know, choose 'use pppoe'"), data => [ - { text => N("ADSL connection type :"), val => \$adsl_type, type => "list", + { text => N("ADSL connection type:"), val => \$adsl_type, type => "list", list => [ sort { $adsl_types{$a} cmp $adsl_types{$b} } keys %adsl_types ], format => sub { $adsl_types{$_[0]} }, }, @@ -795,7 +795,7 @@ If you don't know, choose 'use pppoe'"), { label => N("Virtual Path ID (VPI):"), val => \$netc->{vpi}, advanced => 1 }, { label => N("Virtual Circuit ID (VCI):"), val => \$netc->{vci}, advanced => 1 }, if_($ntf_name eq "sagem", - { label => N("Encapsulation :"), val => \$netc->{Encapsulation}, list => [ keys %encapsulations ], + { label => N("Encapsulation:"), val => \$netc->{Encapsulation}, list => [ keys %encapsulations ], format => sub { $encapsulations{$_[0]} }, advanced => 1, }, ), @@ -933,7 +933,7 @@ notation (for example, 1.2.3.4).")), $in->ask_warn(N("Error"), N("IP address should be in format 1.2.3.4")); return 1, $bad[0]; } - $in->ask_warn(N("Error"), N("Warning : IP address %s is usually reserved !", $ethntf->{IPADDR})) if is_ip_forbidden($ethntf->{IPADDR}); + $in->ask_warn(N("Error"), N("Warning: IP address %s is usually reserved !", $ethntf->{IPADDR})) if is_ip_forbidden($ethntf->{IPADDR}); }, focus_out => sub { $ethntf->{NETMASK} ||= netmask($ethntf->{IPADDR}) unless $_[0] @@ -1112,7 +1112,7 @@ It is not necessary on most networks."), apply_settings => { - name => N("Configuration is complete, do you want to apply settings ?"), + name => N("Configuration is complete, do you want to apply settings?"), type => "yesorno", }, @@ -1154,7 +1154,7 @@ It is not necessary on most networks."), #- use net_applet by default $isdn->{dial_method} = $method->{name} || $isdn_dial_methods[1]{name}; }, - name => N("How do you want to dial this connection ?"), + name => N("How do you want to dial this connection?"), data => sub { [ { type => "list", val => \$isdn->{dial_method}, list => [ map { $_->{name} } @isdn_dial_methods ] } ] }, @@ -1167,7 +1167,7 @@ It is not necessary on most networks."), restart => { - name => N("The network needs to be restarted. Do you want to restart it ?"), + name => N("The network needs to be restarted. Do you want to restart it?"), type => "yesorno", post => sub { my ($a) = @_; diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index acf282f8f..83583b7d0 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -709,7 +709,7 @@ sub configure_new_printers { undef $w; $w = $in->wait_message(N("Printerdrake"), ($unknown ? - N("Configuring printer ...") : + N("Configuring printer...") : N("Configuring printer \"%s\"...", $printer->{currentqueue}{queue}))); # Do configuration of multi-function devices and look up @@ -3648,7 +3648,7 @@ sub install_spooler { my $packages = $spoolers{$spooler}{packages2rm}; if ($packages && files_exist($packages->[1])) { undef $w; - $w = $in->wait_message(N("Printerdrake"), N("Removing %s ..."), $spoolers{$packages->[0]}{short_name}); + $w = $in->wait_message(N("Printerdrake"), N("Removing %s..."), $spoolers{$packages->[0]}{short_name}); $in->do_pkgs->remove_nodeps($packages->[0]) or do { $in->ask_warn(N("Error"), @@ -3661,7 +3661,7 @@ sub install_spooler { $packages = $spoolers{$spooler}{packages2add}; if ($packages && !files_exist(@{$packages->[1]})) { undef $w; - $w = $in->wait_message(N("Printerdrake"), N("Installing %s ..."), $spoolers{$spooler}{short_name}); + $w = $in->wait_message(N("Printerdrake"), N("Installing %s..."), $spoolers{$spooler}{short_name}); $in->do_pkgs->install(@{$packages->[0]}) or do { $in->ask_warn(N("Error"), diff --git a/perl-install/security/help.pm b/perl-install/security/help.pm index 707fdd482..92276f272 100644 --- a/perl-install/security/help.pm +++ b/perl-install/security/help.pm @@ -103,7 +103,7 @@ and crontab(1))."), 'set_root_umask' => N("Set the root umask."), CHECK_OPEN_PORT => N("if set to yes, check open ports."), -CHECK_PASSWD => N("if set to yes, check for : +CHECK_PASSWD => N("if set to yes, check for: - empty passwords, diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 812cedd2b..dfe3ee24f 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -5227,7 +5227,7 @@ msgid "" "To download these packages, you will need to have a working Internet \n" "connection.\n" "\n" -"Do you want to install the updates ?" +"Do you want to install the updates?" msgstr "" #: install_steps_interactive.pm:781 @@ -7387,7 +7387,7 @@ msgstr "" #, c-format msgid "" "You may now provide options to module %s.\n" -"Options are in format ``name=value name2=value2 ...''.\n" +"Options are in format ``name=value name2=value2...''.\n" "For instance, ``io=0x300 irq=7''" msgstr "" @@ -7699,7 +7699,7 @@ msgstr "" #: network/adsl.pm:41 network/netconnect.pm:757 #, c-format -msgid "ADSL connection type :" +msgid "ADSL connection type:" msgstr "" #: network/drakfirewall.pm:12 @@ -8414,7 +8414,7 @@ msgstr "" #: network/netconnect.pm:793 #, c-format -msgid "Encapsulation :" +msgid "Encapsulation:" msgstr "" #: network/netconnect.pm:810 @@ -8511,7 +8511,7 @@ msgstr "" #: network/netconnect.pm:930 #, c-format -msgid "Warning : IP address %s is usually reserved !" +msgid "Warning: IP address %s is usually reserved !" msgstr "" #: network/netconnect.pm:954 network/netconnect.pm:983 @@ -8606,7 +8606,7 @@ msgid "" "Iwspy is used to set a list of addresses in a wireless network\n" "interface and to read back quality of link information for each of those.\n" "\n" -"This information is the same as the one available in /proc/net/wireless :\n" +"This information is the same as the one available in /proc/net/wireless:\n" "quality of the link, signal strength and noise level.\n" "\n" "See iwpspy(8) man page for further information." @@ -8736,7 +8736,7 @@ msgstr "" #: network/netconnect.pm:1109 #, c-format -msgid "Configuration is complete, do you want to apply settings ?" +msgid "Configuration is complete, do you want to apply settings?" msgstr "" #: network/netconnect.pm:1119 @@ -8761,12 +8761,12 @@ msgstr "" #: network/netconnect.pm:1151 #, c-format -msgid "How do you want to dial this connection ?" +msgid "How do you want to dial this connection?" msgstr "" #: network/netconnect.pm:1164 #, c-format -msgid "The network needs to be restarted. Do you want to restart it ?" +msgid "The network needs to be restarted. Do you want to restart it?" msgstr "" #: network/netconnect.pm:1171 network/netconnect.pm:1236 @@ -9616,7 +9616,7 @@ msgstr "" #: printer/printerdrake.pm:713 #, c-format -msgid "Configuring printer ..." +msgid "Configuring printer..." msgstr "" #: printer/printerdrake.pm:714 printer/printerdrake.pm:769 printer/printerdrake.pm:3791 @@ -10844,7 +10844,7 @@ msgstr "" #: printer/printerdrake.pm:3662 #, c-format -msgid "Removing %s ..." +msgid "Removing %s..." msgstr "" #: printer/printerdrake.pm:3666 @@ -10854,7 +10854,7 @@ msgstr "" #: printer/printerdrake.pm:3675 #, c-format -msgid "Installing %s ..." +msgid "Installing %s..." msgstr "" #: printer/printerdrake.pm:3679 @@ -11310,7 +11310,7 @@ msgstr "" #: security/help.pm:106 #, c-format msgid "" -"if set to yes, check for :\n" +"if set to yes, check for:\n" "\n" "- empty passwords,\n" "\n" @@ -15142,7 +15142,7 @@ msgstr "" #: standalone/drakboot:156 #, c-format -msgid "Do you want to configure it now ?" +msgid "Do you want to configure it now?" msgstr "" #: standalone/drakboot:167 @@ -15350,7 +15350,7 @@ msgstr "" #: standalone/drakbug:228 #, c-format -msgid "connecting to %s ..." +msgid "connecting to %s..." msgstr "" #: standalone/drakbug:236 @@ -15431,7 +15431,7 @@ msgid "" "We need to install ntp package\n" " to enable Network Time Protocol\n" "\n" -"Do you want to install ntp ?" +"Do you want to install ntp?" msgstr "" #: standalone/drakconnect:84 @@ -15769,12 +15769,12 @@ msgstr "" #: standalone/drakedm:77 #, c-format -msgid "The change is done, do you want to restart the dm service ?" +msgid "The change is done, do you want to restart the dm service?" msgstr "" #: standalone/drakedm:78 #, c-format -msgid "You are going to close all running programs and lose your current session. Are you really sure that you want to restart the dm service ?" +msgid "You are going to close all running programs and lose your current session. Are you really sure that you want to restart the dm service?" msgstr "" #: standalone/drakfloppy:40 @@ -16699,12 +16699,12 @@ msgstr "" #: standalone/drakperm:289 standalone/drakxtv:87 #, c-format -msgid "User :" +msgid "User:" msgstr "" #: standalone/drakperm:291 #, c-format -msgid "Group :" +msgid "Group:" msgstr "" #: standalone/drakperm:295 @@ -17083,7 +17083,7 @@ msgstr "" #: standalone/draksplash:161 standalone/draksplash:309 #, c-format -msgid "This theme does not yet have a bootsplash in %s !" +msgid "This theme does not yet have a bootsplash in %s!" msgstr "" #: standalone/draksplash:167 @@ -17108,7 +17108,7 @@ msgstr "" #: standalone/draksplash:459 #, c-format -msgid "Generating preview ..." +msgid "Generating preview..." msgstr "" #. -PO: First %s is theme name, second %s (in parenthesis) is resolution @@ -17150,7 +17150,7 @@ msgstr "" msgid "" "We're going to add an UPS device.\n" "\n" -"Do you want to autodetect UPS devices connected to this machine or to manually select them ?" +"Do you want to autodetect UPS devices connected to this machine or to manually select them?" msgstr "" #: standalone/drakups:82 @@ -17302,7 +17302,7 @@ msgid "" "\n" "It's currently enabled.\n" "\n" -"What would you like to do ?" +"What would you like to do?" msgstr "" #: standalone/drakvpn:105 @@ -17327,7 +17327,7 @@ msgid "" "\n" "It's currently disabled.\n" "\n" -"What would you like to do ?" +"What would you like to do?" msgstr "" #: standalone/drakvpn:135 @@ -17441,7 +17441,7 @@ msgid "" "The %s file contents\n" "is divided into sections.\n" "\n" -"You can now :\n" +"You can now:\n" "\n" " - display, add, edit, or remove sections, then\n" " - commit the changes\n" @@ -17518,7 +17518,7 @@ msgstr "" #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510 #, c-format -msgid "Exists !" +msgid "Exists!" msgstr "" #: standalone/drakvpn:383 standalone/drakvpn:424 @@ -17728,7 +17728,7 @@ msgstr "" #: standalone/drakvpn:590 #, c-format -msgid "Can't edit !" +msgid "Can't edit!" msgstr "" #: standalone/drakvpn:591 @@ -17806,7 +17806,7 @@ msgid "" "The racoon.conf file configuration.\n" "\n" "The contents of this file is divided into sections.\n" -"You can now :\n" +"You can now:\n" " - display \t\t (display the file contents)\n" " - add\t\t\t (add one section)\n" " - edit \t\t\t (modify parameters of an existing section)\n" @@ -17835,7 +17835,7 @@ msgstr "" msgid "" "The 'add' sections step.\n" "\n" -"Here below is the racoon.conf file skeleton :\n" +"Here below is the racoon.conf file skeleton:\n" "\t'path'\n" "\t'remote'\n" "\t'sainfo' \n" @@ -17877,11 +17877,11 @@ msgstr "" #: standalone/drakvpn:750 #, c-format msgid "" -"path include path : specifies a path to include\n" +"path include path: specifies a path to include\n" "a file. See File Inclusion.\n" "\tExample: path include '/etc/racoon'\n" "\n" -"path pre_shared_key file : specifies a file containing\n" +"path pre_shared_key file: specifies a file containing\n" "pre-shared key(s) for various ID(s). See Pre-shared key File.\n" "\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n" "\n" @@ -17889,11 +17889,11 @@ msgid "" "if a certificate or certificate request is received.\n" "\tExample: path certificate '/etc/cert' ;\n" "\n" -"File Inclusion : include file \n" +"File Inclusion: include file \n" "other configuration files can be included.\n" "\tExample: include \"remote.conf\" ;\n" "\n" -"Pre-shared key File : Pre-shared key file defines a pair\n" +"Pre-shared key File: Pre-shared key file defines a pair\n" "of the identifier and the shared secret key which are used at\n" "Pre-shared key authentication method in phase 1." msgstr "" @@ -18005,7 +18005,7 @@ msgid "" "\n" "\taddress address [/ prefix] [[port]] ul_proto\n" "\n" -"Examples : \n" +"Examples: \n" "\n" "sainfo anonymous (accepts connections from anywhere)\n" "\tleave blank this entry if you want anonymous\n" @@ -18033,7 +18033,7 @@ msgid "" "\n" "\taddress address [/ prefix] [[port]] ul_proto\n" "\n" -"Examples : \n" +"Examples: \n" "\n" "sainfo anonymous (accepts connections from anywhere)\n" "\tleave blank this entry if you want anonymous\n" @@ -18058,7 +18058,7 @@ msgid "" "\n" "\taddress address [/ prefix] [[port]] ul_proto\n" "\n" -"Examples : \n" +"Examples: \n" "\n" "sainfo anonymous (accepts connections from anywhere)\n" "\tleave blank this entry if you want anonymous\n" @@ -18086,7 +18086,7 @@ msgid "" "\n" "\taddress address [/ prefix] [[port]] ul_proto\n" "\n" -"Examples : \n" +"Examples: \n" "\n" "sainfo anonymous (accepts connections from anywhere)\n" "\tleave blank this entry if you want anonymous\n" @@ -18124,7 +18124,7 @@ msgid "" "the peer if you do not specify it(them). They can be\n" "individually specified in each proposal.\n" "\n" -"Examples : \n" +"Examples: \n" "\n" " lifetime time 1 min; # sec,min,hour\n" " lifetime time 1 min; # sec,min,hour\n" @@ -18151,14 +18151,14 @@ msgid "" "the peer if you do not specify it(them). They can be\n" "individually specified in each proposal.\n" "\n" -"Examples : \n" +"Examples: \n" "\n" " lifetime time 1 min; # sec,min,hour\n" " lifetime time 1 min; # sec,min,hour\n" " lifetime time 30 sec;\n" " lifetime time 30 sec;\n" " lifetime time 60 sec;\n" -"\tlifetime time 12 hour ;\n" +"\tlifetime time 12 hour;\n" "\n" "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'.\n" "" @@ -18198,7 +18198,7 @@ msgid "" "ments apply to all peers which do not match any other remote\n" "directive.\n" "\n" -"Examples : \n" +"Examples: \n" "\n" "remote anonymous\n" "remote ::1 [8000]" @@ -18342,7 +18342,7 @@ msgid "" "\t\tstring is omitted, racoon(8) will get DN from\n" "\t\tSubject field in the certificate.\n" "\n" -"Examples : \n" +"Examples: \n" "\n" "my_identifier user_fqdn \"myemail@mydomain.com\"" msgstr "" @@ -18553,7 +18553,7 @@ msgstr "" #: standalone/drakxtv:91 #, c-format -msgid "Scanning for TV channels in progress ..." +msgid "Scanning for TV channels in progress..." msgstr "" #: standalone/drakxtv:101 @@ -19917,17 +19917,17 @@ msgstr "" #: standalone/scannerdrake:66 standalone/scannerdrake:464 #, c-format -msgid "Searching for configured scanners ..." +msgid "Searching for configured scanners..." msgstr "" #: standalone/scannerdrake:70 standalone/scannerdrake:468 #, c-format -msgid "Searching for new scanners ..." +msgid "Searching for new scanners..." msgstr "" #: standalone/scannerdrake:78 standalone/scannerdrake:490 #, c-format -msgid "Re-generating list of configured scanners ..." +msgid "Re-generating list of configured scanners..." msgstr "" #: standalone/scannerdrake:100 standalone/scannerdrake:141 standalone/scannerdrake:155 @@ -20084,7 +20084,7 @@ msgstr "" #: standalone/scannerdrake:345 #, c-format -msgid "Searching for scanners ..." +msgid "Searching for scanners..." msgstr "" #: standalone/scannerdrake:380 @@ -20293,7 +20293,7 @@ msgstr "" #: standalone/service_harddrake_confirm:8 #, c-format -msgid "Do you want to run the appropriate config tool ?" +msgid "Do you want to run the appropriate config tool?" msgstr "" #: steps.pm:14 diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 5a66f3de4..a7e9f2f65 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -153,7 +153,7 @@ gtkadd($window, if ($boot_warn && $no_bootsplash && $splash_mode) { if ($in->ask_yesorno(N("Warning"), [ N("Your system bootloader is not in framebuffer mode. To activate graphical boot, select a graphic video mode from the bootloader configuration tool.") . "\n" . - N("Do you want to configure it now ?") ])) { + N("Do you want to configure it now?") ])) { enable_framebuffer(); #- it would be nice to get available themes for new cur_res here }; diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index 461e411c6..330df7aa9 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -224,7 +224,7 @@ sub get_pkg_name { sub connect_bugzilla { my ($url) = @_; if (!$stable_release) { - my $_w = create_dialog(N("Please wait"), N("connecting to %s ...", $wizard_name)); + my $_w = create_dialog(N("Please wait"), N("connecting to %s...", $wizard_name)); sleep(3); } exec $ENV{BROWSER},$url if exists $ENV{BROWSER}; diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 337e8d9b9..b0f57326b 100644 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -74,8 +74,8 @@ several different X sessions on your local machine at the same time.")), } $cfg_file; log::explanations(qq(Switching to "$dm" display manager)); if (any::running_window_manager()) { - $in->ask_yesorno('', N("The change is done, do you want to restart the dm service ?"), 1) and - $in->ask_yesorno('', N("You are going to close all running programs and lose your current session. Are you really sure that you want to restart the dm service ?"), 1) and + $in->ask_yesorno('', N("The change is done, do you want to restart the dm service?"), 1) and + $in->ask_yesorno('', N("You are going to close all running programs and lose your current session. Are you really sure that you want to restart the dm service?"), 1) and run_program::run("nohup", "/etc/rc.d/init.d/dm", "restart"); } } diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index dc000abc8..8d9270889 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -286,9 +286,9 @@ sub row_setting_dialog { $groups->entry->set_text($model->get($iter, 3)) if $iter; my $id_box = gtkadd(Gtk2::HBox->new, - Gtk2::Label->new(N("User :")), + Gtk2::Label->new(N("User:")), $users, - Gtk2::Label->new(N("Group :")), + Gtk2::Label->new(N("Group:")), $groups, ); diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash index b6ff8ceef..4a59407bd 100755 --- a/perl-install/standalone/draksplash +++ b/perl-install/standalone/draksplash @@ -158,7 +158,7 @@ $first{widgets}{combo}{res}->entry->signal_connect(changed => sub { $boot_conf_frame{frame} = Gtk2::Frame->new(N("Configure bootsplash picture")); &make_boot_frame; $first_vbox->add($boot_conf_frame{frame}); - member($theme{name}, giv_exist_thm()) && thm_in_this_res() && get_this_thm_res_conf() || $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s !", $theme{res}{res})); + member($theme{name}, giv_exist_thm()) && thm_in_this_res() && get_this_thm_res_conf() || $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s!", $theme{res}{res})); }); #- go to bootsplash configuration step 2 #$first{widgets}{button}{boot_conf}->signal_connect(clicked => sub{show_act(\%boot_conf_frame) } ); @@ -306,7 +306,7 @@ sub which_res_exist() { $first{widgets}{combo}{res}->entry->set_text($_); last; } - $is_ok == 1 or $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s !", $theme{res}{res})) and return 0; + $is_ok == 1 or $in->ask_warn(N("Notice"), N("This theme does not yet have a bootsplash in %s!", $theme{res}{res})) and return 0; return 1; } @@ -456,7 +456,7 @@ sub make_boot_frame() { } #- calculation of the 2 angle of text box and progress bar set_thm_values(); - my $_w = $in->wait_message('', N("Generating preview ...")); + my $_w = $in->wait_message('', N("Generating preview...")); my $txt_tl_xx = $theme{boot_conf}{tx}*$font_size{w}; my $txt_tl_yy = $theme{boot_conf}{ty}*$font_size{h}; my $txt_width = $theme{boot_conf}{tw}*$font_size{w}; diff --git a/perl-install/standalone/drakvpn b/perl-install/standalone/drakvpn index 7124f7237..91438f1b6 100644 --- a/perl-install/standalone/drakvpn +++ b/perl-install/standalone/drakvpn @@ -379,7 +379,7 @@ Choose the section you would like to add.\n", $ipsec_conf), $existing_section = network::ipsec::already_existing_section_ipsec_conf("config setup", $ipsec, $kernel_version); if ($existing_section eq "already existing") { -$in->ask_okcancel(N("Exists !"), +$in->ask_okcancel(N("Exists!"), N("A section with this name already exists. The section names have to be unique.\n You'll have to go back and add another section @@ -420,7 +420,7 @@ Choose continue or previous when you are done.\n", $ipsec_conf), $existing_section = network::ipsec::already_existing_section_ipsec_conf("conn %default", $ipsec, $kernel_version); if ($existing_section eq "already existing") { -$in->ask_okcancel(N("Exists !"), +$in->ask_okcancel(N("Exists!"), N("A section with this name already exists. The section names have to be unique.\n You'll have to go back and add another section @@ -507,7 +507,7 @@ Choose continue when you are done to write the data.\n", $ipsec_conf), $existing_section = network::ipsec::already_existing_section_ipsec_conf($normal_conn->{1}[0] . " " . $normal_conn->{1}[1], $ipsec, $kernel_version); if ($existing_section eq "already existing") { -$in->ask_okcancel(N("Exists !"), +$in->ask_okcancel(N("Exists!"), N("A section with this name already exists. The section names have to be unique.\n You'll have to go back and add another section @@ -547,7 +547,7 @@ Choose continue when you are done to write the data.\n"), $section) or goto ste # $existing_section = network::ipsec::already_existing_section_ipsec_conf($section->{src_dest}, $ipsec, $kernel_version); # # if ($existing_section eq "already existing") { -#$in->ask_okcancel(N("Exists !"), +#$in->ask_okcancel(N("Exists!"), #N("A section with this name already exists. #The section names have to be unique.\n #You'll have to go back and add another section @@ -587,7 +587,7 @@ my $number = network::ipsec::matched_section_key_number_ipsec_conf($choice,$ipse if ($kernel_version < 2.5) { if ($choice =~ /^version|block|private|clear|packet/) { -$in->ask_okcancel(N("Can't edit !"), +$in->ask_okcancel(N("Can't edit!"), N("You cannot edit this section.\n This section is mandatory for Freswan 2.X. One has to specify version 2.0 on the top @@ -747,7 +747,7 @@ Put your mouse over the certificate entry to obtain online help."), val => \$path_section->{1}[1], list => [ 'certificate', 'pre_shared_key', 'include' ], help => -N("path include path : specifies a path to include +N("path include path: specifies a path to include a file. See File Inclusion. Example: path include '/etc/racoon' @@ -1024,7 +1024,7 @@ Examples : \n lifetime time 30 sec; lifetime time 30 sec; lifetime time 60 sec; - lifetime time 12 hour ; + lifetime time 12 hour; So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'. ") }, diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 689f72ddc..3c1a481af 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -84,11 +84,11 @@ sub scan4channels() { [ { label => N("TV norm:"), val => \$norm, list => [ "NTSC", "NTSC-JP", "PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM" ], type => 'combo' }, { label => N("Area:"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1 }, - { label => N("User :"), val => \$user, list => [ keys %users ], sort => 1 }, + { label => N("User:"), val => \$user, list => [ keys %users ], sort => 1 }, ] )) { my $_wait = $in->wait_message(N("Please wait"), - N("Scanning for TV channels in progress ...")); + N("Scanning for TV channels in progress...")); # we provide scantv a bogus table (france) which will # will be ignored since "All" is selected (because of -a) $ftable_id = "france -a " if $ftable_id eq -1; diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index 78dac5207..9cd4b64d3 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -63,11 +63,11 @@ Do you want to install the SANE packages?"))) { } if ($::Manual) { manual(); quit() } my $wait = $in->wait_message(N("Scannerdrake"), - N("Searching for configured scanners ...")); + N("Searching for configured scanners...")); my @c = scanner::configured(); $wait = undef; $wait = $in->wait_message(N("Scannerdrake"), - N("Searching for new scanners ...")); + N("Searching for new scanners...")); my @f = scanner::detect(@c); $wait = undef; my $changed = 0; @@ -75,7 +75,7 @@ my $changed = 0; if ($changed) { my $_wait = $in->wait_message(N("Scannerdrake"), - N("Re-generating list of configured scanners ...")); + N("Re-generating list of configured scanners...")); @c = scanner::configured(); } mainwindow(@c); @@ -342,7 +342,7 @@ sub tryConfScanner { ) or return 0; if ($port eq N("Auto-detect available ports")) { $wait = $in->wait_message(N("Scannerdrake"), - N("Searching for scanners ...")); + N("Searching for scanners...")); my @d = scanner::detect(); undef $wait; my @list = map { @@ -461,11 +461,11 @@ sub mainwindow { # Do scanner auto-detection my $wait = $in->wait_message(N("Scannerdrake"), - N("Searching for configured scanners ...")); + N("Searching for configured scanners...")); @configured = scanner::configured(); $wait = $in->wait_message(N("Scannerdrake"), - N("Searching for new scanners ...")); + N("Searching for new scanners...")); my @f = scanner::detect(@configured); $wait = undef; if (@f) { @@ -487,7 +487,7 @@ sub mainwindow { if ($changed) { my $_wait = $in->wait_message(N("Scannerdrake"), - N("Re-generating list of configured scanners ...")); + N("Re-generating list of configured scanners...")); @configured = scanner::configured(); } } else { diff --git a/perl-install/standalone/service_harddrake_confirm b/perl-install/standalone/service_harddrake_confirm index eaf454960..1528fd9bf 100644 --- a/perl-install/standalone/service_harddrake_confirm +++ b/perl-install/standalone/service_harddrake_confirm @@ -5,5 +5,5 @@ use interactive; my $in = interactive->vnew; my $res = $in->ask_okcancel(N("Hardware changes in \"%s\" class (%s seconds to answer)", $ARGV[0], $ARGV[1]), - $ARGV[2] . N("Do you want to run the appropriate config tool ?"), 1); + $ARGV[2] . N("Do you want to run the appropriate config tool?"), 1); $in->exit($res); |