From 8f9c5cf8429ed54fd8ba5dac74d00dea4153acb3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 21 Jan 2004 15:16:36 +0000 Subject: use N("...") rather than N('...') for perl_checker --- dns_wizard/Bind.pm | 56 +++++++++++++++++++++---------------------- ldap_wizard/ldap.pm | 36 ++++++++++++++-------------- nisautofs_wizard/Nisautofs.pm | 18 +++++++------- pxe_wizard/Pxe.pm | 30 +++++++++++------------ 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm index 1cc58f2f..e5d210b4 100644 --- a/dns_wizard/Bind.pm +++ b/dns_wizard/Bind.pm @@ -101,7 +101,7 @@ sub list_hosts { $o->{pages} = { welcome => { - name => N('DNS Master configuration wizard') . "\n\n" . N('DNS (Domain Name Server) is the service that maps an IP address of a machine with an internet host name.') . "\n\n" . N('This wizard will help you configuring the DNS services of your server. This configuration will provide a local DNS service for local computers names, with non-local requests forwarded to an outside DNS.'), + name => N("DNS Master configuration wizard") . "\n\n" . N("DNS (Domain Name Server) is the service that maps an IP address of a machine with an internet host name.") . "\n\n" . N("This wizard will help you configuring the DNS services of your server. This configuration will provide a local DNS service for local computers names, with non-local requests forwarded to an outside DNS."), no_back => 1, pre => sub { $o->{var}{wiz_level} ||= 1; @@ -130,7 +130,7 @@ $o->{pages} = { next => 'summaryadd', }, removehost => { - name => N('Remove host:') . "\n\n" . N('Remove a host in existing dns configuration.') . "\n\n" . N('Choose the host you want to remove in the following list.'), + name => N("Remove host:") . "\n\n" . N("Remove a host in existing dns configuration.") . "\n\n" . N("Choose the host you want to remove in the following list."), data => [ { label => N("Name of the machine:"), val => \$o->{var}{CLIENTNAME}, fixed_list => \@list_hosts }, ], @@ -138,42 +138,42 @@ $o->{pages} = { next => 'summaryremove', }, slave => { - name => N('Slave DNS server') . "\n\n" . N("A slave name server will take some of the burden away from your primary name server, and will also function as a backup server, in case your master server is unreachable."), + name => N("Slave DNS server") . "\n\n" . N("A slave name server will take some of the burden away from your primary name server, and will also function as a backup server, in case your master server is unreachable."), data => [ - { label => N('IP of master DNS server:'), val => \$o->{var}{IPMASTER} }, + { label => N("IP of master DNS server:"), val => \$o->{var}{IPMASTER} }, ], post => \&check_ipm, next => 'summaryslave', }, ipforward => { - name => N('IP of your forwarders') . "\n\n" . N('Forwarding occurs on only those queries for which the server is not authoritative and does not have the answer in its cache.') . "\n\n" . N('So if you need it and know your ip forwarder enter IP address of it, if you dont know leave it blank'), + name => N("IP of your forwarders") . "\n\n" . N("Forwarding occurs on only those queries for which the server is not authoritative and does not have the answer in its cache.") . "\n\n" . N("So if you need it and know your ip forwarder enter IP address of it, if you dont know leave it blank"), data => [ - { label => N('IP forwarders:'), val => \$o->{var}{IPOFFORWARDER} }, + { label => N("IP forwarders:"), val => \$o->{var}{IPOFFORWARDER} }, ], post => \&check_ipf, next => 'addsearch', }, addsearch => { - name => N('Add search domain') . "\n\n" . N('Search list for host-name lookup. The search list is normally determined from the local domain name; by default, it contains only the local domain name. This may be changed by listing the desired domain search path following the search keyword') . "\n\n" . N('Domainname of this server is automatically added, and you dont need to add it here.'), + name => N("Add search domain") . "\n\n" . N("Search list for host-name lookup. The search list is normally determined from the local domain name; by default, it contains only the local domain name. This may be changed by listing the desired domain search path following the search keyword") . "\n\n" . N("Domainname of this server is automatically added, and you dont need to add it here."), data => [ - { label => N('Add search domain:'), val => \$o->{var}{ADDSEARCH} }, + { label => N("Add search domain:"), val => \$o->{var}{ADDSEARCH} }, ], next => 'summary', }, error_ipf => { - name => N('Error IP of forwarder.') . "\n\n" . N('This is not a valid IP address for your forwarder... press next to continue'), + name => N("Error IP of forwarder.") . "\n\n" . N("This is not a valid IP address for your forwarder... press next to continue"), ignore => 1, next => 'ipforward', }, error_ipm => { - name => N('Error Ip of DNS master.') . "\n\n" . N('This is not a valid Master DNS IP address... press next to continue'), + name => N("Error Ip of DNS master.") . "\n\n" . N("This is not a valid Master DNS IP address... press next to continue"), ignore => 1, next => 'slave', }, error_iph => { - name => N('Error Ip of new host.') . "\n\n" . N('This is not a valid IP address... press next to continue'), + name => N("Error Ip of new host.") . "\n\n" . N("This is not a valid IP address... press next to continue"), ignore => 1, next => 'addhost', }, @@ -183,12 +183,12 @@ $o->{pages} = { next => 'client_id' }, error_add => { - name => N('Error add host.') . "\n\n" . N('It seems that host is already in your DNS configuration... press next to continue'), + name => N("Error add host.") . "\n\n" . N("It seems that host is already in your DNS configuration... press next to continue"), ignore => 1, next => 'addhost', }, error_remove => { - name => N('Error remove host.') . "\n\n" . N('It seems that this is not present in your DNS configuration... press next to continue'), + name => N("Error remove host.") . "\n\n" . N("It seems that this is not present in your DNS configuration... press next to continue"), ignore => 1, next => 'removehost', }, @@ -203,15 +203,15 @@ $o->{pages} = { end => 1, }, summaryslave => { - name => N('Ok Now building your DNS slave configuration') . "\n\n" . N('with this configuration:'), + name => N("Ok Now building your DNS slave configuration") . "\n\n" . N("with this configuration:"), data => [ - { label => N('Ip of master DNS server:'), fixed_val => \$o->{var}{IPMASTER} }, + { label => N("Ip of master DNS server:"), fixed_val => \$o->{var}{IPMASTER} }, ], post => \&do_it_slave, next => 'end', }, summaryadd => { - name => N('Client with this identification will be added to your DNS'), + name => N("Client with this identification will be added to your DNS"), data => [ { label => N("Name of the machine:"), fixed_val => \$o->{var}{CLIENTNAME} }, { label => N("IP number of the machine:"), fixed_val => \$o->{var}{CLIENTIP} }, @@ -220,7 +220,7 @@ $o->{pages} = { next => 'endadd', }, summaryremove => { - name => N('Client with this identification will be removed to your DNS'), + name => N("Client with this identification will be removed to your DNS"), data => [ { label => N("Name of the machine:"), val => \$o->{var}{CLIENTNAME}, fixed_list => \@list_hosts }, ], @@ -228,30 +228,30 @@ $o->{pages} = { next => 'endremove', }, summary => { - name => N('Ok Now building your DNS configuration') . "\n\n" . N('with this configuration:'), + name => N("Ok Now building your DNS configuration") . "\n\n" . N("with this configuration:"), data => [ - { label => N('Server Hostname:'), fixed_val => \$o->{var}{SHORTHOSTNAME} }, - { label => N('Domainname:'), fixed_val => \$o->{var}{DOMAINNAME} }, - { label => N('IP forwarders:'), fixed_val => \$o->{var}{IPOFFORWARDER} }, - { label => N('add search domain:'), fixed_val => \$o->{var}{ADDSEARCH} }, + { label => N("Server Hostname:"), fixed_val => \$o->{var}{SHORTHOSTNAME} }, + { label => N("Domainname:"), fixed_val => \$o->{var}{DOMAINNAME} }, + { label => N("IP forwarders:"), fixed_val => \$o->{var}{IPOFFORWARDER} }, + { label => N("add search domain:"), fixed_val => \$o->{var}{ADDSEARCH} }, ], post => \&do_it_master, next => 'end', }, endadd => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully add host in your DNS.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully add host in your DNS.") } ], next => 'addhost', }, endremove => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully remove host in your DNS.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully remove host in your DNS.") } ], end => 1, next => 0, }, end => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully configured the DNS service of your server.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully configured the DNS service of your server.") } ], no_back => 1, end => 1, next => 0, diff --git a/ldap_wizard/ldap.pm b/ldap_wizard/ldap.pm index 7c4c9ce6..a69c0eb5 100644 --- a/ldap_wizard/ldap.pm +++ b/ldap_wizard/ldap.pm @@ -59,7 +59,7 @@ my %level = ( $o->{pages} = { welcome => { - name => N('LDAP configuration wizard') . "\n\n" . N('Setup a ldap server.'), + name => N("LDAP configuration wizard") . "\n\n" . N("Setup a ldap server."), no_back => 1, pre => sub { $o->{var}{wiz_level} ||= 1; }, post => sub { if ($o->{var}{wiz_level} == 2) { @@ -96,18 +96,18 @@ $o->{pages} = { next => 'summaryadd', }, setldap => { - name => N('Ldap RootDSE') . "\n\n" . N('example:') . "\n" . N('obelx.nux.com') . "\n\n" . N('will be in ldap config:') . "\n" . N('dc=obelx,dc=nux,dc=com') . "\n\n" . N('RootDN is the manager of your ldap server.'), + name => N("Ldap RootDSE") . "\n\n" . N("example:") . "\n" . N("obelx.nux.com") . "\n\n" . N("will be in ldap config:") . "\n" . N("dc=obelx,dc=nux,dc=com") . "\n\n" . N("RootDN is the manager of your ldap server."), data => [ - { label => N('RootDSE'), val => \$o->{var}{rootdse} }, - { label => N('RootDN'), val => \$o->{var}{rootdn} }, - { label => N('Password'), val => \$o->{var}{rootpass} }, - { label => N('Default OU'), val => \$o->{var}{defou} }, + { label => N("RootDSE"), val => \$o->{var}{rootdse} }, + { label => N("RootDN"), val => \$o->{var}{rootdn} }, + { label => N("Password"), val => \$o->{var}{rootpass} }, + { label => N("Default OU"), val => \$o->{var}{defou} }, ], post => \&test_set, next => 'summaryset', }, summaryadd => { - name => N('Ok Now add entry in LDAP'), + name => N("Ok Now add entry in LDAP"), data => [ { label => N("First Name:"), fixed_val => \$o->{var}{cn} }, @@ -144,40 +144,40 @@ $o->{pages} = { next => 'endadd', }, summaryset => { - name => N('Ok Now building your LDAP configuration') . "\n\n" . N('with this configuration:'), + name => N("Ok Now building your LDAP configuration") . "\n\n" . N("with this configuration:"), data => [ - { label => N('RootDSE'), fixed_val => \$o->{var}{rootdse} }, - { label => N('RootDN'), fixed_val => \$o->{var}{rootdn} }, + { label => N("RootDSE"), fixed_val => \$o->{var}{rootdse} }, + { label => N("RootDN"), fixed_val => \$o->{var}{rootdn} }, ], post => \&do_it_setldap, next => 'end' }, error_homedir => { - name => N('Error in Home directory'), + name => N("Error in Home directory"), next => 'add_user_posix', }, error_pass => { - name => N('Error, pass could not be empty'), + name => N("Error, pass could not be empty"), next => 'setldap', }, error_shell => { - name => N('Error in Login shell') . "\n\n" . N('Please choose a correct one'), + name => N("Error in Login shell") . "\n\n" . N("Please choose a correct one"), next => 'add_user_posix', }, error_nb => { - name => N('Error') . "\n\n" . N('Please Should be a number'), + name => N("Error") . "\n\n" . N("Please Should be a number"), next => 'add_user_posix', }, end => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully configured the LDAP.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully configured the LDAP.") } ], no_back => 1, end => 1, next => 0 }, endadd => { - name => N('Successfully add data'), - data => [ { label => N('The wizard successfully add entry in ldap') } ], + name => N("Successfully add data"), + data => [ { label => N("The wizard successfully add entry in ldap") } ], no_back => 1, end => 1, next => 0 diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm index a3052eab..0396d4bc 100644 --- a/nisautofs_wizard/Nisautofs.pm +++ b/nisautofs_wizard/Nisautofs.pm @@ -94,7 +94,7 @@ $o->{pages} = { next => 'summaryclient', }, nis_server => { - name => N('NIS server with autofs map') . "\n\n" . N('NIS server: name of your computer.') . "\n" . N('Home NIS: home directory for users on NIS server. This directory will be export through NFS server.') . "\n" . N('NIS domain: NIS domain for your NIS server.'), + name => N("NIS server with autofs map") . "\n\n" . N("NIS server: name of your computer.") . "\n" . N("Home NIS: home directory for users on NIS server. This directory will be export through NFS server.") . "\n" . N("NIS domain: NIS domain for your NIS server."), data => [ { label => N("NIS server:"), val => $HOST }, { label => N("Home NIS:"), val => \$o->{var}{HOMENIS} }, @@ -104,7 +104,7 @@ $o->{pages} = { next => 'summaryserver', }, summaryserver => { - name => N('Will set your NIS server with autofs map'), + name => N("Will set your NIS server with autofs map"), data => [ { label => N("NIS server:"), fixed_val => \$HOST }, { label => N("Home NIS:"), fixed_val => \$o->{var}{HOMENIS} }, @@ -119,7 +119,7 @@ $o->{pages} = { next => 'endserver', }, summaryclient => { - name => N('Will set your computer has a NIS client.') . "\n\n" . N("NIS server: hostname of the nisserver.") . "\n" . N("NIS domainname: name of NIS domainname."), + name => N("Will set your computer has a NIS client.") . "\n\n" . N("NIS server: hostname of the nisserver.") . "\n" . N("NIS domainname: name of NIS domainname."), data => [ { label => N("NIS server:"), fixed_val => \$o->{var}{NISSERVER} }, { label => N("NIS domainname:"), fixed_val => \$o->{var}{NISDOMAIN} }, @@ -128,24 +128,24 @@ $o->{pages} = { next => 'endclient', }, error_homedir => { - name => N('Error should be a directory'), + name => N("Error should be a directory"), next => 'nis_server', }, error_nisd => { - name => N('Error nisdomainame should be correct (not none or localdomain)') . "\n\n" . N('Please adjust with domainname command or in /etc/sysconfig/network file (NISDOMAIN=yournisdomain)'), + name => N("Error nisdomainame should be correct (not none or localdomain)") . "\n\n" . N("Please adjust with domainname command or in /etc/sysconfig/network file (NISDOMAIN=yournisdomain)"), end => 1, next => 0, }, endclient => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully configured your machine to be a NIS client.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully configured your machine to be a NIS client.") } ], no_back => 1, end => 1, next => 0 }, endserver => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully configured your machine to be a NIS with autofs map.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully configured your machine to be a NIS with autofs map.") } ], no_back => 1, end => 1, next => 0 diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm index a3f6209f..87d127bc 100644 --- a/pxe_wizard/Pxe.pm +++ b/pxe_wizard/Pxe.pm @@ -173,19 +173,19 @@ $o->{pages} = { next => 'summaryserver', }, error_img => { - name => N('Please provide a bootable image...'), + name => N("Please provide a bootable image..."), next => 'addimg', }, error_name => { - name => N('Please provide a correct name in PXE entry (one word)'), + name => N("Please provide a correct name in PXE entry (one word)"), next => 'addimg', }, simmilar_entry => { - name => N('Similar name is already used in PXE menu entry') . "\n\n" . N("Please provide another PXE Menu name"), + name => N("Similar name is already used in PXE menu entry") . "\n\n" . N("Please provide another PXE Menu name"), next => 'addimg', }, summaryserver => { - name => N('Now will prepare all default files to set the PXE server'), + name => N("Now will prepare all default files to set the PXE server"), data => [ { label => N("Tftp directory:"), fixed_val => \$TFTPDIR }, { label => N("Boot image path:"), fixed_val => \$IMGPATH }, @@ -196,7 +196,7 @@ $o->{pages} = { next => 'endserver', }, summarymodify => { - name => N('Now will modify boot options in image'), + name => N("Now will modify boot options in image"), data => [ { label => N("Boot image to modify:"), fixed_val => \$o->{var}{i} }, { label => N("Server IP:"), fixed_val => \$o->{var}{IP} }, @@ -212,7 +212,7 @@ $o->{pages} = { next => 'endmodify', }, summaryremove => { - name => N('Now will remove your PXE boot image'), + name => N("Now will remove your PXE boot image"), data => [ { label => N("PXE entry to remove:"), fixed_val => \$o->{var}{IMGTOREMOVE} }, ], @@ -220,7 +220,7 @@ $o->{pages} = { next => 'endremove', }, summaryadd => { - name => N('Now will add your PXE boot image'), + name => N("Now will add your PXE boot image"), data => [ { label => "PXE name:", fixed_val => \$o->{var}{PXENAME} }, { label => "PXE description:", fixed_val => \$o->{var}{DESCR} }, @@ -230,23 +230,23 @@ $o->{pages} = { next => 'endadd', }, endadd => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully add a PXE boot image.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully add a PXE boot image.") } ], next => 'welcome', }, endremove => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully remove a PXE boot image.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully remove a PXE boot image.") } ], next => 'welcome', }, endmodify => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully modify image(s).') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully modify image(s).") } ], next => 'welcome', }, endserver => { - name => N('Congratulations'), - data => [ { label => N('The wizard successfully configured your PXE server.') } ], + name => N("Congratulations"), + data => [ { label => N("The wizard successfully configured your PXE server.") } ], no_back => 1, end => 1, next => 0 -- cgit v1.2.1