- translate more strings from french intro english

- mark more strings as translatable
- upcase "LDAP" word
- remove garbage strings ("Bla bla")

1 files changed, 21 insertions, 21 deletions

diff --git a/ldap_wizard/ldap.pm b/ldap_wizard/ldap.pm
index 355af9bd..ccf1a88a 100644
--- a/ldap_wizard/ldap.pm
+++ b/ldap_wizard/ldap.pm
@@ -22,7 +22,7 @@ require Net::LDAP;
 
 
 my $o = {
-name => 'Add POSIX account',
+name => N("Add POSIX account"),
     var => {
         defou => 'ou=Users',
 	srv => '',
@@ -91,7 +91,7 @@ my $cn;
 
 $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;
@@ -103,12 +103,12 @@ $o->{pages} = {
 		},
 		data => [
 			{
-			label => N("Votre choix "). "\n\n" , val => \$o->{var}{wiz_level}, type => 'list', list => [ keys %level ], format => sub { $level{$_[0]} } },
+			label => N("Your choice:"). "\n\n" , val => \$o->{var}{wiz_level}, type => 'list', list => [ keys %level ], format => sub { $level{$_[0]} } },
 			],
 		 next => 'set_srv',
 	},
 	       add_userposix => {
-                  name => N("Ldap User Add") . "\n\n" . N("Bla Bla Bla ") . "\n\n" . N("User Create in : ") . $o->{var}{defou} . "," . $o->{var}{suffix} . "\n\n",
+                  name => N("LDAP User Add") . "\n\n" . N("User Create in : ") . $o->{var}{defou} . "," . $o->{var}{suffix},
                   data => [
                       { label => N("First Name:"),  val => \$o->{var}{sn} },
                       { label => N("Name:"),  val => \$o->{var}{cn} },
@@ -117,7 +117,7 @@ $o->{pages} = {
                   next => 'password'
               },
                 password => {
-                         name => N("Ldap User Password") . "\n\n" . N("Bla Bla Bla ") . "\n\n" . N("Password for Users  : ") . $o->{var}{cn} . $o->{var}{defou} . "," . $o->{var}{suffix} . "\n\n",
+                         name => N("LDAP User Password") . "\n\n" . N("Password for Users  : ") . $o->{var}{cn} . $o->{var}{defou} . "," . $o->{var}{suffix},
                   data => [
                       { label => N("Password:):"),  val => \$o->{var}{uidpass}, hidden => 1 },
                       { label => N("Password (again):"),  val => \$o->{var}{uidpass2}, hidden => 1 },
@@ -125,7 +125,7 @@ $o->{pages} = {
 			complete => sub {
 	                        if (not ($o->{var}{uidpass}))
         	                {
-	                                $::in->ask_warn(N("Error"), "Il faut entrer un mot de passe pour Ldap.");
+	                                $::in->ask_warn(N("Error"), N("You must enter a password for LDAP."));
 	                                return 1;
         	                }
 	                        if (not ($o->{var}{uidpass} eq $o->{var}{uidpass2}))
@@ -139,27 +139,27 @@ $o->{pages} = {
               },
 
 	        set_srv => {
-                name => "Configuration de Ldap\n\n",
+                name => N("Configuring LDAP"),
                 data => [
-                { label => "Suffixe LDAP",   val => \$o->{var}{suffix} },
-                { label => "Administrateur Ldap",   val => \$o->{var}{rootdn} },
-                { label => "Mot de passe LDAP", hidden => 1,  val => \$o->{var}{rootpass} },
-                { label => "Vérification du mot de passe LDAP", hidden => 1,   val => \$o->{var}{rootpass2} },
+                { label => N("LDAP Suffix:"),   val => \$o->{var}{suffix} },
+                { label => N("LDAP Administrator:"),   val => \$o->{var}{rootdn} },
+                { label => N("LDAP Password:"), hidden => 1,  val => \$o->{var}{rootpass} },
+                { label => N("LDAP Password (again):"), hidden => 1,   val => \$o->{var}{rootpass2} },
                 ],
                 complete => sub {
                         if (not ($o->{var}{suffix}))
                         {
-                                $::in->ask_warn(N("Error"), "Il faut indiquer un suffixe Ldap.");
+                                $::in->ask_warn(N("Error"), N("You must enter a suffix for LDAP."));
                                 return 1;
                         }
                         if (not ($o->{var}{rootpass}))
                         {
-                                $::in->ask_warn(N("Error"), "Il faut entrer un mot de passe pour Ldap.");
+                                $::in->ask_warn(N("Error"), N("You must enter a password for LDAP."));
                                 return 1;
                         }
                         if (not ($o->{var}{rootpass} eq $o->{var}{rootpass2}))
                         {
-                                $::in->ask_warn(N("Error"), N("The passwords do not match"°);
+                                $::in->ask_warn(N("Error"), N("The passwords do not match"));
                                 return 1;
                         }
                 },
@@ -167,20 +167,20 @@ $o->{pages} = {
 
         },
 	       summary_add_user => {
-			name =>  N("Confirmation de l'utilisateur a creer ") . "\n\n",
+			name =>  N("Confirmation de l'utilisateur a creer"),
                 data => [
                       { label => N("Name:"), type => 'field', fixed_val => \$o->{var}{sn} },
-		      { label => N("Firt name:  "), type => 'field', fixed_val => \$o->{var}{cn} },
-                      { label => N("User Name:  "), type => 'field', fixed_val => \$o->{var}{uid} },
-                      { label => N("Utilisteur :  "), type => 'field', fixed_val => $o->{var}{cn} },
+		      { label => N("Firt name:"), type => 'field', fixed_val => \$o->{var}{cn} },
+                      { label => N("User Name:"), type => 'field', fixed_val => \$o->{var}{uid} },
+                      { label => N("User:"), type => 'field', fixed_val => $o->{var}{cn} },
                   ],
 			      post => \&do_it_user_add,
 			      next => 'endadd'
 			     },
 		summary_set_srv => {
-                        name =>  N("Confirmation de l'utilisateur a creer ") . "\n\n",
+                        name =>  N("Confirmation de l'utilisateur a creer"),
                 data => [
-                      { label => N("Suffixe LDAP :  "), type => 'field', val => $o->{var}{suffix} },
+                      { label => N("LDAP Suffix:"), type => 'field', val => $o->{var}{suffix} },
                   ],
                               post => \&do_it_setldap,
                               next => 'end'
@@ -194,7 +194,7 @@ $o->{pages} = {
 		      },
 	       endadd => {
 			  name => N("Successfully added User"),
-			  data => [ { label => N("The wizard successfully added an user in ldap") } ],
+			  data => [ { label => N("The wizard successfully added an user in LDAP") } ],
 			  no_back => 1,
 			  end => 1,
 			  next => 0,