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

generating the pot

1 files changed, 39 insertions, 39 deletions

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
     },