fix N() encapsuled strings not seen as "to be extracted" strings when

generating the pot

11 files changed, 188 insertions, 188 deletions

diff --git a/Wiztemplate.pm b/Wiztemplate.pm
index 67183b9b..0eb01ebc 100755
--- a/Wiztemplate.pm
+++ b/Wiztemplate.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+c#!/usr/bin/perl
 
 # Drakwizard
 
@@ -28,7 +28,7 @@ use MDK::Wizard::IFCFG;
 my $wiz = new Wizcommon;
 
 my $o = { 
-    name => N('configuration wizard'),
+    name => N("configuration wizard"),
 	var => { 
 	    ip1 => '',
 	    ip2 => ''
@@ -57,11 +57,11 @@ $o->{pages} = {
 	          next => 'summary'
 	      },
 	      warning => {
-		name => N('Warning.') . "\n\n" . N(''),
+		name => N("Warning.") . "\n\n" . N(''),
 	        next => 'summary'
 	      },
 	      error => {
-		name => N('Error.') . "\n\n" . N(''),
+		name => N("Error.") . "\n\n" . N(''),
 	        next => 'config'
 	      },
 	      summary => {
@@ -75,7 +75,7 @@ $o->{pages} = {
 	        next => 'end'
 	      },
 	      end => { 
-	        name => N('Congratulations') . "\n\n" . N(''),
+	        name => N("Congratulations") . "\n\n" . N(''),
 		end => 1,
 	        next => 0
 	  },
diff --git a/client_wizard/Bind_client.pm b/client_wizard/Bind_client.pm
index 44b692e8..3a62c027 100755
--- a/client_wizard/Bind_client.pm
+++ b/client_wizard/Bind_client.pm
@@ -35,7 +35,7 @@ my $wiz_ip_server = $wiz->{net}->itf_get("IPADDR");
 my $wiz_domain_name = $wiz->{net}->network_get("DOMAINNAME");
 
 my $o = { 
-    name => N('DNS Client Wizard'),
+    name => N("DNS Client Wizard"),
     var => { 
 	    client_ip => '',
 	    client_name => ''
@@ -44,7 +44,7 @@ my $o = {
     defaultimage => "$ENV{__WIZ_HOME__}client_wizard/images/DNS.png",
     init => sub {
 	if (! -f "/var/named/$wiz_domain_name.db") {
-	    return (0, N('You must first run the DNS server wizard'))
+	    return (0, N("You must first run the DNS server wizard"))
 	}
 	1
     }
@@ -52,49 +52,49 @@ my $o = {
 
 $o->{pages} = { 
 		  welcome => {
-		      name => N('DNS Client Wizard') . "\n\n" . N('A client of your local network is a machine connected to the network having its own name and IP number.') . "\n\n" . N('This wizard will help you in adding a new client in your local DNS.') . "\n\n" . N('The server will use the informations you enter here to make the name of the client available to other machines into your network.') . "\n\n" . N('Press next to begin, or Cancel to leave this wizard.'),
+		      name => N("DNS Client Wizard") . "\n\n" . N("A client of your local network is a machine connected to the network having its own name and IP number.") . "\n\n" . N("This wizard will help you in adding a new client in your local DNS.") . "\n\n" . N("The server will use the informations you enter here to make the name of the client available to other machines into your network.") . "\n\n" . N("Press next to begin, or Cancel to leave this wizard."),
 		      post => sub { $wiz->check_dhcp },
 		  no_back => 1,
 	          next => 'client_id'
 	      },
 	      client_id => {
-	          name => N('Client identification:') . "\n\n" . N('Your client on the network will be identified by name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax.') . "\n\n" . N("(you don't need to type the domain after the name)") . "\n\n" . N('Note that the given IP number and client name should be unique in the network.'),
+	          name => N("Client identification:") . "\n\n" . N("Your client on the network will be identified by name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax.") . "\n\n" . N("(you don't need to type the domain after the name)") . "\n\n" . N("Note that the given IP number and client name should be unique in the network."),
 		  pre => sub {
 		    $o->{var}{client_ip} = ip();
 		    $o->{var}{client_name} = name();
 		  },
                   data => [
-		      { label => N('Name of the machine:'), val => \$o->{var}{client_name} },
-		      { label => N('IP number of the machine:'), val => \$o->{var}{client_ip} },
+		      { label => N("Name of the machine:"), val => \$o->{var}{client_name} },
+		      { label => N("IP number of the machine:"), val => \$o->{var}{client_ip} },
 		      ],
 	          next => 'summary'
 	      },
 	      dhcp_warning => {
-		name => N('Warning') . "\n\n" . N('You are in dhcp, server may not work with your configuration.'),
+		name => N("Warning") . "\n\n" . N("You are in dhcp, server may not work with your configuration."),
 		ignore => 1,
 	        next => 'client_id'
 	      },
 	      system_error => {
-		name => N('Error') . "\n\n" . N('System error, no configuration done'),
+		name => N("Error") . "\n\n" . N("System error, no configuration done"),
 		ignore => 1,
 	        next => 'client_id'
 	      },
 	      error => {
-		name => N('Error') . "\n\n" . N('This is not a valid address... press next to continue'),
+		name => N("Error") . "\n\n" . N("This is not a valid address... press next to continue"),
 		ignore => 1,
 	        next => 'client_id'
 	      },
 	      summary => {
-	        name => N('Adding a new client to your network') . "\n\n" . N('The wizard collected the following parameters needed to add a client to your network:') . "\n\n" . N('To accept these values, and add your client, click the Next button or use the Back button to correct them.'),
+	        name => N("Adding a new client to your network") . "\n\n" . N("The wizard collected the following parameters needed to add a client to your network:") . "\n\n" . N("To accept these values, and add your client, click the Next button or use the Back button to correct them."),
                 data => [
-		      { label => N('Client name'), fixed_val => \$o->{var}{client_name} },
-		      { label => N('Client IP:'), fixed_val => \$o->{var}{client_ip} },
+		      { label => N("Client name"), fixed_val => \$o->{var}{client_name} },
+		      { label => N("Client IP:"), fixed_val => \$o->{var}{client_ip} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
 	      },
 	      end => { 
-	        name => N('Congratulationss') . "\n\n" . N('The wizard successfully added the client.'),
+	        name => N("Congratulationss") . "\n\n" . N("The wizard successfully added the client."),
 		end => 1,
 	        next => 0
 	  },
diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index d931aa73..5ffef02b 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -44,45 +44,45 @@ my $o = {
 
 $o->{pages} = { 
 		  welcome => {
-		      name => N('DNS 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 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,
 	          next => 'dns_ip'
 	      },
 	      dns_ip => {
-	          name => N('DNS Server Addresses') . "\n\n" . N('DNS will allow your network to communicate with the Internet using standard internet host names.  In order to configure DNS, you must provide the IP address of primary and secondary DNS server; usually this address are given by your Internet provider.') . N('IP addresses are a dotted list of four numbers smaller than 256'), 
+	          name => N("DNS Server Addresses") . "\n\n" . N("DNS will allow your network to communicate with the Internet using standard internet host names.  In order to configure DNS, you must provide the IP address of primary and secondary DNS server; usually this address are given by your Internet provider.") . N("IP addresses are a dotted list of four numbers smaller than 256"), 
                   pre => sub {
 		      $o->{var}{ext_dns1} ||= $dns1;
 		      $o->{var}{ext_dns2} ||= $dns2
 		  },
                   data => [
-		      { label => N('Primary DNS Address'),  val => \$o->{var}{ext_dns1} },
-		      { label => N('Secondary DNS Address:'), val => \$o->{var}{ext_dns2} },
+		      { label => N("Primary DNS Address"),  val => \$o->{var}{ext_dns1} },
+		      { label => N("Secondary DNS Address:"), val => \$o->{var}{ext_dns2} },
 		      ],
 	          next => 'summary'
 	      },
 	      ip_error => {
-		name => 'Error.' . "\n\n" . N('This is not a valid address... press next to continue'),
+		name => 'Error.' . "\n\n" . N("This is not a valid address... press next to continue"),
 		ignore => 1,
 	        next => 'dns_ip'
 	      },
 	      ip_warning => {
-		name => 'Warning.' . "\n\n" .  N('You have entered an empty address for the DNS server.') . "\n\n" .
-		      N('Your setting could be accepted, but you will not be able to identify machine names outside your local network.') . "\n\n" .
-		      N('"Press next to leave these values empty, or back to enter a value.'),
+		name => 'Warning.' . "\n\n" .  N("You have entered an empty address for the DNS server.") . "\n\n" .
+		      N("Your setting could be accepted, but you will not be able to identify machine names outside your local network.") . "\n\n" .
+		      N("Press next to leave these values empty, or back to enter a value."),
 	        next => 'summary'
 	      },
 	      summary => {
-	        name => N('Configuring the DNS Server') . "\n\n" . N('The wizard collected the following parameters needed to configure your DNS service:') . "\n\n" . N('To accept these values, and configure your server, click the Next button or use the Back button to correct them'),
+	        name => N("Configuring the DNS Server") . "\n\n" . N("The wizard collected the following parameters needed to configure your DNS service:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them"),
                 data => [
-		      { label => N('Primary DNS Address:'), fixed_val => \$o->{var}{ext_dns1} },
-		      { label => N('Secondary DNS Address:'), fixed_val => \$o->{var}{ext_dns2} },
+		      { label => N("Primary DNS Address:"), fixed_val => \$o->{var}{ext_dns1} },
+		      { label => N("Secondary DNS Address:"), fixed_val => \$o->{var}{ext_dns2} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
 	      },
 	      end => { 
-	        name => N('Congratulations'),
-                data => [ { label => N('The wizard successfully configured the DNS services of your server.') } ], 
+	        name => N("Congratulations"),
+                data => [ { label => N("The wizard successfully configured the DNS services of your server.") } ], 
 		end => 1,
 	        next => 0
 	  },
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index 764a9cc4..2f783a49 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -42,49 +42,49 @@ my $o = {
 
 $o->{pages} = { 
 		  welcome => {
-		      name => N('FTP Server Configuration Wizard') . "\n\n" . N('This wizard will help you configuring the FTP Server for your network.'),
+		      name => N("FTP Server Configuration Wizard") . "\n\n" . N("This wizard will help you configuring the FTP Server for your network."),
 		  no_back => 1,
 		  post => \&check,
 	          next => 'config'
 	      },
 	      config => {
-	          name => N('FTP Server') . "\n\n" . N('Your server can act as an FTP Server toward your internal network (intranet) and as an FTP Server for the Internet.') . "\n\n" . N('Select the kind of FTP service you want to activate:') . "\n\n" . N('Don\'t check any box if you don\'t want to activate your FTP Server.'),
+	          name => N("FTP Server") . "\n\n" . N("Your server can act as an FTP Server toward your internal network (intranet) and as an FTP Server for the Internet.") . "\n\n" . N("Select the kind of FTP service you want to activate:") . "\n\n" . N("Don't check any box if you don't want to activate your FTP Server."),
                   pre => sub {
 			$o->{var}{wiz_ftp_internal} ||= 1;
 			$o->{var}{wiz_ftp_external} ||= 0;
 		  },
                   data => [
-		      { text => N('Enable the FTP Server for the Intranet'), type => 'bool', val => \$o->{var}{wiz_ftp_internal} },
-		      { text => N('Enable the FTP Server for the Internet'), type => 'bool', val => \$o->{var}{wiz_ftp_external} },
+		      { text => N("Enable the FTP Server for the Intranet"), type => 'bool', val => \$o->{var}{wiz_ftp_internal} },
+		      { text => N("Enable the FTP Server for the Internet"), type => 'bool', val => \$o->{var}{wiz_ftp_external} },
 		      ],
 	          next => 'summary'
 	      },
 	      warning_dhcp => {
-		name => N('Warning.') . "\n\n" . N('Warning\nYou are in dhcp, server may not work with your configuration.'),
+		name => N("Warning.") . "\n\n" . N("Warning\nYou are in dhcp, server may not work with your configuration."),
 		ignore => 1,
 	        next => 'config'
 	      },
 	      must_be_root => {
-		name => N('Error.') . "\n\n" . N('Sorry, you must be root to do this...'),
+		name => N("Error.") . "\n\n" . N("Sorry, you must be root to do this..."),
 		ignore => 1,
 	        next => 'config'
 	      },
 	      summary => {
-	        name =>  N('Configuring the FTP Server') . "\n\n" . N('The wizard collected the following parameters
-needed to configure your FTP Server') . "\n\n" . N('To accept these values, and configure your server, click the Next button or use the Back button to correct them'),
+	        name =>  N("Configuring the FTP Server") . "\n\n" . N("The wizard collected the following parameters
+needed to configure your FTP Server") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them"),
                 pre => sub {
 		    $o->{var}{internal} = $o->{var}{wiz_ftp_internal} ? N("enabled") : N("disabled");
 	 	    $o->{var}{external} = $o->{var}{wiz_ftp_external} ? N("enabled") : N("disabled")
 	        },
 		data => [
-		      { label => N('Intranet FTP Server:'), fixed_val => \$o->{var}{internal} },
-		      { label => N('Internet FTP Server:'), fixed_val => \$o->{var}{external} },
+		      { label => N("Intranet FTP Server:"), fixed_val => \$o->{var}{internal} },
+		      { label => N("Internet FTP Server:"), fixed_val => \$o->{var}{external} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
 	      },
 	      end => { 
-	        name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your Intranet/Internet FTP Server'), 
+	        name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Intranet/Internet FTP Server"), 
 		end => 1,
 	        next => 0
 	  },
diff --git a/news_wizard/Inn.pm b/news_wizard/Inn.pm
index 76ebf4e3..0f8088c8 100755
--- a/news_wizard/Inn.pm
+++ b/news_wizard/Inn.pm
@@ -41,59 +41,59 @@ my $o = {
 
 $o->{pages} = { 
 		  welcome => {
-		      name => N('Welcome to the News Wizard') . "\n\n" . N('This wizard will help you configuring the Internet News services for your network.'),
+		      name => N("Welcome to the News Wizard") . "\n\n" . N("This wizard will help you configuring the Internet News services for your network."),
 		  no_back => 1,
 	          next => 'ask_news_server'
 	      },
 	      ask_news_server => {
-	          name => N('News Server') . "\n\n" . N('The news server name is the name of the host providing the Internet news to your network; the name is usually provided by your provider.') . "\n\n" . N('Internet host names must be in the form "host.domain.domaintype"; for example, if your provider is "provider.com", the internet news server is usually "news.provider.com".'),
+	          name => N("News Server") . "\n\n" . N("The news server name is the name of the host providing the Internet news to your network; the name is usually provided by your provider.") . "\n\n" . N("Internet host names must be in the form "host.domain.domaintype"; for example, if your provider is "provider.com", the internet news server is usually "news.provider.com"."),
                   pre => sub {
 			$o->{var}{news_server} ||= get_server();
 		  },
                   data => [
-		      { label => N('News Server Name:'),  val => \$o->{var}{news_server} },
+		      { label => N("News Server Name:"),  val => \$o->{var}{news_server} },
 		      ],
 		      post => sub { $o->{var}{news_server} or 'error_in_news_server' },
 	          next => 'ask_news_freq'
 	      },
 	      ask_news_freq => {
-	          name => N('Polling Period') . "\n\n" . N('Your server will regularly poll the News Server for obtaning the latest Internet News; the polling period set the interval between two consecutive polling.') . "\n\n" . N('Depending on the kind of internet connection you have, an appropriate polling period can change between 6 and 24 hours.'),
+	          name => N("Polling Period") . "\n\n" . N("Your server will regularly poll the News Server for obtaning the latest Internet News; the polling period set the interval between two consecutive polling.") . "\n\n" . N("Depending on the kind of internet connection you have, an appropriate polling period can change between 6 and 24 hours."),
                   pre => sub {
 			$o->{var}{news_freq} ||= 24;
 		  },
                   data => [
-		      { label => N('Polling Period (Hours):'), val => \$o->{var}{news_freq} },
+		      { label => N("Polling Period (Hours):"), val => \$o->{var}{news_freq} },
 		      ],
 		  post => \&check_valid_hours,
 	          next => 'summary'
 	      },
               warning => {
-		name => N('Warning.'),
+		name => N("Warning."),
 		ignore => 1,
 	        next => 'summary'
 	      },
 	      error_in_news_server => {
-		name => N('Error.') . "\n\n" . N('The news server name is not correct'),
+		name => N("Error.") . "\n\n" . N("The news server name is not correct"),
 		ignore => 1,
 	        next => 'ask_news_server'
 	      },
 	      error_in_polling_time => {
-		name => N('Error.') . "\n\n" . N('The polling period is not correct'),
+		name => N("Error.") . "\n\n" . N("The polling period is not correct"),
 		ignore => 1,
 	        next => 'ask_news_freq'
 	      },
 	      summary => {
-	        name =>  N('Configuring the Internet News') . "\n\n" . N('The wizard collected the following parameters
-needed to configure your Internet News Service:') . "\n\n" . N('To accept these values, and configure your server, click the Next button or use the Back button to correct them.'),
+	        name =>  N("Configuring the Internet News") . "\n\n" . N("The wizard collected the following parameters
+needed to configure your Internet News Service:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
                 data => [
-		      { label => N('News Server:'), fixed_val => \$o->{var}{news_server} },
-		      { label => N('Polling Interval:'), fixed_val => \$o->{var}{news_freq} },
+		      { label => N("News Server:"), fixed_val => \$o->{var}{news_server} },
+		      { label => N("Polling Interval:"), fixed_val => \$o->{var}{news_freq} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
 	      },
 	      end => { 
-	        name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your Internet News service of your server.'), 
+	        name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Internet News service of your server."), 
 		end => 1,
 	        next => 0
 	  },
diff --git a/nfs_wizard/NFS.pm b/nfs_wizard/NFS.pm
index dd898072..6b47941e 100755
--- a/nfs_wizard/NFS.pm
+++ b/nfs_wizard/NFS.pm
@@ -31,7 +31,7 @@ use MDK::Wizard::Wizcommon;
 my $wiz = new MDK::Wizard::Wizcommon;
 
 my $o = { 
-    name => N('NFS Wizard'),
+    name => N("NFS Wizard"),
 	var => { 
 	    wiz_nfs_dir => '',
 	    wiz_nfs_level => '',
@@ -42,26 +42,26 @@ my $o = {
     };
 
 my %level = (
-    1 => N('All - No access restriction'),
-    2 => N('Local Network - access for local network (recommended)')
+    1 => N("All - No access restriction"),
+    2 => N("Local Network - access for local network (recommended)")
 );
     
 $o->{pages} = { 
     welcome => {
-        name => N('NFS Server Configuration Wizard') . "\n\n" . N('This wizard will help you configuring the NFS Server for your network.'),
+        name => N("NFS Server Configuration Wizard") . "\n\n" . N("This wizard will help you configuring the NFS Server for your network."),
         no_back => 1,
         next => 'nfs'
     },
     nfs => {
-        name => N('NFS Server'),
+        name => N("NFS Server"),
         post => \&check,
         data => [
-            { label => N('Directory:'), val => \$o->{var}{wiz_nfs_dir} },
+            { label => N("Directory:"), val => \$o->{var}{wiz_nfs_dir} },
             ],
         next => 'ask_level'
     },
     ask_level => {
-      name => N('Access Control') . "\n\n" . N('NFS can be restricted to a certain ip class') . "\n\n" . N('Choose the level that suits your needs. If you don\'t know, the Local Network level is usually the most appropriate. Beware that the All level may be not secure.'),
+      name => N("Access Control") . "\n\n" . N("NFS can be restricted to a certain ip class") . "\n\n" . N("Choose the level that suits your needs. If you don't know, the Local Network level is usually the most appropriate. Beware that the All level may be not secure."),
       pre => sub {
 	$o->{var}{wiz_netmask} = network_mask() if !$o->{var}{wiz_netmask} || $o->{var}{wiz_netmask} eq '0.0.0.0/0.0.0.0'
       },
@@ -72,34 +72,34 @@ $o->{pages} = {
       next => 'summary'
     },
     shownet => {
-       name => N('Grant access on local network') . "\n\n" . N('Access will be allowed for hosts on the network. Here is the information found about your current local network, you can modify it if needed.'),
+       name => N("Grant access on local network") . "\n\n" . N("Access will be allowed for hosts on the network. Here is the information found about your current local network, you can modify it if needed."),
       data => [ 
-            { label => N('Authorized network:'), val => \$o->{var}{wiz_netmask} },
+            { label => N("Authorized network:"), val => \$o->{var}{wiz_netmask} },
 	    ],
       next => 'summary'
 
     },
     error_dir => {
-      name => N('Error.') . "\n\n" . N('The path you entered does not exist.'),
+      name => N("Error.") . "\n\n" . N("The path you entered does not exist."),
       ignore => 1,
       next => 'nfs'
     },
     summary => {
-      name =>  N('The wizard collected the following parameters.'),
+      name =>  N("The wizard collected the following parameters."),
       pre => sub {
 	  $o->{var}{wiz_text_level} = $level{$o->{var}{wiz_nfs_level}};
 	  $o->{var}{wiz_netmask} = $o->{var}{wiz_nfs_level} == 1 ? "0.0.0.0/0.0.0.0" : $o->{var}{wiz_netmask} 
       },
       data => [
-            { label => N('Exported dir:'), fixed_val => \$o->{var}{wiz_nfs_dir} },
-            { label => N('Access :'), fixed_val => \$o->{var}{wiz_text_level} },
-            { label => N('Netmask :'), fixed_val => \$o->{var}{wiz_netmask} },
+            { label => N("Exported dir:"), fixed_val => \$o->{var}{wiz_nfs_dir} },
+            { label => N("Access :"), fixed_val => \$o->{var}{wiz_text_level} },
+            { label => N("Netmask :"), fixed_val => \$o->{var}{wiz_netmask} },
         ],
       post => \&do_it,
       next => 'end'
     },
     end => { 
-      name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your NFS Server'), 
+      name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your NFS Server"), 
       end => 1,
       next => 0
 },
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index c5f28f3d..e2e7ceec 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -49,7 +49,7 @@ $o->{pages} = {
           next => 'config'
       },
       config => {
-          name => N("Outgoing Mail Address") . "\n\n" . N('You can select the kind of address that outgoing mail will show in the "From:" and "Reply-to" field.') . "\n\n" . N("This should be chosen consistently with the address you use for incoming mail."),
+          name => N("Outgoing Mail Address") . "\n\n" . N("You can select the kind of address that outgoing mail will show in the "From:" and "Reply-to" field.") . "\n\n" . N("This should be chosen consistently with the address you use for incoming mail."),
           pre => sub {
 		$o->{var}{wiz_mail_masquerade} ||= get_mail_masquerade();
 	  },
@@ -68,7 +68,7 @@ $o->{pages} = {
         next => 'config'
       },
       isp => {
-          name => N("Internet Mail Gateway") . "\n\n" . N('Your server will send the outgoing through a mail gateway, that will take care of the final delivery.') . "\n\n" . N('Internet host names must be in the form "host.domain.domaintype"; for example, if your provider is "provider.com", the internet mail server is usually "smtp.provider.com".'),
+          name => N("Internet Mail Gateway") . "\n\n" . N("Your server will send the outgoing through a mail gateway, that will take care of the final delivery.") . "\n\n" . N("Internet host names must be in the form "host.domain.domaintype"; for example, if your provider is "provider.com", the internet mail server is usually "smtp.provider.com"."),
           pre => sub {
 		$o->{var}{wiz_ext_mail_relay} ||= get_mail_relay();
 	  },
diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm
index f7287e49..4f544bfd 100755
--- a/proxy_wizard/Squid.pm
+++ b/proxy_wizard/Squid.pm
@@ -34,13 +34,13 @@ my ($free_disk) = $df =~ m/\d+\s+\d+\s+\d+\s+(\d+)/;
 my $mem = `/usr/bin/free -m`;
 ($mem) = $mem =~ /Mem:\s+(\d+)/;
 my %level = (
-   1 => N('All - No access restriction'),
-   2 => N('Local Network - access for local network (recommended)'),
-   3 => N('Localhost - access restricted to this server only')
+   1 => N("All - No access restriction"),
+   2 => N("Local Network - access for local network (recommended)"),
+   3 => N("Localhost - access restricted to this server only")
 );
 my %upper = (
-   1 => N('No upper level proxy (recommended)'),
-   2 => N('Define an upper level proxy')
+   1 => N("No upper level proxy (recommended)"),
+   2 => N("Define an upper level proxy")
 );
 
 my $o = { 
@@ -62,46 +62,46 @@ my $o = {
 
 $o->{pages} = { 
 		  welcome => {
-		      name => N('Proxy Configuration Wizard') . "\n\n" . N('Squid is a web caching proxy server, it allows faster web access for your local network.') . "\n\n" . N('This wizard will help you in configuring your proxy server.'),
+		      name => N("Proxy Configuration Wizard") . "\n\n" . N("Squid is a web caching proxy server, it allows faster web access for your local network.") . "\n\n" . N("This wizard will help you in configuring your proxy server."),
 		  no_back => 1,
 	          next => 'port'
 	      },
 	      port => {
-	          name => N('Proxy Port') . "\n\n" . N('Proxy port value sets what port the proxy server will listen on for http requests. Default is 3128, other common value can be 8080, the port value needs to be greater than 1024.') . "\n\n" . N(''),
+	          name => N("Proxy Port") . "\n\n" . N("Proxy port value sets what port the proxy server will listen on for http requests. Default is 3128, other common value can be 8080, the port value needs to be greater than 1024.") . "\n\n" . N(''),
                   pre => sub {
 			$o->{var}{wiz_squid_port} ||= 3128;
 		  },
 		  post => \&testport,
                   data => [
-		      { label => N('Proxy port:'),  val => \$o->{var}{wiz_squid_port} },
+		      { label => N("Proxy port:"),  val => \$o->{var}{wiz_squid_port} },
 		      ],
 	          next => 'memory'
 	      },
 	      warning_port => {
-		name => N('Warning.') . "\n\n" . N('You have entered a port that may be useful for this service:') . "\n\n" . N('Press Next if you want to keep this value, or Back to correct your choice.'),
+		name => N("Warning.") . "\n\n" . N("You have entered a port that may be useful for this service:") . "\n\n" . N("Press Next if you want to keep this value, or Back to correct your choice."),
 		data => [ 
 		    { label => '/etc/services:', fixed_val => \$o->{var}{used_by} },
 		    ],
 	        next => 'memory'
 	      },
 	      error_low => {
-		name => N('Warning.') . "\n\n" . N('You must choose a port greater than 1024 and lower than 65535') . "\n\n" . N('Press back to change the value.'),
+		name => N("Warning.") . "\n\n" . N("You must choose a port greater than 1024 and lower than 65535") . "\n\n" . N("Press back to change the value."),
 	        next => 'memory'
 	      },
 	      memory => {
-	          name => N('Proxy Cache Size') . "\n\n" . N('Memory Cache is the amount of RAM dedicated to cache memory operations (note that actual memory usage of the whole squid process is bigger).') . "\n\n" . N('Disk Cache is the amount of disk space that can be used for caching on disk.') . "\n\n" . N('For your information, here is /var/spool/squid space on disk:') . "\n\n" . $df,
+	          name => N("Proxy Cache Size") . "\n\n" . N("Memory Cache is the amount of RAM dedicated to cache memory operations (note that actual memory usage of the whole squid process is bigger).") . "\n\n" . N("Disk Cache is the amount of disk space that can be used for caching on disk.") . "\n\n" . N("For your information, here is /var/spool/squid space on disk:") . "\n\n" . $df,
                   pre => sub {
 			$o->{var}{wiz_squid_mem} ||= int ($mem / 4);
 			$o->{var}{wiz_squid_disk} ||= int ($free_disk/2);
 		  },
                   data => [
-		      { label => N('Memory cache (MB):'),  val => \$o->{var}{wiz_squid_mem} },
-		      { label => N('Disk space (MB):'),  val => \$o->{var}{wiz_squid_disk} },
+		      { label => N("Memory cache (MB):"),  val => \$o->{var}{wiz_squid_mem} },
+		      { label => N("Disk space (MB):"),  val => \$o->{var}{wiz_squid_disk} },
 		      ],
 	          next => 'level'
 	      },
 	      level => {
-	          name => N('Access Control') . "\n\n" . N('The proxy can be configured to use different access control levels') . "\n\n" . N('Choose the level that suits your needs. If you don\'t know, the Local Network level is usually the most appropriate. Beware that the All level may be not secure.'),
+	          name => N("Access Control") . "\n\n" . N("The proxy can be configured to use different access control levels") . "\n\n" . N("Choose the level that suits your needs. If you don't know, the Local Network level is usually the most appropriate. Beware that the All level may be not secure."),
                   pre => sub {
 			$o->{var}{wiz_squid_level} ||= 2;
 		  },
@@ -114,17 +114,17 @@ $o->{pages} = {
 	          next => 'cachepeer'
 	      },
 	      shownet => {
-	          name => N('Grant access on local network') . "\n\n" . N('Access will be allowed for hosts on the network. Here is the information found about your current local network, you can modify it if needed.') . "\n\n" . N('You can use either a numeric format like "192.168.1.0/255.255.255.0" or a text format like ".domain.net"'),
+	          name => N("Grant access on local network") . "\n\n" . N("Access will be allowed for hosts on the network. Here is the information found about your current local network, you can modify it if needed.") . "\n\n" . N("You can use either a numeric format like \"192.168.1.0/255.255.255.0\" or a text format like \".domain.net\""),
                   pre => sub {
 			$o->{var}{wiz_squid_mynetw} ||= network_mask()
 		  },
                   data => [
-		      { label => 'Authorized network:', val => \$o->{var}{wiz_squid_mynetw}, help => N('Use numeric format like "192.168.1.0/255.255.255.0" or a text format like ".domain.net"') },
+		      { label => 'Authorized network:', val => \$o->{var}{wiz_squid_mynetw}, help => N("Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like \".domain.net\"") },
 		      ],
 	          next => 'cachepeer'
 	      },
 	      cachepeer => {
-	          name => N('Cache hierarchy') . "\n\n" . N('As an option, Squid can be configured in proxy cascading. You can add a new upper level proxy by specifying its hostname and port.') . "\n\n" . N('You can safely select "No upper level proxy" if you don\'t need this feature.'),
+	          name => N("Cache hierarchy") . "\n\n" . N("As an option, Squid can be configured in proxy cascading. You can add a new upper level proxy by specifying its hostname and port.") . "\n\n" . N("You can safely select \"No upper level proxy\" if you don't need this feature."),
                   pre => sub {
 			$o->{var}{wiz_squid_menupeer} ||= 1
 		  },
@@ -137,7 +137,7 @@ $o->{pages} = {
 	          next => 'summary_2'
 	      },
 	      valcachepeer => {
-	          name => N('Cache hierarchy') . "\n\n" . N('Enter the qualified hostname (like "cache.domain.net") and the port of the proxy to use.'),
+	          name => N("Cache hierarchy") . "\n\n" . N("Enter the qualified hostname (like "cache.domain.net") and the port of the proxy to use."),
                   data => [
 		      { label => 'Upper level proxy hostname:', val => \$o->{var}{wiz_squid_cachepeer} },
 		      { label => 'Upper level proxy port:', val => \$o->{var}{wiz_squid_peerport} },
@@ -145,31 +145,31 @@ $o->{pages} = {
 	          next => 'summary'
 	      },
 	      summary => {
-	        name =>  N('Configuring the Proxy') . "\n\n" . N('The wizard collected the following parameters needed to configure your proxy:') . "\n\n" . N('To accept these values, and configure your server, click the Next button or use the Back button to correct them.'),
+	        name =>  N("Configuring the Proxy") . "\n\n" . N("The wizard collected the following parameters needed to configure your proxy:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
                 data => [
-		      { label => N('Port:'), type => 'field', val => \$o->{var}{wiz_squid_port} },
-		      { label => N('Memory cache (MB):'), type => 'field', val => \$o->{var}{wiz_squid_mem} },
-		      { label => N('Disk space (MB):'), type => 'field', val => \$o->{var}{wiz_squid_disk} },
-		      { label => N('Access Control:'), type => 'field', val => \$o->{var}{wiz_squid_mynetw} },
-		      { label => N('Upper level proxy hostname:'), type => 'field', val => \$o->{var}{wiz_squid_cachepeer} },
-		      { label => N('Upper level proxy port:'), type => 'field', val => \$o->{var}{wiz_squid_peerport} },
+		      { label => N("Port:"), type => 'field', val => \$o->{var}{wiz_squid_port} },
+		      { label => N("Memory cache (MB):"), type => 'field', val => \$o->{var}{wiz_squid_mem} },
+		      { label => N("Disk space (MB):"), type => 'field', val => \$o->{var}{wiz_squid_disk} },
+		      { label => N("Access Control:"), type => 'field', val => \$o->{var}{wiz_squid_mynetw} },
+		      { label => N("Upper level proxy hostname:"), type => 'field', val => \$o->{var}{wiz_squid_cachepeer} },
+		      { label => N("Upper level proxy port:"), type => 'field', val => \$o->{var}{wiz_squid_peerport} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
 	      },
 	      summary_2 => {
-	        name =>  N('Configuring the Proxy') . "\n\n" . N('The wizard collected the following parameters needed to configure your proxy:') . "\n\n" . N('To accept these values, and configure your server, click the Next button or use the Back button to correct them.'),
+	        name =>  N("Configuring the Proxy") . "\n\n" . N("The wizard collected the following parameters needed to configure your proxy:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
                 data => [
-		      { label => N('Port:'), type => 'field', val => \$o->{var}{wiz_squid_port} },
-		      { label => N('Memory cache (MB):'), type => 'field', val => \$o->{var}{wiz_squid_mem} },
-		      { label => N('Disk space (MB):'), type => 'field', val => \$o->{var}{wiz_squid_disk} },
-		      { label => N('Access Control:'), type => 'field', val => \$o->{var}{wiz_squid_mynetw} },
+		      { label => N("Port:"), type => 'field', val => \$o->{var}{wiz_squid_port} },
+		      { label => N("Memory cache (MB):"), type => 'field', val => \$o->{var}{wiz_squid_mem} },
+		      { label => N("Disk space (MB):"), type => 'field', val => \$o->{var}{wiz_squid_disk} },
+		      { label => N("Access Control:"), type => 'field', val => \$o->{var}{wiz_squid_mynetw} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
 	      },
 	      end => { 
-	        name => N('Congratulations') . N('The wizard successfully configured your proxy server.'), 
+	        name => N("Congratulations") . N("The wizard successfully configured your proxy server."), 
 		end => 1,
 	        next => 0
 	  },
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index b2c2f3e2..a8d08d10 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -55,74 +55,74 @@ my $o = {
 my $old = read_conf("/etc/samba/smb.conf");
 
 my %level = (
-    1 => N('All - No access restriction'),
-    2 => N('My rules - Ask me allowed and denied hosts')
+    1 => N("All - No access restriction"),
+    2 => N("My rules - Ask me allowed and denied hosts")
 );
 
 $o->{pages} = { 
     welcome => {
-        name => N('Samba Configuration Wizard') . "\n\n" . N('Samba allows your server to behave as a file and print server for workstations running non-Linux systems.') . "\n\n" . N('This wizard will help you configuring the Samba services of your server.'),
+        name => N("Samba Configuration Wizard") . "\n\n" . N("Samba allows your server to behave as a file and print server for workstations running non-Linux systems.") . "\n\n" . N("This wizard will help you configuring the Samba services of your server."),
         no_back => 1,
         next => 'ask_workgroup'
     },
     ask_workgroup => {
-        name => N('Workgroup') . "\n\n" . N('Samba needs to know the Windows Workgroup it will serve.') . "\n\n" . N('Samba needs to know the Windows Workgroup it will serve.'),
+        name => N("Workgroup") . "\n\n" . N("Samba needs to know the Windows Workgroup it will serve.") . "\n\n" . N("Samba needs to know the Windows Workgroup it will serve."),
         pre => sub {
            $o->{var}{wiz_workgroup} ||= get_workgroup()
         },
         data => [
-           { label => N('Workgroup:'),  val => \$o->{var}{wiz_workgroup} },
+           { label => N("Workgroup:"),  val => \$o->{var}{wiz_workgroup} },
         ],
 	post => \&check_workgroup,
         next => 'ask_banner'
    },
    error_in_workgroup => {
-       name => N('Error.') . "\n\n" . N('The Workgroup is wrong'),
+       name => N("Error.") . "\n\n" . N("The Workgroup is wrong"),
        post => \&check_workgroup,
        next => 'ask_workgroup'
     },
     ask_banner => {
-        name => N('Server Banner.') . "\n\n" . N('The banner is the way this server will be described in the Windows workstations.') . "\n\n" . N('The banner is the way this server will be described in the Windows workstations.'),
+        name => N("Server Banner.") . "\n\n" . N("The banner is the way this server will be described in the Windows workstations.") . "\n\n" . N("The banner is the way this server will be described in the Windows workstations."),
         pre => sub {
   	    $o->{var}{wiz_banner} ||= get_banner()
 	},
 	post => \&check_banner,
         data => [
-            { label => N('Banner:'),  val => \$o->{var}{wiz_banner} },
+            { label => N("Banner:"),  val => \$o->{var}{wiz_banner} },
             ],
         next => 'ask_net'
     },
     error_in_banner => {
-        name => N('Error.') . "\n\n" . N('The Server Banner is incorrect'),
+        name => N("Error.") . "\n\n" . N("The Server Banner is incorrect"),
 	ignore => 1,
         next => 'ask_banner'
     },
     ask_net => {
-        name => N('Access control') . "\n\n" . N('') . "\n\n" . N(''),
+        name => N("Access control") . "\n\n" . N('') . "\n\n" . N(''),
         pre => sub {
       	$o->{var}{wiz_level} ||= 1
         },
         post => sub { return 'ask_netmask' if $o->{var}{wiz_level} == 2 },
         data => [
-            { label => N('Access level :'), val => \$o->{var}{wiz_level}, list => [ keys %level ], format => sub { $level{$_[0]} } },
+            { label => N("Access level :"), val => \$o->{var}{wiz_level}, list => [ keys %level ], format => sub { $level{$_[0]} } },
             ],
         next => 'ask_services'
     },
     ask_netmask => {
-        name => N('Access control') . "\n\n" . N('* Example 1: allow all IPs in 150.203.*.*; except one\nhosts allow = 150.203. EXCEPT 150.203.6.66') . "\n\n" . N('* Example 2: allow hosts that match the given network/netmask\nhosts allow = 150.203.15.0/255.255.255.0') . "\n\n" . N('* Example 3: allow a couple of hosts\nhosts allow = lapland, arvidsjaur') . "\n\n" . N('* Example 4: allow only hosts in NIS netgroup "foonet",  but deny access from one particular host\nhosts allow = @foonet\nhosts deny = pirate') . "\n\n" . N('Note that access still requires suitable user-level passwords.'),
+        name => N("Access control") . "\n\n" . N("* Example 1: allow all IPs in 150.203.*.*; except one\nhosts allow = 150.203. EXCEPT 150.203.6.66") . "\n\n" . N("* Example 2: allow hosts that match the given network/netmask\nhosts allow = 150.203.15.0/255.255.255.0") . "\n\n" . N("* Example 3: allow a couple of hosts\nhosts allow = lapland, arvidsjaur") . "\n\n" . N("* Example 4: allow only hosts in NIS netgroup "foonet",  but deny access from one particular host\nhosts allow = @foonet\nhosts deny = pirate") . "\n\n" . N("Note that access still requires suitable user-level passwords."),
         pre => sub {
       	$o->{var}{wiz_hosts_allow} ||= get_allow_host();
       	$o->{var}{wiz_hosts_allow} ||= get_deny_host()
         },
         post => \&check,
         data => [
-            { label => N('Allow hosts:'),  val => \$o->{var}{wiz_allow_host} },
-            { label => N('Deny hosts:'),  val => \$o->{var}{wiz_deny_host} },
+            { label => N("Allow hosts:"),  val => \$o->{var}{wiz_allow_host} },
+            { label => N("Deny hosts:"),  val => \$o->{var}{wiz_deny_host} },
             ],
         next => 'ask_services'
     },
     ask_services => {
-        name => N('Enabled Samba Services') . "\n\n" . N('Samba can provide a common file sharing area to your Windows workstation, and can also provide printer sharing for the printers connected to your server.'),
+        name => N("Enabled Samba Services") . "\n\n" . N("Samba can provide a common file sharing area to your Windows workstation, and can also provide printer sharing for the printers connected to your server."),
         pre => sub {
       	$o->{var}{wiz_do_file_sharing} ||= get_file_sharing();
       	$o->{var}{wiz_do_printer_sharing} ||= 1;
@@ -130,75 +130,75 @@ $o->{pages} = {
         },
         post => \&check_services,
         data => [
-            { text => N('Enable file sharing area'), type => 'bool', val => \$o->{var}{wiz_do_file_sharing} },
-            { text => N('Enable Server Printer Sharing'), type => 'bool', val => \$o->{var}{wiz_do_printer_sharing} },
-            { text => N('Make home directories available for their owners'), type => 'bool', val => \$o->{var}{wiz_do_homes} },
+            { text => N("Enable file sharing area"), type => 'bool', val => \$o->{var}{wiz_do_file_sharing} },
+            { text => N("Enable Server Printer Sharing"), type => 'bool', val => \$o->{var}{wiz_do_printer_sharing} },
+            { text => N("Make home directories available for their owners"), type => 'bool', val => \$o->{var}{wiz_do_homes} },
             ],
         next => 'ask_dir'
     },
     warn_smbpasswd => {
-        name => N('Warning.') . "\n\n" . N('You have selected to allow user access their home directories via samba but you/they must use smbpasswd to set a password.'),
+        name => N("Warning.") . "\n\n" . N("You have selected to allow user access their home directories via samba but you/they must use smbpasswd to set a password."),
         post => \&ask_dir,
 	ignore => 1,
         next => 'summary'
     },
     ask_dir => {
-        name => N('Shared directory:') . "\n\n" . N('Type the path of the directory you want being shared.'),
+        name => N("Shared directory:") . "\n\n" . N("Type the path of the directory you want being shared."),
         pre => sub {
       	    $o->{var}{wiz_dir} ||= get_dir()
         },
         post => \&check_dir,
         data => [
-            { label => N('Shared directory:'),  val => \$o->{var}{wiz_dir} },
+            { label => N("Shared directory:"),  val => \$o->{var}{wiz_dir} },
             ],
         next => 'ask_access'
     },
     error_in_dir => {
-        name => N('Error.') . "\n\n" . N('The path you entered does not exist.'),
+        name => N("Error.") . "\n\n" . N("The path you entered does not exist."),
 	ignore => 1,
         next => 'ask_dir'
     },
     ask_access => {
-        name => N('File permissions') . "\n\n" . N('Type users or group separated by a comma (groups must be preceded by a \'@\') like this :\nroot, fred, @users, @wheel for each kind of permission.') . "\n\n" . N(''),
+        name => N("File permissions") . "\n\n" . N("Type users or group separated by a comma (groups must be preceded by a '@') like this :\nroot, fred, @users, @wheel for each kind of permission.") . "\n\n" . N(''),
         pre => sub {
       	$o->{var}{wiz_read_list} ||= get_read();
       	$o->{var}{wiz_write_list} ||= get_write()
         },
         post => \&check_users,
         data => [
-            { label => N('read list:'), help => N('root, fred, @users, @wheel'), val => \$o->{var}{wiz_read_list} },
-            { label => N('write list:'), help => N('root, fred, @users, @wheel'), val => \$o->{var}{wiz_write_list} },
+            { label => N("read list:"), help => N("root, fred, @users, @wheel"), val => \$o->{var}{wiz_read_list} },
+            { label => N("write list:"), help => N("root, fred, @users, @wheel"), val => \$o->{var}{wiz_write_list} },
             ],
         next => 'ask_printers'
     },
     ask_printers => {
-        name => N('Select which printers you want to be accessible from known users'),
+        name => N("Select which printers you want to be accessible from known users"),
         pre => sub {
       	    $o->{var}{list_printers} ||=  [ list_printers() ];
 	    $o->{var}{wiz_box_list} ||= []
         },
         post => \&check,
         data => [
-            { text => N('Enable all printers'), type => 'bool', val => \$o->{var}{wiz_all_printers} },
+            { text => N("Enable all printers"), type => 'bool', val => \$o->{var}{wiz_all_printers} },
             { val => \$o->{var}{wiz_box_list}, boolean_list => \$o->{var}{list_printers}, disabled => sub { $o->{var}{wiz_all_printers} and return 1; 0 } },
             ],
         next => 'summary'
     },
     warning => {
-      name => N('Warning.'),
+      name => N("Warning."),
       data => [ { label => N('') } ],
       ignore => 1,
       next => 'summary'
     },
     error => {
-      name => N('Error.'),
+      name => N("Error."),
       data => [ { label => N('') } ],
       ignore => 1,
       next => 'config'
     },
     summary => {
-      name =>  N('Configuring Samba') . "\n\n" . N('The wizard collected the following parameters
-configure Samba.') . "\n\n" . N('To accept these values, and configure your server, click the Next button or use the Back button to correct them.'),
+      name =>  N("Configuring Samba") . "\n\n" . N("The wizard collected the following parameters
+configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
       pre => sub {
           $o->{var}{printers} = get_printers();
 	  $o->{var}{file_sharing} = $o->{var}{wiz_do_file_sharing} ? N("enabled") : N("disabled");
@@ -206,19 +206,19 @@ configure Samba.') . "\n\n" . N('To accept these values, and configure your serv
 	  $o->{var}{shared_homes} = $o->{var}{wiz_do_homes} ? N("enabled") : N("disabled")
       },	    
       data => [
-            { label => N('Workgroup:'), fixed_val => \$o->{var}{wiz_workgroup} },
-            { label => N('Server Banner:'), fixed_val => \$o->{var}{wiz_banner} },
-            { label => N('File Sharing:'),  fixed_val => \$o->{var}{file_sharing} },
-            { label => N('Shared directory:'),  fixed_val => \$o->{var}{wiz_dir} },
-            { label => N('Print Server:'),  fixed_val => \$o->{var}{printer_sharing} },
-            { label => N('Home:'), fixed_val => \$o->{var}{shared_homes} },
-            { label => N('Printers:'), fixed_val => \$o->{var}{printers} },
+            { label => N("Workgroup:"), fixed_val => \$o->{var}{wiz_workgroup} },
+            { label => N("Server Banner:"), fixed_val => \$o->{var}{wiz_banner} },
+            { label => N("File Sharing:"),  fixed_val => \$o->{var}{file_sharing} },
+            { label => N("Shared directory:"),  fixed_val => \$o->{var}{wiz_dir} },
+            { label => N("Print Server:"),  fixed_val => \$o->{var}{printer_sharing} },
+            { label => N("Home:"), fixed_val => \$o->{var}{shared_homes} },
+            { label => N("Printers:"), fixed_val => \$o->{var}{printers} },
         ],
       post => \&do_it,
       next => 'end'
     },
     end => { 
-      name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your Samba server.'), 
+      name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Samba server."), 
       end => 1,
       next => 0
     },
diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm
index 0cf2cf9a..53988573 100644
--- a/time_wizard/Ntp.pm
+++ b/time_wizard/Ntp.pm
@@ -31,7 +31,7 @@ require MDK::Wizard::Wizcommon;
 my $wiz = new MDK::Wizard::Wizcommon;
 
 my $o = { 
-    name => N('Time wizard'),
+    name => N("Time wizard"),
 	var => { 
 	    varserver1 => '',
 	    varserver2 => '',
@@ -57,8 +57,8 @@ my %ntp_servers = (
 );
 
 my %actions = (
-    try_again => N('Try again'),
-    save_quit => N('Save config without test')
+    try_again => N("Try again"),
+    save_quit => N("Save config without test")
 );
 
 my %country;
@@ -79,31 +79,31 @@ if (-d '/usr/share/zoneinfo') {
 
 $o->{pages} = { 
 		  welcome => {
-		      name => N('This wizard will help you to set the time of your server synchronized with an external time server.') . "\n\n" . N('Thus your server will be the local time server for your network.') . "\n\n" . N('press next to begin, or cancel to leave this wizard'),
+		      name => N("This wizard will help you to set the time of your server synchronized with an external time server.") . "\n\n" . N("Thus your server will be the local time server for your network.") . "\n\n" . N("press next to begin, or cancel to leave this wizard"),
 		  no_back => 1,
 	          next => 'config'
 	      },
 	      config => {
-	          name => N('Time Servers') . "\n\n" . N('Select a primary and secondary server from the list.') . "\n\n" . N('(we recommand you to use pool.ntp.org twice as this server randomly points to available time servers)'),
+	          name => N("Time Servers") . "\n\n" . N("Select a primary and secondary server from the list.") . "\n\n" . N("(we recommand you to use pool.ntp.org twice as this server randomly points to available time servers)"),
                   pre => sub {
 			$o->{var}{varserver1} ||= 'pool.ntp.org';
 			$o->{var}{varserver2} ||= 'pool.ntp.org';
 		  },
                   data => [
-		      { label => N('Primary Time Server:'), val => \$o->{var}{varserver1}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
-		      { label => N('Secondary Time Server:'), val => \$o->{var}{varserver2}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
+		      { label => N("Primary Time Server:"), val => \$o->{var}{varserver1}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
+		      { label => N("Secondary Time Server:"), val => \$o->{var}{varserver2}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
 		      ],
 	          next => 'choose_region'
 	      },
 	      choose_region => {
-	          name => N('Choose a timezone'),
+	          name => N("Choose a timezone"),
                   pre => sub {
 			my (undef, $region, $country) = get_timezone();
 			$o->{var}{wiz_region} ||= $region;
 			$o->{var}{wiz_country} ||= $country
 		  },
                   data => [
-		      { label => N('Choose a region:'), val => \$o->{var}{wiz_region}, list => [ keys %country ] },
+		      { label => N("Choose a region:"), val => \$o->{var}{wiz_region}, list => [ keys %country ] },
 		      ],
 	          post => sub {
 			'choose_country' if ref $country{$o->{var}{wiz_region}}
@@ -111,36 +111,36 @@ $o->{pages} = {
 	          next => 'test_server'
 	      },
 	      choose_country => {
-	          name => N('Choose a timezone'),
+	          name => N("Choose a timezone"),
                   pre => sub {
 			@country = ref $country{$o->{var}{wiz_region}} ? @{$country{$o->{var}{wiz_region}}} : ()
 		  },
                   data => [
-		      { label => N('Choose a country:'), val => \$o->{var}{wiz_country}, fixed_list => \@country },
+		      { label => N("Choose a country:"), val => \$o->{var}{wiz_country}, fixed_list => \@country },
 		      ],
 	          next => 'test_server'
 	      },
 	      test_server => {
-		  name => N('Testing the time servers availability') . "\n\n" . N('If the time server is not immediately available (network or other reason), there will be about a 30 second delay.') . "\n\n" . N('Press next to start the time servers test.'),
+		  name => N("Testing the time servers availability") . "\n\n" . N("If the time server is not immediately available (network or other reason), there will be about a 30 second delay.") . "\n\n" . N("Press next to start the time servers test."),
 		  pre => sub { 
 		      $o->{var}{wiz_timezone} = $o->{var}{wiz_region} . (ref $country{$o->{var}{wiz_region}} ? "/$o->{var}{wiz_country}" : "");
 		  },
 		  post => \&test,
 		  data => [
-		      { label => N('Primary Time Server:'), fixed_val => \$o->{var}{varserver1} },
-		      { label => N('Secondary Time Server:'), fixed_val => \$o->{var}{varserver2} },
-		      { label => N('Time zone:'), fixed_val => \$o->{var}{wiz_timezone} },
+		      { label => N("Primary Time Server:"), fixed_val => \$o->{var}{varserver1} },
+		      { label => N("Secondary Time Server:"), fixed_val => \$o->{var}{varserver2} },
+		      { label => N("Time zone:"), fixed_val => \$o->{var}{wiz_timezone} },
 		      ],
 		      next => 'end'
 	      },
 	      warning => {
-		name => N('Warning.'),
+		name => N("Warning."),
 		data => [ { label => N('') } ],
 		ignore => 1,
 	        next => 'summary'
 	      },
 	      server_not_responding => {
-		name => N('Warming.'),
+		name => N("Warming."),
 		post => sub { 
 		     if ($o->{var}{action} eq 'save_quit') {
 			do_it();
@@ -150,17 +150,17 @@ $o->{pages} = {
 		     }		 
 		},
 		data => [ 
-	  	    { label => N('The time servers are not responding. The causes could be:') },
-	  	    { label => N('- non existent time servers') },
-	  	    { label => N('- no outside network') },
-	  	    { label => N('- other reasons...') },
-	  	    { label => N('- You can try again to contact time servers, or save configuration without actually setting time.') },
+	  	    { label => N("The time servers are not responding. The causes could be:") },
+	  	    { label => N("- non existent time servers") },
+	  	    { label => N("- no outside network") },
+	  	    { label => N("- other reasons...") },
+	  	    { label => N("- You can try again to contact time servers, or save configuration without actually setting time.") },
 		    { val => \$o->{var}{action}, list => [ keys %actions ], format => sub { $actions{$_[0]} } },
 		],
 	        next => 'config'
 	      },
 	      end => { 
-	        name => N('Time server configuration saved') . "\n\n" . N('Your server can now act as a time server for your local network.'), 
+	        name => N("Time server configuration saved") . "\n\n" . N("Your server can now act as a time server for your local network."), 
 		end => 1,
 	        next => 0
 	  },
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index 0d2fc4a2..163c2357 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -35,7 +35,7 @@ my $root;
 
 my $config;
 my $o = { 
-    name => N('Web wizard'),
+    name => N("Web wizard"),
     var => { 
 	web_internal => '',
 	web_external => '',
@@ -66,84 +66,84 @@ my $o = {
 
 $o->{pages} = { 
 	      welcome => {
-		  name => N('Web Server Configuration Wizard') . "\n\n" . N('This wizard will help you configuring the Web Server for your network.'),
+		  name => N("Web Server Configuration Wizard") . "\n\n" . N("This wizard will help you configuring the Web Server for your network."),
 		  post => sub { $wiz->check_dhcp },
 	      no_back => 1,
 	      next => 'config'
 	  },
 	  config => {
-	      name => N('Web Server') . "\n\n" . N('Your server can act as a Web Server toward your internal network (intranet) and as a Web Server for the Internet.') . "\n\n" . N('Select the kind of Web service you want to activate:') . "\n\n" . N('Don\'t check any box if you don\'t want to activate your Web Server.'),
+	      name => N("Web Server") . "\n\n" . N("Your server can act as a Web Server toward your internal network (intranet) and as a Web Server for the Internet.") . "\n\n" . N("Select the kind of Web service you want to activate:") . "\n\n" . N("Don't check any box if you don't want to activate your Web Server."),
 	      data => [
-		  { text => N('Enable the Web Server for the Intranet'), type => 'bool', val => \$o->{var}{web_internal} },
-		  { text => N('Enable the Web Server for the Internet'), type => 'bool', val => \$o->{var}{web_external} },
+		  { text => N("Enable the Web Server for the Intranet"), type => 'bool', val => \$o->{var}{web_internal} },
+		  { text => N("Enable the Web Server for the Internet"), type => 'bool', val => \$o->{var}{web_external} },
 		  ],
 	      next => 'ask_mod'
 	  },
 	  dhcp_warning => {
-	    name => N('Warning.') . "\n\n" . N('You are in dhcp, server may not work with your configuration.'),
+	    name => N("Warning.") . "\n\n" . N("You are in dhcp, server may not work with your configuration."),
 	    ignore => 1,
 	    next => 'config'
 	  },
 	  ask_mod => {
-	      name => N('Modules :') . "\n\n" . N('* User module : allows users to have a directory in their home directories available on your http server via http://www.yourserver.com/~user, you will be asked for the name of this directory afterward.'),
+	      name => N("Modules :") . "\n\n" . N("* User module : allows users to have a directory in their home directories available on your http server via http://www.yourserver.com/~user, you will be asked for the name of this directory afterward."),
 	      pre => sub { $o->{var}{user_mod} = is_last_user_mod()},
 	      data => [
-		  { text => N('Allows users to get a directory in their homes directories 
-available on your http server via http://www.yourserver.com/~user.'), type => 'bool', val => \$o->{var}{user_mod} },
+		  { text => N("Allows users to get a directory in their homes directories 
+available on your http server via http://www.yourserver.com/~user."), type => 'bool', val => \$o->{var}{user_mod} },
 		  ],
 	      post => sub { return 'user_dir' if $o->{var}{user_mod} },
 	      next => 'ask_dir'
 	  },
 	  user_dir => {
-	      name => N('Type the name of the directory users should create in their homes (whitout ~/) to get it available via http://www.yourserver.com/~user'),
+	      name => N("Type the name of the directory users should create in their homes (whitout ~/) to get it available via http://www.yourserver.com/~user"),
 	      pre => sub { $o->{var}{user_dir} ||= 'public_html' },
 	      data => [
-		  { label => N('user http sub-directory : ~/'), help => N('Type the name of the directory users should create in their homes (whitout ~/) to get it available via http://www.yourserver.com/~user'), val => \$o->{var}{user_dir} },
+		  { label => N("user http sub-directory : ~/"), help => N("Type the name of the directory users should create in their homes (whitout ~/) to get it available via http://www.yourserver.com/~user"), val => \$o->{var}{user_dir} },
 		  ],
 	      next => 'ask_dir'
 	  },
 	  ask_dir => {
-	      name => N('Type the path of the directory you want being the document root.'),
+	      name => N("Type the path of the directory you want being the document root."),
 	      pre => sub { $o->{var}{shared_dir} ||= $root },
 	      data => [
-		  { label => N('Document Root:'),  val => \$o->{var}{shared_dir} },
+		  { label => N("Document Root:"),  val => \$o->{var}{shared_dir} },
 		  ],
 	      post => \&check_dir,
 	      next => 'summary'
 	  },
 	  error_in_dir => {
-	    name => N('Error.'),
+	    name => N("Error."),
 	    data => [
-	              { label => N('The path you entered does not exist.') } 
+	              { label => N("The path you entered does not exist.") } 
 		    ],
 	    ignore => 1,
 	    next => 'ask_dir'
 	  },
 	  error => {
-	    name => N('Error.'),
+	    name => N("Error."),
 	    data => [ { label => N('') } ],
 	    ignore => 1,
 	    next => 'config'
 	  },
 	  summary => {
-	    name =>  N('Configuring the Web Server') . "\n\n" . N('The wizard collected the following parameters needed to configure your Web Server') . "\n\n" . N('To accept these values, and configure your server, click the Next button or use the Back button to correct them.'),
+	    name =>  N("Configuring the Web Server") . "\n\n" . N("The wizard collected the following parameters needed to configure your Web Server") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
 	    pre => sub {
 		$o->{var}{internal} = $o->{var}{web_internal} ? N("enabled") : N("disabled");
 		$o->{var}{external} = $o->{var}{web_external} ? N("enabled") : N("disabled")
 	    },
 	    data => [
-		  { label => N('Intranet web server:'), fixed_val => \$o->{var}{internal} },
-		  { label => N('Internet web server:'), fixed_val => \$o->{var}{external} },
-		  { label => N('Document root:'), fixed_val => \$o->{var}{shared_dir} },
-		  { label => N('User directory:'), fixed_val => \$o->{var}{user_dir} },
+		  { label => N("Intranet web server:"), fixed_val => \$o->{var}{internal} },
+		  { label => N("Internet web server:"), fixed_val => \$o->{var}{external} },
+		  { label => N("Document root:"), fixed_val => \$o->{var}{shared_dir} },
+		  { label => N("User directory:"), fixed_val => \$o->{var}{user_dir} },
 	      ],
 	    post => \&do_it,
 	    next => 'end'
 	  },
 	  end => { 
-	    name => N('Congratulations'),
+	    name => N("Congratulations"),
 	    data => [ 
-	        { label => N('The wizard successfully configured your Intranet/Internet Web Server') } ], 
+	        { label => N("The wizard successfully configured your Intranet/Internet Web Server") } ], 
 	    end => 1,
 	    next => 0
       },