From 1be510f9529cb082f802408b472a77d074b394c0 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sun, 14 Apr 2013 13:46:12 +0000 Subject: Add zarb MLs html archives --- zarb-ml/mageia-sysadm/2011-January/001651.html | 2263 ++++++++++++++++++++++++ 1 file changed, 2263 insertions(+) create mode 100644 zarb-ml/mageia-sysadm/2011-January/001651.html (limited to 'zarb-ml/mageia-sysadm/2011-January/001651.html') diff --git a/zarb-ml/mageia-sysadm/2011-January/001651.html b/zarb-ml/mageia-sysadm/2011-January/001651.html new file mode 100644 index 000000000..b7e1344a4 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2011-January/001651.html @@ -0,0 +1,2263 @@ + + + + [Mageia-sysadm] [212] - merge trunk ( for good this time ) + + + + + + + + + +

[Mageia-sysadm] [212] - merge trunk ( for good this time )

+ root at mageia.org + root at mageia.org +
+ Wed Jan 5 16:32:57 CET 2011 +

+
+ +
Revision: 212
+Author:   misc
+Date:     2011-01-05 16:32:57 +0100 (Wed, 05 Jan 2011)
+Log Message:
+-----------
+- merge trunk ( for good this time )
+
+Modified Paths:
+--------------
+    identity/CatDap/branches/live/Makefile.PL
+    identity/CatDap/branches/live/catdap.yml
+    identity/CatDap/branches/live/lib/CatDap/Controller/Root.pm
+    identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm
+    identity/CatDap/branches/live/lib/CatDap/Controller/register.pm
+    identity/CatDap/branches/live/lib/CatDap/Controller/user.pm
+    identity/CatDap/branches/live/lib/CatDap/I18N/af.po
+    identity/CatDap/branches/live/lib/CatDap/I18N/fr.po
+    identity/CatDap/branches/live/lib/CatDap/I18N/messages.pot
+    identity/CatDap/branches/live/lib/CatDap.pm
+    identity/CatDap/branches/live/root/admin/account.tt
+    identity/CatDap/branches/live/root/admin/account_addoc.tt
+    identity/CatDap/branches/live/root/admin/account_group.tt
+    identity/CatDap/branches/live/root/admin/account_modify.tt
+    identity/CatDap/branches/live/root/admin/account_promote.tt
+    identity/CatDap/branches/live/root/admin/group.tt
+    identity/CatDap/branches/live/root/admin/group_modify.tt
+    identity/CatDap/branches/live/root/admin/index.tt
+    identity/CatDap/branches/live/root/email/activation.tt
+    identity/CatDap/branches/live/root/email/admin/password.tt
+    identity/CatDap/branches/live/root/index.tt
+    identity/CatDap/branches/live/root/register/check.tt
+    identity/CatDap/branches/live/root/register/index.tt
+    identity/CatDap/branches/live/root/template/footer
+    identity/CatDap/branches/live/root/template/header
+    identity/CatDap/branches/live/root/template/html
+    identity/CatDap/branches/live/root/template/pre
+    identity/CatDap/branches/live/root/template/wrapper
+    identity/CatDap/branches/live/root/user/index.tt
+
+Property Changed:
+----------------
+    identity/CatDap/branches/live/
+
+
+Property changes on: identity/CatDap/branches/live
+___________________________________________________________________
+Modified: svn:mergeinfo
+   - /identity/CatDap/trunk:64,66-68,210
+   + /identity/CatDap/trunk:64,66-68,140-211
+
+Modified: identity/CatDap/branches/live/Makefile.PL
+===================================================================
+--- identity/CatDap/branches/live/Makefile.PL	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/Makefile.PL	2011-01-05 15:32:57 UTC (rev 212)
+@@ -13,6 +13,7 @@
+ requires 'Catalyst::Plugin::ConfigLoader';
+ requires 'Catalyst::Plugin::Static::Simple';
+ requires 'Catalyst::Plugin::I18N';
++requires 'Catalyst::Plugin::Unicode::Encoding';
+ requires 'Catalyst::Plugin::Authentication';
+ requires 'Catalyst::Plugin::Authentication::Store::LDAP';
+ requires 'Catalyst::Plugin::Captcha';
+
+Modified: identity/CatDap/branches/live/catdap.yml
+===================================================================
+--- identity/CatDap/branches/live/catdap.yml	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/catdap.yml	2011-01-05 15:32:57 UTC (rev 212)
+@@ -11,6 +11,7 @@
+ default_view: Web
+ 
+ organisation: Mageia
++project_url: http://www.mageia.org/
+ apptitle: Mageia Identity Management
+ emailfrom: noreply at mageia.org
+ 
+@@ -20,6 +21,8 @@
+         password: FIXME
+         host: ldap.mageia.org
+         start_tls: 1
++        options:
++                inet6: 1
+ 
+ # dn and password should not be required here, we rebind with credentials
+ # from the authenticated user using Model::LDAP::FromAuthentication
+@@ -28,6 +31,10 @@
+         host: ldap.mageia.org
+         start_tls: 1
+ 
++register:
++        login_blacklist:
++                - apache
++
+ authentication:
+         default_realm: ldap
+         realms:
+@@ -39,8 +46,10 @@
+                         store:
+                                 class: LDAP
+                                 ldap_server:     'ldap.mageia.org'
++                                ldap_server_options:
++                                        inet6: 1
+                                 start_tls:       1
+-                                binddn:          cn=catdap,ou=System Accounts,dc=mageai,dc=org
++                                binddn:          cn=catdap,ou=System Accounts,dc=mageia,dc=org
+                                 bindpw:          FIXME
+                                 user_basedn:    "ou=people,dc=mageia,dc=org"
+                                 user_filter:    '(&(objectClass=inetOrgPerson)(uid=%s))'
+
+Modified: identity/CatDap/branches/live/lib/CatDap/Controller/Root.pm
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap/Controller/Root.pm	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap/Controller/Root.pm	2011-01-05 15:32:57 UTC (rev 212)
+@@ -28,7 +28,11 @@
+ 
+ sub index :Path :Args(0) {
+     my ( $self, $c ) = @_;
+-
++    # if user is defined, redirect to /user and let the /user page handle the authentication
++    if (defined $c->user) {
++	    $c->log->debug('Redirecting to /user');
++	    $c->res->redirect('/user');
++    }
+     # Hello World
+     #$c->response->body( $c->welcome_message );
+ }
+
+Modified: identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap/Controller/admin.pm	2011-01-05 15:32:57 UTC (rev 212)
+@@ -47,7 +47,17 @@
+     my $password;
+     my $mesg;
+     my $dn;
+-    my $keyprefix = sprintf( "%02x%02x%02x", split /\./, $c->req->address );
++
++    # TODO merge this code with the one in user.pm
++    my $keyprefix;
++    if ($c->req->address =~ m/:/) {
++        my $address = $c->req->address;
++        $address =~ s/\[\]://;
++        $keyprefix = sprintf( "%06x", $address >> 104 ); # if we shift right 104 bits from 128 we have 24 bits left or 3 bytes.
++    }
++    else {
++        $keyprefix = sprintf( "%02x%02x%02x", split /\./, $c->req->address );
++    }
+     if ( !defined $c->user or not $c->req->cookie('key') ) {
+         $c->detach('/user/login')
+           if ( not $c->req->param('username')
+
+Modified: identity/CatDap/branches/live/lib/CatDap/Controller/register.pm
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap/Controller/register.pm	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap/Controller/register.pm	2011-01-05 15:32:57 UTC (rev 212)
+@@ -51,6 +51,20 @@
+     if (! $c->validate_captcha($c->req->param('validate'))){
+         push @errors, $c->loc('Incorrect validation text, please try again');
+     }
++
++    if ( ! open( my $etcpasswd, "/etc/passwd")) {
++        push @errors, $c->loc('Cannot check /etc/passwd, please warn system administrators');
++    } else {
++        if ( grep { /^$username:/ } <$etcpasswd> ) {
++            push @errors, $c->loc('Invalid username, already used by system');
++        }
++        close($etcpasswd);
++    }
++
++    if ( grep /^$username$/, @{${$c->config}{'register'}{'login_blacklist'}}) {
++        push @errors, $c->loc('Username is not authorized to be used');
++    }
++
+     if ($c->request->params->{gn} !~ /^\p{IsAlnum}+$/) {
+         push @errors, $c->loc(
+             'The first name supplied contains illegal characters'
+@@ -108,7 +122,8 @@
+         push @errors,$mesg->error;
+ 	$c->log->info( sprintf("Creating DN $dn failed: %s", $mesg->error) );
+         $c->stash(errors => \@errors);
+-        #$c->stash(template => 'register/index.tt');
++        $c->stash(template => 'register/index.tt');
++	return ;
+     }
+ 
+     $c->stash(
+
+Modified: identity/CatDap/branches/live/lib/CatDap/Controller/user.pm
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap/Controller/user.pm	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap/Controller/user.pm	2011-01-05 15:32:57 UTC (rev 212)
+@@ -55,7 +55,7 @@
+     my $mesg;
+     my $dn;
+     my @errors;
+-    my $keyprefix = sprintf("%02x%02x%02x",split /\./,$c->req->address);
++    my $keyprefix = $self->get_keyprefix($c);
+     if (! defined $c->user or not $c->req->cookie('key')) {
+ 	if (not $c->req->param('password')) {
+ 	    push @errors,$c->loc('Your session has expired');
+@@ -112,6 +112,22 @@
+ 
+ }
+ 
++sub get_keyprefix : Private {
++    my ( $self, $c ) = @_;
++    my $keyprefix;
++    if ($c->req->address =~ m/:/) {
++        my $address = $c->req->address;
++        $address =~ s/\[\]://;
++
++        # if we shift right 104 bits from 128 we have 24 bits left or 3 bytes.
++        $keyprefix = sprintf( "%06x", $address >> 104 );
++    }
++    else {
++        $keyprefix = sprintf( "%02x%02x%02x", split /\./, $c->req->address );
++    }
++    return $keyprefix;
++}
++
+ =head2 index
+ 
+ =cut
+@@ -293,7 +309,7 @@
+     } else {
+ 
+         # re-encrypt the new password and forward to user view
+-        my $keyprefix = sprintf("%02x%02x%02x",split /\./,$c->req->address);
++        my $keyprefix = $self->get_keyprefix($c);
+         my $key = $c->req->cookie('key')->value;
+         $cipher = Crypt::CBC->new( -key    => $keyprefix . $key,
+             -cipher => 'Blowfish'
+@@ -321,7 +337,7 @@
+             $c->res->redirect('/user');
+ 	}
+ 	# cache password for next request with form data
+-        my $keyprefix = sprintf("%02x%02x%02x",split /\./,$c->req->address);
++        my $keyprefix = $self->get_keyprefix($c);
+ 	my $key = Data::UUID->new->create_str();
+         $cipher = Crypt::CBC->new( -key    => $keyprefix . $key,
+                 -cipher => 'Blowfish'
+@@ -338,7 +354,7 @@
+     }
+ 
+     #Re-authenticate user
+-    my $keyprefix = sprintf("%02x%02x%02x",split /\./,$c->req->address);
++    my $keyprefix = $self->get_keyprefix($c);
+     my $key = $c->req->cookie('key')->value;
+     $cipher = Crypt::CBC->new( -key    => $keyprefix . $key,
+         -cipher => 'Blowfish'
+
+Modified: identity/CatDap/branches/live/lib/CatDap/I18N/af.po
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap/I18N/af.po	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap/I18N/af.po	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,45 +1,78 @@
+-#: lib/CatDap/Controller/register.pm:119
++#: lib/CatDap/Controller/register.pm:133
+ msgid "Activation"
+ msgstr "Aktivering"
+ 
+-#: root/user/index.tt:28 root/user/index.tt:8
++#: root/admin/account_addoc.tt:28 root/admin/account_modify.tt:24
++#: root/admin/group_modify.tt:18 root/user/index.tt:19 root/user/index.tt:46
+ msgid "Add"
+ msgstr "Voeg by"
+ 
++#: root/admin/account_modify.tt:85
++msgid "Add ObjectClass"
++msgstr ""
++
++#: root/admin/account_modify.tt:47
++msgid "Add attribute"
++msgstr ""
++
++#. (oc, dn)
++#: root/admin/account_addoc.tt:1
++msgid "Adding objectclass %1 to dn %2"
++msgstr ""
++
+ #: lib/CatDap/Controller/register.pm:49
+ msgid "Addresses do not match"
+ msgstr "Die addresse verskil"
+ 
+-#: lib/CatDap/Controller/register.pm:75
++#: lib/CatDap/Controller/register.pm:89
+ msgid "An account already exists with this email address"
+ msgstr "'n Rekening met hierde epos adres bestaan reeds"
+ 
+-#: lib/CatDap/Controller/register.pm:80
++#: lib/CatDap/Controller/register.pm:94
+ msgid "An account already exists with this username"
+ msgstr "'n Rekening met hierdie gebruikersnaam bestaan reeds"
+ 
+ #. ($errors)
+-#: lib/CatDap/Controller/admin.pm:529
++#: lib/CatDap/Controller/register.pm:145
+ msgid ""
+ "An error occured sending the email, but your account was created. Please try "
+-"the password recovery process f you entered the correct email address: %1"
++"the password recovery process if you entered the correct email address. "
++"Errors %1"
+ msgstr ""
+ "Daar was 'n fout met die stuur van die aktiverings epos, maar jou rekening "
+ "is geskep. Probeer die wagwoord herwinnings proses as die epos adres korrek "
+-"was: %1"
++"was. Foute: %1"
+ 
+ #. ($errors)
+-#: lib/CatDap/Controller/register.pm:131
++#: lib/CatDap/Controller/admin.pm:539
++#, fuzzy
+ msgid ""
+ "An error occured sending the email, but your account was created. Please try "
+-"the password recovery process if you entered the correct email address. "
+-"Errors %1"
++"the password recovery process if you entered the correct email address: %1"
+ msgstr ""
+ "Daar was 'n fout met die stuur van die aktiverings epos, maar jou rekening "
+ "is geskep. Probeer die wagwoord herwinnings proses as die epos adres korrek "
+-"was. Foute: %1"
++"was: %1"
+ 
+-#: root/user/firstlogin.tt:14 root/user/password.tt:18
++#. ($errors)
++#: lib/CatDap/Controller/forgot_password.pm:105
++msgid "An error occured sending the email, please try again later. Errors %1"
++msgstr ""
++
++#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8
++#: root/admin/group_modify.tt:5 root/user/index.tt:4
++msgid "Attribute"
++msgstr ""
++
++#: lib/CatDap/Controller/register.pm:56
++msgid "Cannot check /etc/passwd, please warn system administrators"
++msgstr ""
++
++#: root/register/index.tt:29
++msgid "Captcha"
++msgstr ""
++
++#: root/user/firstlogin.tt:14 root/user/password.tt:19
+ msgid "Change"
+ msgstr "Verander"
+ 
+@@ -51,7 +84,12 @@
+ msgid "Check your mail for activation instructions."
+ msgstr "Kyk jou epos vir aktiverings instruksies."
+ 
+-#: root/register/index.tt:34
++#: root/forgot_password/complete.tt:5
++#, fuzzy
++msgid "Check your mail for password reset instructions."
++msgstr "Kyk jou epos vir aktiverings instruksies."
++
++#: root/register/index.tt:24
+ msgid "Confirm Email address"
+ msgstr "Bevestig epos adres"
+ 
+@@ -62,10 +100,11 @@
+ #. (cn)
+ #. (entry.cn)
+ #: root/email/activation.tt:1 root/email/admin/password.tt:1
++#: root/email/forgot_password.tt:1
+ msgid "Dear %1,"
+ msgstr "Liewe %1,"
+ 
+-#: root/user/index.tt:9
++#: root/admin/account_modify.tt:27 root/user/index.tt:22
+ msgid "Delete"
+ msgstr "Vee uit"
+ 
+@@ -73,18 +112,75 @@
+ msgid "Edit"
+ msgstr "Wysig"
+ 
+-#: root/register/index.tt:30
++#: root/admin/account.tt:33 root/admin/account.tt:8
++#: root/admin/account_promote.tt:6 root/register/index.tt:20
++msgid "Email"
++msgstr ""
++
++#: root/forgot_password/index.tt:11 root/register/index.tt:21
+ msgid "Email address"
+ msgstr "Epos adres"
+ 
+-#: root/register/index.tt:22
++#: root/forgot_password/complete.tt:1
++msgid "Email sent."
++msgstr ""
++
++#: root/forgot_password/confirm.tt:2
++#, fuzzy
++msgid "Enter new password."
++msgstr "Verander wagwoord"
++
++#: root/register/index.tt:32
++msgid "Enter text"
++msgstr ""
++
++#: root/admin/account.tt:34 root/admin/account_promote.tt:7
++#, fuzzy
++msgid "First Name"
++msgstr "Voornaam"
++
++#: root/register/index.tt:13
+ msgid "First name"
+ msgstr "Voornaam"
+ 
++#: lib/CatDap/Controller/forgot_password.pm:94
++#, fuzzy
++msgid "Forgot password"
++msgstr "Huidige wagwoord"
++
++#: root/forgot_password/index.tt:5
++msgid "Forgot your password?"
++msgstr ""
++
++#: root/index.tt:17 root/index.tt:18
++#, fuzzy
++msgid "Forgotten password?"
++msgstr "Huidige wagwoord"
++
++#: root/admin/account.tt:36 root/admin/account.tt:9
++#: root/admin/account_promote.tt:9
++msgid "Full Name"
++msgstr ""
++
++#: root/admin/group.tt:27
++msgid "Group Name"
++msgstr ""
++
++#: root/admin/group.tt:9
++#, fuzzy
++msgid "Group name"
++msgstr "Voornaam"
++
++#: root/admin/account_modify.tt:2
++msgid "Groups"
++msgstr ""
++
++#: lib/CatDap/Controller/forgot_password.pm:48
+ #: lib/CatDap/Controller/register.pm:52
+ msgid "Incorrect validation text, please try again"
+ msgstr "Inkorrekte teks van die prentjie, probeer weer"
+ 
++#: lib/CatDap/Controller/forgot_password.pm:45
+ #: lib/CatDap/Controller/register.pm:46
+ msgid "Invalid email address"
+ msgstr "Ongeldige epos adres"
+@@ -93,39 +189,69 @@
+ msgid "Invalid username"
+ msgstr "Ongeldige gebruikersnaam"
+ 
+-#: root/template/header:12 root/user/fake.tt:3
++#: lib/CatDap/Controller/register.pm:59
++msgid "Invalid username, already used by system"
++msgstr ""
++
++#: root/template/header:10 root/user/fake.tt:3
+ msgid "Log out"
+ msgstr "Teken uit"
+ 
+-#: root/index.tt:1 root/index.tt:17
++#: root/index.tt:1 root/index.tt:13
+ msgid "Login"
+ msgstr "Teken in"
+ 
+-#: root/user/firstlogin.tt:5 root/user/password.tt:9
++#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
++#: root/user/password.tt:10
+ msgid "New Password"
+ msgstr "Nuwe Wagwoord"
+ 
+-#: lib/CatDap/Controller/user.pm:273
++#: lib/CatDap/Controller/user.pm:296
+ msgid "New passwords dont match"
+ msgstr "Nuwe wagwoorde verskil"
+ 
+-#: root/index.tt:11
++#: root/forgot_password/complete.tt:4
++#, fuzzy
++msgid "Operation was successful."
++msgstr "Registrasie was suksesvol."
++
++#: root/index.tt:10
+ msgid "Password"
+ msgstr "Wagwoord"
+ 
+-#: lib/CatDap/Controller/user.pm:267
++#: lib/CatDap/Controller/user.pm:290
+ msgid "Password incorrect"
+ msgstr "Wagwoord inkorrek"
+ 
+-#: lib/CatDap/Controller/admin.pm:532
++#: lib/CatDap/Controller/admin.pm:542
+ msgid "Password reset and email sent"
+ msgstr "Wagwoord is herstel en epos gestuur"
+ 
++#: root/register/index.tt:12
++msgid "Personal Information"
++msgstr ""
++
+ #: root/email/admin/password.tt:5
+ msgid "Please click below to change your password"
+ msgstr "Volg die skakel onder en verander jou wagwoord"
+ 
+-#: root/index.tt:18 root/register/index.tt:43 root/register/index.tt:6
++#: root/admin/index.tt:1
++msgid "Please use the menus above."
++msgstr ""
++
++#: root/admin/account_promote.tt:25
++msgid "Primary group"
++msgstr ""
++
++#: root/admin/account_modify.tt:71
++msgid "Promote"
++msgstr ""
++
++#: root/admin/account_modify.tt:62
++msgid "Promote user to posixAccount with primary group:"
++msgstr ""
++
++#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+ msgid "Register"
+ msgstr "Registreer"
+ 
+@@ -137,35 +263,95 @@
+ msgid "Registration was successful."
+ msgstr "Registrasie was suksesvol."
+ 
+-#: root/user/firstlogin.tt:9 root/user/password.tt:13
++#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
++#: root/user/password.tt:15
+ msgid "Repeat New Password"
+ msgstr "Herhaal Nuwe Wagwoord"
+ 
+-#: root/register/index.tt:26
++#: root/admin/account_modify.tt:1
++#, fuzzy
++msgid "Reset password"
++msgstr "Huidige wagwoord"
++
++#: root/admin/account.tt:22
++msgid "Search"
++msgstr ""
++
++#: root/admin/account.tt:4 root/admin/group.tt:5
++msgid "Search by"
++msgstr ""
++
++#: root/admin/account_promote.tt:4
++msgid "Select"
++msgstr ""
++
++#: root/forgot_password/index.tt:18
++#, fuzzy
++msgid "Send me my password"
++msgstr "Verander wagwoord"
++
++#: root/forgot_password/confirm.tt:16
++#, fuzzy
++msgid "Set new password"
++msgstr "Herhaal Nuwe Wagwoord"
++
++#: root/register/check.tt:1
++msgid "Success"
++msgstr ""
++
++#: root/admin/account.tt:10 root/admin/account.tt:35
++#: root/admin/account_promote.tt:8 root/register/index.tt:16
+ msgid "Surname"
+ msgstr "Van"
+ 
+-#: lib/CatDap/Controller/register.pm:56
++#: lib/CatDap/Controller/register.pm:70
+ msgid "The first name supplied contains illegal characters"
+ msgstr "Die verskafte noemnaam sluit ongeldige karakters in"
+ 
+-#: lib/CatDap/Controller/register.pm:61
++#: lib/CatDap/Controller/register.pm:75
+ msgid "The surname supplied contains illegal characters"
+ msgstr "Die verskafte van sluit ondeldige karakters in"
+ 
++#: lib/CatDap/Controller/forgot_password.pm:66
++msgid "This email address is not bound to an account"
++msgstr ""
++
+ #: root/email/activation.tt:3
+ msgid "To activate your account, please follow the link below."
+ msgstr "Om U rekening te aktiveer, volg asseblief die volgende skakel."
+ 
+-#: root/user/index.tt:13
++#: root/email/forgot_password.tt:3
++#, fuzzy
++msgid "To reset your password, please follow the link below."
++msgstr "Om U rekening te aktiveer, volg asseblief die volgende skakel."
++
++#: root/admin/account_modify.tt:35 root/user/index.tt:29
+ msgid "Update"
+ msgstr "Opdateer"
+ 
+-#: root/index.tt:7 root/register/index.tt:18
++#: root/admin/account.tt:32 root/admin/account.tt:7
++#: root/admin/account_promote.tt:5 root/index.tt:6 root/register/index.tt:7
++#: root/register/index.tt:8
+ msgid "Username"
+ msgstr "Gebruikersnaam"
+ 
++#: lib/CatDap/Controller/register.pm:65
++msgid "Username is not authorized to be used"
++msgstr ""
++
++#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9
++#: root/admin/group_modify.tt:6 root/user/index.tt:4
++msgid "Value"
++msgstr ""
++
+ #. (c.config.organisation)
++#: root/email/forgot_password.tt:2
++msgid ""
++"Your %1 account has been requested to change the password. If you did not do "
++"this, or you do not want to change your password; you can just do nothing."
++msgstr ""
++
++#. (c.config.organisation)
+ #: root/email/activation.tt:2
+ msgid "Your %1 account has been successfully created, but requires activation."
+ msgstr "Jou %1 rekening is suksesvol geskep, maar aktivering is benodig"
+@@ -179,14 +365,42 @@
+ msgid "Your session has expired"
+ msgstr "Jou sessie het verstrek"
+ 
+-#: root/index.tt:17
+-msgid "or"
+-msgstr "of"
++#: root/admin/account.tt:15 root/admin/group.tt:15
++msgid "contains"
++msgstr ""
+ 
+-#: lib/CatDap/Controller/admin.pm:516
++#: root/admin/group_modify.tt:14
++#, fuzzy
++msgid "delete"
++msgstr "Vee uit"
++
++#: root/admin/account.tt:17 root/admin/group.tt:17
++msgid "greater than or equal to"
++msgstr ""
++
++#: root/admin/account.tt:16 root/admin/group.tt:16
++msgid "is exactly"
++msgstr ""
++
++#: root/admin/account.tt:18 root/admin/group.tt:18
++msgid "less than"
++msgstr ""
++
++#: root/admin/group.tt:10
++msgid "member"
++msgstr ""
++
++#: lib/CatDap/Controller/admin.pm:526
+ msgid "password reset"
+ msgstr "Wagwoord herstelling"
+ 
++#: root/admin/account_modify.tt:53
++msgid "with value"
++msgstr ""
++
++#~ msgid "or"
++#~ msgstr "of"
++
+ #~ msgid "Repeat"
+ #~ msgstr "Herhaal"
+ 
+
+Modified: identity/CatDap/branches/live/lib/CatDap/I18N/fr.po
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap/I18N/fr.po	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap/I18N/fr.po	2011-01-05 15:32:57 UTC (rev 212)
+@@ -5,98 +5,202 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
++"Project-Id-Version: Catdap\n"
+ "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+-"PO-Revision-Date: 2010-10-19 21:07+0100\n"
++"PO-Revision-Date: 2010-11-04 21:09+0100\n"
+ "Last-Translator: Michael Scherer <misc at zarb.org>\n"
+-"Language-Team: LANGUAGE <LL at li.org>\n"
++"Language-Team: LANGUAGE <mageia-i18n at mageia.org>\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"X-Poedit-Language: French\n"
++"X-Poedit-Country: FRANCE\n"
++"X-Poedit-SourceCharset: utf-8\n"
+ 
+-#: lib/CatDap/Controller/register.pm:119
++#: lib/CatDap/Controller/register.pm:133
+ msgid "Activation"
+-msgstr ""
++msgstr "Activation"
+ 
+-#: root/user/index.tt:28 root/user/index.tt:8
++#: root/admin/account_addoc.tt:28 root/admin/account_modify.tt:24
++#: root/admin/group_modify.tt:18 root/user/index.tt:19 root/user/index.tt:46
+ msgid "Add"
++msgstr "Ajouter"
++
++#: root/admin/account_modify.tt:85
++msgid "Add ObjectClass"
+ msgstr ""
+ 
++#: root/admin/account_modify.tt:47
++msgid "Add attribute"
++msgstr ""
++
++#. (oc, dn)
++#: root/admin/account_addoc.tt:1
++msgid "Adding objectclass %1 to dn %2"
++msgstr ""
++
+ #: lib/CatDap/Controller/register.pm:49
+ msgid "Addresses do not match"
+ msgstr "Les adresses ne correspondent pas"
+ 
+-#: lib/CatDap/Controller/register.pm:75
++#: lib/CatDap/Controller/register.pm:89
+ msgid "An account already exists with this email address"
+-msgstr ""
++msgstr "Un compte existe déjà avec cet email"
+ 
+-#: lib/CatDap/Controller/register.pm:80
++#: lib/CatDap/Controller/register.pm:94
+ msgid "An account already exists with this username"
+ msgstr "Un compte existe déjà pour ce nom d'utilisateur"
+ 
+ #. ($errors)
+-#: lib/CatDap/Controller/admin.pm:529
++#: lib/CatDap/Controller/register.pm:145
+ msgid ""
+ "An error occured sending the email, but your account was created. Please try "
+-"the password recovery process f you entered the correct email address: %1"
++"the password recovery process if you entered the correct email address. "
++"Errors %1"
+ msgstr ""
++"Une erreur est arrivé lors de l'envoi du mail, mais votre compte a été crée. "
++"Vous pouvez utiliser la fonction de réinitialisation du mot de passe si "
++"votre adresse est correcte. Erreurs %1"
+ 
+ #. ($errors)
+-#: lib/CatDap/Controller/register.pm:131
++#: lib/CatDap/Controller/admin.pm:539
++#, fuzzy
+ msgid ""
+ "An error occured sending the email, but your account was created. Please try "
+-"the password recovery process if you entered the correct email address. "
+-"Errors %1"
++"the password recovery process if you entered the correct email address: %1"
+ msgstr ""
++"Une erreur est arrivé lors de l'envoi du mail, mais votre compte a été crée. "
++"Vous pouvez utiliser la fonction de réinitialisation du mot de passe si "
++"votre adresse est correcte : %1"
+ 
+-#: root/user/firstlogin.tt:14 root/user/password.tt:18
+-msgid "Change"
++#. ($errors)
++#: lib/CatDap/Controller/forgot_password.pm:105
++msgid "An error occured sending the email, please try again later. Errors %1"
+ msgstr ""
+ 
++#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8
++#: root/admin/group_modify.tt:5 root/user/index.tt:4
++msgid "Attribute"
++msgstr ""
++
++#: lib/CatDap/Controller/register.pm:56
++msgid "Cannot check /etc/passwd, please warn system administrators"
++msgstr ""
++
++#: root/register/index.tt:29
++msgid "Captcha"
++msgstr ""
++
++#: root/user/firstlogin.tt:14 root/user/password.tt:19
++msgid "Change"
++msgstr "Changer"
++
+ #: root/user/fake.tt:2
+-#, fuzzy
+ msgid "Change password"
+-msgstr "Mot de passe"
++msgstr "Changer le mot de passe"
+ 
+ #: root/register/complete.tt:5
+ msgid "Check your mail for activation instructions."
+-msgstr ""
++msgstr "Vérifier votre boite mail pour les instructions d'activation"
+ 
+-#: root/register/index.tt:34
++#: root/forgot_password/complete.tt:5
++#, fuzzy
++msgid "Check your mail for password reset instructions."
++msgstr "Vérifier votre boite mail pour les instructions d'activation"
++
++#: root/register/index.tt:24
+ msgid "Confirm Email address"
+-msgstr ""
++msgstr "Confirmer l'adresse email"
+ 
+ #: root/user/password.tt:5
+ msgid "Current password"
+-msgstr ""
++msgstr "Mot de passe actuel"
+ 
+ #. (cn)
+ #. (entry.cn)
+ #: root/email/activation.tt:1 root/email/admin/password.tt:1
+-#, fuzzy
++#: root/email/forgot_password.tt:1
+ msgid "Dear %1,"
+-msgstr "Cher(e)"
++msgstr "Cher(e) %1,"
+ 
+-#: root/user/index.tt:9
++#: root/admin/account_modify.tt:27 root/user/index.tt:22
+ msgid "Delete"
+-msgstr ""
++msgstr "Supprimer"
+ 
+ #: root/user/fake.tt:1
+ msgid "Edit"
++msgstr "Éditer"
++
++#: root/admin/account.tt:33 root/admin/account.tt:8
++#: root/admin/account_promote.tt:6 root/register/index.tt:20
++msgid "Email"
+ msgstr ""
+ 
+-#: root/register/index.tt:30
++#: root/forgot_password/index.tt:11 root/register/index.tt:21
+ msgid "Email address"
+-msgstr "Adresse de messagerie"
++msgstr "Adresse email"
+ 
+-#: root/register/index.tt:22
++#: root/forgot_password/complete.tt:1
++msgid "Email sent."
++msgstr ""
++
++#: root/forgot_password/confirm.tt:2
++#, fuzzy
++msgid "Enter new password."
++msgstr "Changer le mot de passe"
++
++#: root/register/index.tt:32
++msgid "Enter text"
++msgstr ""
++
++#: root/admin/account.tt:34 root/admin/account_promote.tt:7
++#, fuzzy
++msgid "First Name"
++msgstr "Prénom"
++
++#: root/register/index.tt:13
+ msgid "First name"
+ msgstr "Prénom"
+ 
++#: lib/CatDap/Controller/forgot_password.pm:94
++#, fuzzy
++msgid "Forgot password"
++msgstr "Mot de passe actuel"
++
++#: root/forgot_password/index.tt:5
++msgid "Forgot your password?"
++msgstr ""
++
++#: root/index.tt:17 root/index.tt:18
++#, fuzzy
++msgid "Forgotten password?"
++msgstr "Mot de passe actuel"
++
++#: root/admin/account.tt:36 root/admin/account.tt:9
++#: root/admin/account_promote.tt:9
++msgid "Full Name"
++msgstr ""
++
++#: root/admin/group.tt:27
++msgid "Group Name"
++msgstr ""
++
++#: root/admin/group.tt:9
++#, fuzzy
++msgid "Group name"
++msgstr "Prénom"
++
++#: root/admin/account_modify.tt:2
++msgid "Groups"
++msgstr ""
++
++#: lib/CatDap/Controller/forgot_password.pm:48
+ #: lib/CatDap/Controller/register.pm:52
+ msgid "Incorrect validation text, please try again"
+-msgstr ""
++msgstr "Texte de validation incorrect, merci de tester à nouveau"
+ 
++#: lib/CatDap/Controller/forgot_password.pm:45
+ #: lib/CatDap/Controller/register.pm:46
+ msgid "Invalid email address"
+ msgstr "Adresse mail invalide"
+@@ -105,105 +209,218 @@
+ msgid "Invalid username"
+ msgstr "Nom d'utilisateur invalide"
+ 
+-#: root/template/header:12 root/user/fake.tt:3
+-msgid "Log out"
++#: lib/CatDap/Controller/register.pm:59
++msgid "Invalid username, already used by system"
+ msgstr ""
+ 
+-#: root/index.tt:1 root/index.tt:17
++#: root/template/header:10 root/user/fake.tt:3
++msgid "Log out"
++msgstr "Se déconnecter"
++
++#: root/index.tt:1 root/index.tt:13
+ msgid "Login"
+ msgstr "Login"
+ 
+-#: root/user/firstlogin.tt:5 root/user/password.tt:9
+-#, fuzzy
++#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
++#: root/user/password.tt:10
+ msgid "New Password"
+-msgstr "Mot de passe"
++msgstr "Nouveau mot de passe"
+ 
+-#: lib/CatDap/Controller/user.pm:273
+-#, fuzzy
++#: lib/CatDap/Controller/user.pm:296
+ msgid "New passwords dont match"
+-msgstr "Les adresses ne correspondent pas"
++msgstr "Les mot de passes ne correspondent pas"
+ 
+-#: root/index.tt:11
++#: root/forgot_password/complete.tt:4
++#, fuzzy
++msgid "Operation was successful."
++msgstr "L'enregistrement a réussi"
++
++#: root/index.tt:10
+ msgid "Password"
+ msgstr "Mot de passe"
+ 
+-#: lib/CatDap/Controller/user.pm:267
+-#, fuzzy
++#: lib/CatDap/Controller/user.pm:290
+ msgid "Password incorrect"
+-msgstr "Mot de passe"
++msgstr "Mot de passe incorrect"
+ 
+-#: lib/CatDap/Controller/admin.pm:532
++#: lib/CatDap/Controller/admin.pm:542
+ msgid "Password reset and email sent"
++msgstr "Mot de passe réinitialiser, email envoyé"
++
++#: root/register/index.tt:12
++msgid "Personal Information"
+ msgstr ""
+ 
+ #: root/email/admin/password.tt:5
+ msgid "Please click below to change your password"
++msgstr "Cliquer ici pour changer votre mot de passe"
++
++#: root/admin/index.tt:1
++msgid "Please use the menus above."
+ msgstr ""
+ 
+-#: root/index.tt:18 root/register/index.tt:43 root/register/index.tt:6
++#: root/admin/account_promote.tt:25
++msgid "Primary group"
++msgstr ""
++
++#: root/admin/account_modify.tt:71
++msgid "Promote"
++msgstr ""
++
++#: root/admin/account_modify.tt:62
++msgid "Promote user to posixAccount with primary group:"
++msgstr ""
++
++#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+ msgid "Register"
+ msgstr "S'enregistrer"
+ 
+ #: root/register/complete.tt:1
+ msgid "Registration completed"
+-msgstr ""
++msgstr "Enregistrement terminé"
+ 
+ #: root/register/complete.tt:4
+ msgid "Registration was successful."
+-msgstr ""
++msgstr "L'enregistrement a réussi"
+ 
+-#: root/user/firstlogin.tt:9 root/user/password.tt:13
++#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
++#: root/user/password.tt:15
+ msgid "Repeat New Password"
++msgstr "Répéter le nouveau de passe"
++
++#: root/admin/account_modify.tt:1
++#, fuzzy
++msgid "Reset password"
++msgstr "Mot de passe actuel"
++
++#: root/admin/account.tt:22
++msgid "Search"
+ msgstr ""
+ 
+-#: root/register/index.tt:26
++#: root/admin/account.tt:4 root/admin/group.tt:5
++msgid "Search by"
++msgstr ""
++
++#: root/admin/account_promote.tt:4
++msgid "Select"
++msgstr ""
++
++#: root/forgot_password/index.tt:18
++#, fuzzy
++msgid "Send me my password"
++msgstr "Changer le mot de passe"
++
++#: root/forgot_password/confirm.tt:16
++#, fuzzy
++msgid "Set new password"
++msgstr "Répéter le nouveau de passe"
++
++#: root/register/check.tt:1
++msgid "Success"
++msgstr ""
++
++#: root/admin/account.tt:10 root/admin/account.tt:35
++#: root/admin/account_promote.tt:8 root/register/index.tt:16
+ msgid "Surname"
+-msgstr "Surnom"
++msgstr "Nom"
+ 
+-#: lib/CatDap/Controller/register.pm:56
++#: lib/CatDap/Controller/register.pm:70
+ msgid "The first name supplied contains illegal characters"
+-msgstr ""
++msgstr "Le prénom proposé contient des caractères interdits"
+ 
+-#: lib/CatDap/Controller/register.pm:61
++#: lib/CatDap/Controller/register.pm:75
+ msgid "The surname supplied contains illegal characters"
++msgstr "Le nom proposé contient des caractères interdits"
++
++#: lib/CatDap/Controller/forgot_password.pm:66
++msgid "This email address is not bound to an account"
+ msgstr ""
+ 
+ #: root/email/activation.tt:3
+-#, fuzzy
+ msgid "To activate your account, please follow the link below."
+ msgstr "Pour activer votre compte, merci de suivre le lien ci dessous."
+ 
+-#: root/user/index.tt:13
++#: root/email/forgot_password.tt:3
++#, fuzzy
++msgid "To reset your password, please follow the link below."
++msgstr "Pour activer votre compte, merci de suivre le lien ci dessous."
++
++#: root/admin/account_modify.tt:35 root/user/index.tt:29
+ msgid "Update"
+-msgstr ""
++msgstr "Mettre à jour"
+ 
+-#: root/index.tt:7 root/register/index.tt:18
++#: root/admin/account.tt:32 root/admin/account.tt:7
++#: root/admin/account_promote.tt:5 root/index.tt:6 root/register/index.tt:7
++#: root/register/index.tt:8
+ msgid "Username"
+ msgstr "Nom d'utilisateur"
+ 
++#: lib/CatDap/Controller/register.pm:65
++msgid "Username is not authorized to be used"
++msgstr ""
++
++#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9
++#: root/admin/group_modify.tt:6 root/user/index.tt:4
++msgid "Value"
++msgstr ""
++
+ #. (c.config.organisation)
++#: root/email/forgot_password.tt:2
++msgid ""
++"Your %1 account has been requested to change the password. If you did not do "
++"this, or you do not want to change your password; you can just do nothing."
++msgstr ""
++
++#. (c.config.organisation)
+ #: root/email/activation.tt:2
+ msgid "Your %1 account has been successfully created, but requires activation."
+-msgstr ""
++msgstr "Votre compte %1 a été crée mais requiert d'être activé"
+ 
+ #. (c.user.username)
+ #: root/email/admin/password.tt:3
+ msgid "Your password was reset by %1"
+-msgstr ""
++msgstr "Votre mot de passe a été réinitialisé par %1"
+ 
+ #: lib/CatDap/Controller/user.pm:61
+ msgid "Your session has expired"
++msgstr "Votre session a expiré"
++
++#: root/admin/account.tt:15 root/admin/group.tt:15
++msgid "contains"
+ msgstr ""
+ 
+-#: root/index.tt:17
+-msgid "or"
+-msgstr "ou"
++#: root/admin/group_modify.tt:14
++#, fuzzy
++msgid "delete"
++msgstr "Supprimer"
+ 
+-#: lib/CatDap/Controller/admin.pm:516
+-#, fuzzy
++#: root/admin/account.tt:17 root/admin/group.tt:17
++msgid "greater than or equal to"
++msgstr ""
++
++#: root/admin/account.tt:16 root/admin/group.tt:16
++msgid "is exactly"
++msgstr ""
++
++#: root/admin/account.tt:18 root/admin/group.tt:18
++msgid "less than"
++msgstr ""
++
++#: root/admin/group.tt:10
++msgid "member"
++msgstr ""
++
++#: lib/CatDap/Controller/admin.pm:526
+ msgid "password reset"
+-msgstr "Mot de passe"
++msgstr "réinitialisation du mot de passe"
+ 
++#: root/admin/account_modify.tt:53
++msgid "with value"
++msgstr ""
++
++#~ msgid "or"
++#~ msgstr "ou"
++
+ #~ msgid "Mageia Identity Activation"
+ #~ msgstr "Activation de l'identité Mageia"
+ 
+
+Modified: identity/CatDap/branches/live/lib/CatDap/I18N/messages.pot
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap/I18N/messages.pot	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap/I18N/messages.pot	2011-01-05 15:32:57 UTC (rev 212)
+@@ -15,37 +15,67 @@
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+-#: lib/CatDap/Controller/register.pm:119
++#: lib/CatDap/Controller/register.pm:133
+ msgid "Activation"
+ msgstr ""
+ 
+-#: root/user/index.tt:28 root/user/index.tt:8
++#: root/admin/account_addoc.tt:28 root/admin/account_modify.tt:24 root/admin/group_modify.tt:18 root/user/index.tt:19 root/user/index.tt:46
+ msgid "Add"
+ msgstr ""
+ 
++#: root/admin/account_modify.tt:85
++msgid "Add ObjectClass"
++msgstr ""
++
++#: root/admin/account_modify.tt:47
++msgid "Add attribute"
++msgstr ""
++
++#. (oc, dn)
++#: root/admin/account_addoc.tt:1
++msgid "Adding objectclass %1 to dn %2"
++msgstr ""
++
+ #: lib/CatDap/Controller/register.pm:49
+ msgid "Addresses do not match"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/register.pm:75
++#: lib/CatDap/Controller/register.pm:89
+ msgid "An account already exists with this email address"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/register.pm:80
++#: lib/CatDap/Controller/register.pm:94
+ msgid "An account already exists with this username"
+ msgstr ""
+ 
+ #. ($errors)
+-#: lib/CatDap/Controller/admin.pm:529
+-msgid "An error occured sending the email, but your account was created. Please try the password recovery process f you entered the correct email address: %1"
++#: lib/CatDap/Controller/register.pm:145
++msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1"
+ msgstr ""
+ 
+ #. ($errors)
+-#: lib/CatDap/Controller/register.pm:131
+-msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1"
++#: lib/CatDap/Controller/admin.pm:539
++msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: %1"
+ msgstr ""
+ 
+-#: root/user/firstlogin.tt:14 root/user/password.tt:18
++#. ($errors)
++#: lib/CatDap/Controller/forgot_password.pm:105
++msgid "An error occured sending the email, please try again later. Errors %1"
++msgstr ""
++
++#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
++msgid "Attribute"
++msgstr ""
++
++#: lib/CatDap/Controller/register.pm:56
++msgid "Cannot check /etc/passwd, please warn system administrators"
++msgstr ""
++
++#: root/register/index.tt:29
++msgid "Captcha"
++msgstr ""
++
++#: root/user/firstlogin.tt:14 root/user/password.tt:19
+ msgid "Change"
+ msgstr ""
+ 
+@@ -57,7 +87,11 @@
+ msgid "Check your mail for activation instructions."
+ msgstr ""
+ 
+-#: root/register/index.tt:34
++#: root/forgot_password/complete.tt:5
++msgid "Check your mail for password reset instructions."
++msgstr ""
++
++#: root/register/index.tt:24
+ msgid "Confirm Email address"
+ msgstr ""
+ 
+@@ -67,11 +101,11 @@
+ 
+ #. (cn)
+ #. (entry.cn)
+-#: root/email/activation.tt:1 root/email/admin/password.tt:1
++#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_password.tt:1
+ msgid "Dear %1,"
+ msgstr ""
+ 
+-#: root/user/index.tt:9
++#: root/admin/account_modify.tt:27 root/user/index.tt:22
+ msgid "Delete"
+ msgstr ""
+ 
+@@ -79,19 +113,67 @@
+ msgid "Edit"
+ msgstr ""
+ 
+-#: root/register/index.tt:30
++#: root/admin/account.tt:33 root/admin/account.tt:8 root/admin/account_promote.tt:6 root/register/index.tt:20
++msgid "Email"
++msgstr ""
++
++#: root/forgot_password/index.tt:11 root/register/index.tt:21
+ msgid "Email address"
+ msgstr ""
+ 
+-#: root/register/index.tt:22
++#: root/forgot_password/complete.tt:1
++msgid "Email sent."
++msgstr ""
++
++#: root/forgot_password/confirm.tt:2
++msgid "Enter new password."
++msgstr ""
++
++#: root/register/index.tt:32
++msgid "Enter text"
++msgstr ""
++
++#: root/admin/account.tt:34 root/admin/account_promote.tt:7
++msgid "First Name"
++msgstr ""
++
++#: root/register/index.tt:13
+ msgid "First name"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/register.pm:52
++#: lib/CatDap/Controller/forgot_password.pm:94
++msgid "Forgot password"
++msgstr ""
++
++#: root/forgot_password/index.tt:5
++msgid "Forgot your password?"
++msgstr ""
++
++#: root/index.tt:17 root/index.tt:18
++msgid "Forgotten password?"
++msgstr ""
++
++#: root/admin/account.tt:36 root/admin/account.tt:9 root/admin/account_promote.tt:9
++msgid "Full Name"
++msgstr ""
++
++#: root/admin/group.tt:27
++msgid "Group Name"
++msgstr ""
++
++#: root/admin/group.tt:9
++msgid "Group name"
++msgstr ""
++
++#: root/admin/account_modify.tt:2
++msgid "Groups"
++msgstr ""
++
++#: lib/CatDap/Controller/forgot_password.pm:48 lib/CatDap/Controller/register.pm:52
+ msgid "Incorrect validation text, please try again"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/register.pm:46
++#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:46
+ msgid "Invalid email address"
+ msgstr ""
+ 
+@@ -99,39 +181,67 @@
+ msgid "Invalid username"
+ msgstr ""
+ 
+-#: root/template/header:12 root/user/fake.tt:3
++#: lib/CatDap/Controller/register.pm:59
++msgid "Invalid username, already used by system"
++msgstr ""
++
++#: root/template/header:10 root/user/fake.tt:3
+ msgid "Log out"
+ msgstr ""
+ 
+-#: root/index.tt:1 root/index.tt:17
++#: root/index.tt:1 root/index.tt:13
+ msgid "Login"
+ msgstr ""
+ 
+-#: root/user/firstlogin.tt:5 root/user/password.tt:9
++#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:10
+ msgid "New Password"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/user.pm:273
++#: lib/CatDap/Controller/user.pm:296
+ msgid "New passwords dont match"
+ msgstr ""
+ 
+-#: root/index.tt:11
++#: root/forgot_password/complete.tt:4
++msgid "Operation was successful."
++msgstr ""
++
++#: root/index.tt:10
+ msgid "Password"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/user.pm:267
++#: lib/CatDap/Controller/user.pm:290
+ msgid "Password incorrect"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/admin.pm:532
++#: lib/CatDap/Controller/admin.pm:542
+ msgid "Password reset and email sent"
+ msgstr ""
+ 
++#: root/register/index.tt:12
++msgid "Personal Information"
++msgstr ""
++
+ #: root/email/admin/password.tt:5
+ msgid "Please click below to change your password"
+ msgstr ""
+ 
+-#: root/index.tt:18 root/register/index.tt:43 root/register/index.tt:6
++#: root/admin/index.tt:1
++msgid "Please use the menus above."
++msgstr ""
++
++#: root/admin/account_promote.tt:25
++msgid "Primary group"
++msgstr ""
++
++#: root/admin/account_modify.tt:71
++msgid "Promote"
++msgstr ""
++
++#: root/admin/account_modify.tt:62
++msgid "Promote user to posixAccount with primary group:"
++msgstr ""
++
++#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+ msgid "Register"
+ msgstr ""
+ 
+@@ -143,35 +253,84 @@
+ msgid "Registration was successful."
+ msgstr ""
+ 
+-#: root/user/firstlogin.tt:9 root/user/password.tt:13
++#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:15
+ msgid "Repeat New Password"
+ msgstr ""
+ 
+-#: root/register/index.tt:26
++#: root/admin/account_modify.tt:1
++msgid "Reset password"
++msgstr ""
++
++#: root/admin/account.tt:22
++msgid "Search"
++msgstr ""
++
++#: root/admin/account.tt:4 root/admin/group.tt:5
++msgid "Search by"
++msgstr ""
++
++#: root/admin/account_promote.tt:4
++msgid "Select"
++msgstr ""
++
++#: root/forgot_password/index.tt:18
++msgid "Send me my password"
++msgstr ""
++
++#: root/forgot_password/confirm.tt:16
++msgid "Set new password"
++msgstr ""
++
++#: root/register/check.tt:1
++msgid "Success"
++msgstr ""
++
++#: root/admin/account.tt:10 root/admin/account.tt:35 root/admin/account_promote.tt:8 root/register/index.tt:16
+ msgid "Surname"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/register.pm:56
++#: lib/CatDap/Controller/register.pm:70
+ msgid "The first name supplied contains illegal characters"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/register.pm:61
++#: lib/CatDap/Controller/register.pm:75
+ msgid "The surname supplied contains illegal characters"
+ msgstr ""
+ 
++#: lib/CatDap/Controller/forgot_password.pm:66
++msgid "This email address is not bound to an account"
++msgstr ""
++
+ #: root/email/activation.tt:3
+ msgid "To activate your account, please follow the link below."
+ msgstr ""
+ 
+-#: root/user/index.tt:13
++#: root/email/forgot_password.tt:3
++msgid "To reset your password, please follow the link below."
++msgstr ""
++
++#: root/admin/account_modify.tt:35 root/user/index.tt:29
+ msgid "Update"
+ msgstr ""
+ 
+-#: root/index.tt:7 root/register/index.tt:18
++#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/index.tt:6 root/register/index.tt:7 root/register/index.tt:8
+ msgid "Username"
+ msgstr ""
+ 
++#: lib/CatDap/Controller/register.pm:65
++msgid "Username is not authorized to be used"
++msgstr ""
++
++#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9 root/admin/group_modify.tt:6 root/user/index.tt:4
++msgid "Value"
++msgstr ""
++
+ #. (c.config.organisation)
++#: root/email/forgot_password.tt:2
++msgid "Your %1 account has been requested to change the password. If you did not do this, or you do not want to change your password; you can just do nothing."
++msgstr ""
++
++#. (c.config.organisation)
+ #: root/email/activation.tt:2
+ msgid "Your %1 account has been successfully created, but requires activation."
+ msgstr ""
+@@ -185,10 +344,34 @@
+ msgid "Your session has expired"
+ msgstr ""
+ 
+-#: root/index.tt:17
+-msgid "or"
++#: root/admin/account.tt:15 root/admin/group.tt:15
++msgid "contains"
+ msgstr ""
+ 
+-#: lib/CatDap/Controller/admin.pm:516
++#: root/admin/group_modify.tt:14
++msgid "delete"
++msgstr ""
++
++#: root/admin/account.tt:17 root/admin/group.tt:17
++msgid "greater than or equal to"
++msgstr ""
++
++#: root/admin/account.tt:16 root/admin/group.tt:16
++msgid "is exactly"
++msgstr ""
++
++#: root/admin/account.tt:18 root/admin/group.tt:18
++msgid "less than"
++msgstr ""
++
++#: root/admin/group.tt:10
++msgid "member"
++msgstr ""
++
++#: lib/CatDap/Controller/admin.pm:526
+ msgid "password reset"
+ msgstr ""
++
++#: root/admin/account_modify.tt:53
++msgid "with value"
++msgstr ""
+
+Modified: identity/CatDap/branches/live/lib/CatDap.pm
+===================================================================
+--- identity/CatDap/branches/live/lib/CatDap.pm	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/lib/CatDap.pm	2011-01-05 15:32:57 UTC (rev 212)
+@@ -22,6 +22,7 @@
+     Authentication
+     Authorization::Roles
+     I18N
++    Unicode::Encoding
+ /;
+ 
+ extends 'Catalyst';
+
+Modified: identity/CatDap/branches/live/root/admin/account.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/account.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/account.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,24 +1,25 @@
+ <form method="post" action="">
+     <table>
+         <tr>
+-            <td>Search by</td>
++            <td>[% l('Search by') %]</td>
+             <td>
+                 <select name="attribute">
+-                    <option value="uid">Username</option>
+-                    <option value="mail">Email</option>
+-                    <option value="cn">Full Name</option>
+-                    <option value="sn">Surname</option>
++                    <option value="uid">[% l('Username') %]</option>
++                    <option value="mail">[% l('Email') %]</option>
++                    <option value="cn">[% l('Full Name') %]</option>
++                    <option value="sn">[% l('Surname') %]</option>
+                 </select>
+             </td>
+             <!-- td>
+             <select name="matchtype">
+-            <option value="substring">contains</option>
+-            <option value="exact">is exactly</option>
+-            <option value="gte">greater than or equal to</option>
+-            <option value="lt">less than</option>
++            <option value="substring">[% l('contains') %]</option>
++            <option value="exact">[% l('is exactly') %]</option>
++            <option value="gte">[% l('greater than or equal to') %]</option>
++            <option value="lt">[% l('less than') %]</option>
+             </select>
+             </td -->
+-            <td><input name="value" value="" /></td>
++            <td><input type="text" name="value" value="" /></td>
++            <td><button type="submit" value="[% l('Search') %]">[% l('Search') %]</button></td>
+         </tr>
+     </table>
+ </form>
+@@ -28,11 +29,11 @@
+ [% IF entries %]
+     <table border=0>
+         <tr>
+-            <th>Username</th>
+-            <th>Email</th>
+-            <th>First Name</th>
+-            <th>Surname</td>
+-            <th>Full Name</td>
++            <th>[% l('Username') %]</th>
++            <th>[% l('Email') %]</th>
++            <th>[% l('First Name') %]</th>
++            <th>[% l('Surname') %]</td>
++            <th>[% l('Full Name') %]</td>
+         </tr>
+         [% FOREACH entry IN entries %]
+             <tr>
+
+Modified: identity/CatDap/branches/live/root/admin/account_addoc.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/account_addoc.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/account_addoc.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,4 +1,4 @@
+-Adding objectclass [% oc %] to dn [% dn %]
++[% l('Adding objectclass [_1] to dn [_2]', oc, dn) %]
+ 
+ <form method="post" action="">
+     <input type="hidden" name="dn" value="[% dn %]" />
+@@ -6,8 +6,8 @@
+     <input type="hidden" name="objectclass" value="[% oc %]" />
+     <table>
+         <tr>
+-            <th>Attribute</th>
+-            <th>Value</th>
++            <th>[% l('Attribute') %]</th>
++            <th>[% l('Value') %]</th>
+         </tr>
+         [% FOREACH attr IN must %]
+             [% IF attr != "objectClass" %]
+@@ -25,6 +25,6 @@
+             </tr>
+         [% END %]
+     </table>
+-    <p><input type="submit" value="Add" /></p>
++    <p><input type="submit" value="[% l('Add') %]" /></p>
+ 
+ </form>
+\ No newline at end of file
+
+Modified: identity/CatDap/branches/live/root/admin/account_group.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/account_group.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/account_group.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,4 +1,4 @@
+-<h2>Add user [% uid %] to a new group</h2>
++<h2>[% l('Add user [_1] to a new group, uid) %]</h2>
+ 
+ <form method="post" action="">
+     <input type='hidden' name='uid' value='[% uid %]' />
+@@ -8,12 +8,12 @@
+             <option value='[% group.cn %]'>[% group.cn %]</option>
+         [% END %]
+     </select>
+-    <input type='submit' value='Add' />
++    <input type='submit' value='[% l('Add') %]' />
+ </form>
+ 
+ <hr />
+ 
+-<h2>Delete user [% uid %] from an existing group:</h2>
++<h2>[% l('Delete user [_1] from an existing group:', uid) %] </h2>
+ 
+ <form method="post" action="">
+     <input type='hidden' name='uid' value='[% uid %]' />
+@@ -23,7 +23,7 @@
+             <option value='[% group.cn %]'>[% group.cn %]</option>
+         [% END %]
+     </select>
+-    <input type='submit' value='Delete' />
++    <input type='submit' value='[% l('Delete') %]' />
+ </form>
+ 
+ <hr />
+\ No newline at end of file
+
+Modified: identity/CatDap/branches/live/root/admin/account_modify.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/account_modify.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/account_modify.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,12 +1,12 @@
+-<a href="[% c.uri_for('/admin/password') %]/[% uid %]">Reset password</a>
+-<a href="[% c.uri_for('/admin/account_group') %]/[% uid %]">Groups</a>
++<a href="[% c.uri_for('/admin/password') %]/[% uid %]">[% l('Reset password') %]</a>
++<a href="[% c.uri_for('/admin/account_group') %]/[% uid %]">[% l('Groups') %]</a>
+ 
+ <form method="post" action="">
+     <input type='hidden' name='operation' value='replace' />
+     <table border=0>
+         <tr>
+-            <th>Attribute</th>
+-            <th>Value</th>
++            <th>[% l('Attribute') %]</th>
++            <th>[% l('Value') %]</th>
+         </tr>
+         [% FOREACH attr IN values %]
+         <tr>
+@@ -21,10 +21,10 @@
+                         <br/>
+                     [% END %]
+                     [% IF attr.addable AND attr.editable %]
+-                        <a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">Add</a>
++                        <a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">[% l('Add') %]</a>
+                     [% END %]
+                     [% IF attr.removable AND attr.editable %]
+-                        <a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">Delete</a>
++                        <a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">[% l('Delete') %]</a>
+                     [% END %]
+                 [% END %]
+             </td>
+@@ -32,7 +32,7 @@
+         [% END %]
+         <tr>
+             <td colspan=2 align=center>
+-                <input type='Submit' value='Update'>
++                <input type='Submit' value='[% l('Update') %]'>
+             </td>
+         </tr>
+     </table>
+@@ -44,13 +44,13 @@
+     <input type="hidden" name="operation" value="add" />
+ 
+     <p>
+-    Add attribute 
++    [% l('Add attribute') %]
+     <select name='attribute'>
+         [% FOREACH attr IN may %]
+         <option value="[% attr %]">[% attr %]</option>
+         [% END %]
+     </select>
+-    with value
++    [% l('with value') %]
+     <input name="value" value="" />
+     <input type="submit" value="Add" />
+     </p>
+@@ -59,7 +59,7 @@
+ <hr />
+ 
+ [% IF groups %]
+-<p>Promote user to posixAccount with primary group: </p>
++<p>[% l('Promote user to posixAccount with primary group:') %] </p>
+ 
+ <form method="post" action="[% c.uri_for('/admin/account_promote') %]">
+     <input type="hidden" name="dn" value="[% dn %]" />
+@@ -68,7 +68,7 @@
+             <option value="[% group.gidNumber %]">[% group.name %]</option>
+         [% END %]
+     </select>
+-    <input type="submit" value="Promote" />
++    <input type="submit" value="[% l('Promote') %]" />
+ </form>
+ [% END %]
+ 
+@@ -82,7 +82,7 @@
+             <option value='[% oc %]'>[% oc %]</option>
+         [% END %]
+     </select>
+-    <input type="submit" value="Add ObjectClass" />
++    <input type="submit" value="[% l('Add ObjectClass') %]" />
+ </form>
+ 
+ <hr />
+\ No newline at end of file
+
+Modified: identity/CatDap/branches/live/root/admin/account_promote.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/account_promote.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/account_promote.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,12 +1,12 @@
+ <form method="post" action="">
+     <table border=0>
+         <tr>
+-            <th>Select</th>
+-            <th>Username</th>
+-            <th>Email</th>
+-            <th>First Name</th>
+-            <th>Surname</td>
+-            <th>Full Name</td>
++            <th>[% l('Select') %]</th>
++            <th>[% l('Username') %]</th>
++            <th>[% l('Email') %]</th>
++            <th>[% l('First Name') %]</th>
++            <th>[% l('Surname') %]</td>
++            <th>[% l('Full Name') %]</td>
+         </tr>
+         [% FOREACH entry IN entries %]
+         <tr>
+@@ -22,7 +22,7 @@
+ 
+     <table border=0>
+         <tr>
+-            <td>Primary group</td>
++            <td>[% l('Primary group') %]</td>
+             <td>
+                 <select name="gid">
+                 [% FOREACH group IN groups %]
+
+Modified: identity/CatDap/branches/live/root/admin/group.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/group.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/group.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -2,20 +2,20 @@
+ <table>
+ <tr>
+ <td>
+-Search by
++[% l('Search by') %]
+ </td>
+ <td>
+ <select name="attribute">
+-<option value="cn">Group name</option>
+-<option value="member">member</option>
++<option value="cn">[% l('Group name') %]</option>
++<option value="member">[% l('member') %]</option>
+ </select>
+ </td>
+ <!-- td>
+ <select name="matchtype">
+-<option value="substring">contains</option>
+-<option value="exact">is exactly</option>
+-<option value="gte">greater than or equal to</option>
+-<option value="lt">less than</option>
++<option value="substring">[% l('contains') %]</option>
++<option value="exact">[% l('is exactly') %]</option>
++<option value="gte">[% l('greater than or equal to') %]</option>
++<option value="lt">[% l('less than') %]</option>
+ </select>
+ </td -->
+ <td><input name='value'></td>
+@@ -24,7 +24,7 @@
+ [% IF entries %]
+ <table border=0>
+ <tr>
+-<th>Group Name</th>
++<th>[% l('Group Name') %]</th>
+ </tr>
+ [% FOREACH entry IN entries %]
+ <tr>
+
+Modified: identity/CatDap/branches/live/root/admin/group_modify.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/group_modify.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/group_modify.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -2,8 +2,8 @@
+     <input type='hidden' name='dn' value='[% group.dn %]'>
+     <table>
+         <tr>
+-            <th>Attribute</th>
+-            <th>Value</th>
++            <th>[% l('Attribute') %]</th>
++            <th>[% l('Value') %]</th>
+         </tr>
+         [% FOREACH attr IN group.attributes %]
+         <tr>
+@@ -11,11 +11,11 @@
+             <td>
+                 [% FOREACH value IN group.get_value(attr) %]
+                     [% value %]
+-                    <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">delete</a>
++                    <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">[% l('delete') %]</a>
+                     <br/>
+                 [% END %]
+                 <input name="[% attr %]" value="" />
+-                <input type="submit" value="Add" />
++                <input type="submit" value="[% l('Add') %]" />
+             </td>
+         </tr>
+         [% END %]
+
+Modified: identity/CatDap/branches/live/root/admin/index.tt
+===================================================================
+--- identity/CatDap/branches/live/root/admin/index.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/admin/index.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1 +1 @@
+-<p>Please use the menus above.</p>
+\ No newline at end of file
++<p>[% l('Please use the menus above.') %]</p>
+
+Modified: identity/CatDap/branches/live/root/email/activation.tt
+===================================================================
+--- identity/CatDap/branches/live/root/email/activation.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/email/activation.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -4,4 +4,4 @@
+ [% url %]
+ 
+ --
+-http://mageia.org/
+\ No newline at end of file
++[% c.config.project_url %]
+
+Modified: identity/CatDap/branches/live/root/email/admin/password.tt
+===================================================================
+--- identity/CatDap/branches/live/root/email/admin/password.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/email/admin/password.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -7,4 +7,4 @@
+ [% url %]
+ 
+ --
+-http://mageia.org/
+\ No newline at end of file
++[% c.config.project_url %]
+
+Modified: identity/CatDap/branches/live/root/index.tt
+===================================================================
+--- identity/CatDap/branches/live/root/index.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/index.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,21 +1,22 @@
+ <h1>[% l('Login') %]</h1>
+ 
++<div id="login_form">
+ <form method="post" action="/user">
++            <div id="login_form_inputs">
++                        <label for="username_">[% l('Username : ') %]</label>
++                        <input id="username_" type="text" name="username" value="[% c.user.username %]" />
++            <br />
+ 
+-    <p>
+-        <label for="username_">[% l('Username') %]</label>
+-        <input id="username_" type="text" name="username" value="[% c.user.username %]" />
+-    </p>
+-
+-    <p>
+-        <label for="password_">[% l('Password') %]</label>
+-        <input id="password_" type="password" name="password" />
+-    </p>
+-
+-    <p><input type="submit" value="[% l('Login') %]" />
+-        [% l('or') %] 
+-        <a href="/register">[% l('Register') %]</a></p>
+-        
+-    <p>@todo [% l('Forgotten password?') %]</p>
+-
++                        <label for="password_">[% l('Password : ') %]</label>
++                        <input id="password_" type="password" name="password" />
++            <br />
++            </div>
++            <div id="login_form_line">
++                        <span><a href="/register">[% l('Register') %]</a> |
++                        @todo [% l('Forgotten password?') %]
++                        <!--<a href="/forgot_password">[% l('Forgotten password?') %]</a> -->
++            </span>
++            <button type="submit" value="[% l('Login') %]" >[% l('Login') %]</button>
++            </div>
+ </form>
++</div>
+
+Modified: identity/CatDap/branches/live/root/register/check.tt
+===================================================================
+--- identity/CatDap/branches/live/root/register/check.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/register/check.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,4 +1,4 @@
+-<h2>Success</h2>
++<h2>[% l('Success') %]</h2>
+ <p>
+ [% message %]
+ </p>
+\ No newline at end of file
+
+Modified: identity/CatDap/branches/live/root/register/index.tt
+===================================================================
+--- identity/CatDap/branches/live/root/register/index.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/register/index.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,48 +1,37 @@
+-[% MACRO l(text, args) BLOCK;
+-    c.localize(text, args);
+-END; %]
+ 
+ 
+ <h2>[% l('Register') %]</h2>
+ 
+-<p class="error">
+-    [% FOREACH error IN errors %]
+-    [% error %]<br/>
+-    [% END %]
+-</p>
+-
++<div id="input_form">
+ <form method="post" action="/register/check">
++            <h3>[% l('Username') %]</h3>
++			<label for="uid_">[% l('Username') %]</label><br />
++			<input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" /><br />
+ 
+-    <p>
+-        <label for="uid_">[% l('Username') %]</label>
+-        <input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" />
+-    </p>
++            <p>
++            <h3>[% l('Personal Information') %]</h3>
++            <label for="gn_">[% l('First name') %]</label><br/>
++			<input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" /><br />
+ 
+-    <p>
+-        <label for="gn_">[% l('First name') %]</label>
+-        <input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" />
+-    </p>
++			<label for="sn_">[% l('Surname') %]</label><br/>
++			<input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" /><br />
++            </p>
++            <p>
++            <h3>[% l('Email') %]</h3>
++			<label for="mail1_">[% l('Email address') %]</label><br/>
++			<input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" /><br />
+ 
+-    <p>
+-        <label for="sn_">[% l('Surname') %]</label>
+-        <input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" />
+-    </p>
++			<label for="mail2_">[% l('Confirm Email address') %]</label><br/>
++			<input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" /><br />
++            </p>
+ 
+-    <p>
+-        <label for="mail1_">[% l('Email address') %]</label>
+-        <input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" />
+-    </p>
++            <p>
++			<h3>[% l('Captcha') %]</h3>
+ 
+-    <p>
+-        <label for="mail2_">[% l('Confirm Email address') %]</label>
+-        <input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" />
+-    </p>
+-
+-    <p>
+-        <img src="/register/captcha" />
+-        <input type="text" name="validate" />
+-    </p>
+-
+-    <p><input type="submit" value="[% l('Register') %]" /></p>
+-
+-</form>
+\ No newline at end of file
++            <img src="/register/captcha" /><br />
++			<label for="test">[% l('Enter text') %]</label><br/>
++            <input type="text" name="validate" /><br/>
++            </p>
++			<button type="submit" value="[% l('Register') %]">[% l('Register') %]</button>
++</form>
++</div>
+
+Modified: identity/CatDap/branches/live/root/template/footer
+===================================================================
+--- identity/CatDap/branches/live/root/template/footer	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/template/footer	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,4 +1,5 @@
+-<p>2010 <a href="http://mageia.org/">Mageia.org</a>
++<div class="hnav">
++<div align=center><p>2010 <a href="http://mageia.org/">Mageia.org</a>
+     | <a href="http://mageia.org/policies/privacy/">Privacy policy</a>
+     | <a href="http://mageia.org/faq/accounts/">Mageia user accounts FAQ</a>
+-    </p>
+\ No newline at end of file
++</p></div></div>
+
+Modified: identity/CatDap/branches/live/root/template/header
+===================================================================
+--- identity/CatDap/branches/live/root/template/header	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/template/header	2011-01-05 15:32:57 UTC (rev 212)
+@@ -8,8 +8,6 @@
+     [% IF c.user.username %]
+         <li><strong><a href="[% c.uri_for("/user") %]">[% c.user.username %]</a></strong></li>
+         <li><a href="/user/logout">[% l('Log out') %]</a></li>
+-    [% ELSE %]
+-        <li><a href="/">[% l('Login') %]</a></li>
+     [% END %]
+     </ul>
+ </div>
+
+Modified: identity/CatDap/branches/live/root/template/html
+===================================================================
+--- identity/CatDap/branches/live/root/template/html	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/template/html	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,17 +1,17 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!DOCTYPE html>
+-<html lang="en" dir="ltr">
++<html xmlns="http://www.w3.org/1999/xhtml" lang="en" dir="ltr">
+ <head>
+     <meta charset="utf-8" />
+     <title>[% template.title or site.title or c.config.apptitle %]</title>
+-    <meta content="description" value="Mageia.org online user account panel" />
+-    <meta content="keywords" value="mageia, user, account, password" />
+-    <meta content="robots" value="index,nofollow" />
+-    <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css">
+-    <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css">
++    <meta name="description" content="Mageia.org online user account panel" />
++    <meta name="keywords" content="mageia, user, account, password" />
++    <meta name="robots" content="index,nofollow" />
++    <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css" />
++    <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css" />
+     <link rel="stylesheet" type="text/css" href="/static/style/ttsite.css" />
+ </head>
+ <body>
+ [% content %]
+ </body>
+-</html>
+\ No newline at end of file
++</html>
+
+Modified: identity/CatDap/branches/live/root/template/pre
+===================================================================
+--- identity/CatDap/branches/live/root/template/pre	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/template/pre	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,3 +1,3 @@
+-[% MACRO l(text, args) BLOCK;
++[%- MACRO l(text, args) BLOCK;
+     c.localize(text, args);
+-END; %]
++END; -%]
+
+Modified: identity/CatDap/branches/live/root/template/wrapper
+===================================================================
+--- identity/CatDap/branches/live/root/template/wrapper	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/template/wrapper	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,7 +1,4 @@
+-[% MACRO l(text, args) BLOCK;
+-    c.localize(text, args);
+-END; %]
+-[% IF template.name.match('\.(css|js|txt)');
++[%- IF template.name.match('\.(css|js|txt)');
+      debug("Passing page through as text: $template.name");
+      content;
+    ELSE;
+
+Modified: identity/CatDap/branches/live/root/user/index.tt
+===================================================================
+--- identity/CatDap/branches/live/root/user/index.tt	2011-01-05 15:09:20 UTC (rev 211)
++++ identity/CatDap/branches/live/root/user/index.tt	2011-01-05 15:32:57 UTC (rev 212)
+@@ -1,30 +1,34 @@
++<div id="input_form">
+ <form method="post" action="">
+-    <table border=0>
+-        <tr><th>Attribute</th><th>Value</th></tr>
++    <table>
++        <tr><th>[% l('Attribute') %]</th><th>[% l('Value') %]</th><th></th></tr>
+         [% FOREACH attr IN values %]
+         <tr>
+             <td>[% attr.name %]</td>
+             <td>
+                 [% FOREACH val IN attr.values %]
+-                    [% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]">
+-                        <input name="[% attr.name %]_new" value="[% val %]">
++                    [% IF attr.editable %]<input type="hidden" name="[% attr.name %]_old" value="[% val %]" />
++                        <input name="[% attr.name %]_new" value="[% val %]" />
+                     [% ELSE %]
+                         [% val %]
+                         <br/>
+                     [% END %]
++			</td>
++			<td>
+                     [% IF attr.addable AND attr.editable %]
+-                        <a href="/user/add/[% attr.name %]">[% l('Add') %]</a>
++						<button type="button" onclick="location='/user/add/[% attr.name %]'">[% l('Add') %]</button>
+                     [% END %]
+                     [% IF attr.removable AND attr.editable %]
+-                        <a href="/user/delete/[% attr.name %]/[% val %]">[% l('Delete') %]</a>
++                        <button type="button" onclick="location='/user/delete/[% attr.name %]/[% val %]'">[% l('Delete') %]</button>
+                     [% END %]
+                 [% END %]
+             </td>
+         </tr>
+         [% END %]
++		<tr>
++			<td colspan="3" style="text-align:center;"><button type="Submit" value="[% l('Update') %]">[% l('Update') %]</button></td>
++		</tr>
+     </table>
+-
+-    <p><input type="Submit" value="[% l('Update') %]" /></p>
+ </form>
+ 
+ <hr />
+@@ -35,9 +39,11 @@
+         [% FOREACH attr IN may %]
+             <option value="[% attr %]">[% attr %]</option>
+         [% END %]
++	</select>
+ 
+         <input name="value" value="" />
+ 
+-        <input type="submit" value="[% l('Add') %]" />
++        <button type="submit" value="[% l('Add') %]">[% l('Add') %]</button>
+     </p>
+ </form>
++</div>
+-------------- next part --------------
+An HTML attachment was scrubbed...
+URL: </pipermail/mageia-sysadm/attachments/20110105/307f41b8/attachment-0001.html>
+
+ + + + + +
+

+ +
+More information about the Mageia-sysadm +mailing list
+ -- cgit v1.2.1