aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2017-09-14 17:44:39 +0300
committerYuri Chornoivan <yurchor@ukr.net>2017-09-14 17:44:39 +0300
commit651c05694d58b20083f1d9f6a1504de4dee2d8f6 (patch)
treea51015aec5cef187dfbd211db0953baac8dafd3e /lib
parentfa4385dbaa88a588e7b6599f9b321602bcf6b056 (diff)
downloadidentity-651c05694d58b20083f1d9f6a1504de4dee2d8f6.tar
identity-651c05694d58b20083f1d9f6a1504de4dee2d8f6.tar.gz
identity-651c05694d58b20083f1d9f6a1504de4dee2d8f6.tar.bz2
identity-651c05694d58b20083f1d9f6a1504de4dee2d8f6.tar.xz
identity-651c05694d58b20083f1d9f6a1504de4dee2d8f6.zip
Update translation catalog
Diffstat (limited to 'lib')
-rw-r--r--lib/CatDap/I18N/af.po237
-rw-r--r--lib/CatDap/I18N/bn.po165
-rw-r--r--lib/CatDap/I18N/ca.po172
-rw-r--r--lib/CatDap/I18N/cs.po210
-rw-r--r--lib/CatDap/I18N/cy.po165
-rw-r--r--lib/CatDap/I18N/da.po169
-rw-r--r--lib/CatDap/I18N/de.po173
-rw-r--r--lib/CatDap/I18N/el.po199
-rw-r--r--lib/CatDap/I18N/en.po251
-rw-r--r--lib/CatDap/I18N/en_gb.po251
-rw-r--r--lib/CatDap/I18N/en_us.po251
-rw-r--r--lib/CatDap/I18N/eo.po164
-rw-r--r--lib/CatDap/I18N/es.po173
-rw-r--r--lib/CatDap/I18N/et.po169
-rw-r--r--lib/CatDap/I18N/eu.po175
-rw-r--r--lib/CatDap/I18N/fr.po175
-rw-r--r--lib/CatDap/I18N/hr.po165
-rw-r--r--lib/CatDap/I18N/hu.po215
-rw-r--r--lib/CatDap/I18N/id.po221
-rw-r--r--lib/CatDap/I18N/it.po173
-rw-r--r--lib/CatDap/I18N/ja.po164
-rw-r--r--lib/CatDap/I18N/ko.po164
-rw-r--r--lib/CatDap/I18N/lt.po164
-rw-r--r--lib/CatDap/I18N/lv.po164
-rw-r--r--lib/CatDap/I18N/messages.pot152
-rw-r--r--lib/CatDap/I18N/nb.po170
-rw-r--r--lib/CatDap/I18N/nl.po176
-rw-r--r--lib/CatDap/I18N/pl.po169
-rw-r--r--lib/CatDap/I18N/pt.po259
-rw-r--r--lib/CatDap/I18N/pt_BR.po259
-rw-r--r--lib/CatDap/I18N/ro.po223
-rw-r--r--lib/CatDap/I18N/ru.po265
-rw-r--r--lib/CatDap/I18N/sk.po169
-rw-r--r--lib/CatDap/I18N/sl.po212
-rw-r--r--lib/CatDap/I18N/sq.po173
-rw-r--r--lib/CatDap/I18N/sr.po164
-rw-r--r--lib/CatDap/I18N/sv.po209
-rw-r--r--lib/CatDap/I18N/tg.po164
-rw-r--r--lib/CatDap/I18N/th.po194
-rw-r--r--lib/CatDap/I18N/tr.po192
-rw-r--r--lib/CatDap/I18N/uk.po173
-rw-r--r--lib/CatDap/I18N/zh_CN.po169
-rw-r--r--lib/CatDap/I18N/zh_TW.po169
43 files changed, 5513 insertions, 2677 deletions
diff --git a/lib/CatDap/I18N/af.po b/lib/CatDap/I18N/af.po
index 15dcbff..c00a44e 100644
--- a/lib/CatDap/I18N/af.po
+++ b/lib/CatDap/I18N/af.po
@@ -14,12 +14,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:133
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivering"
-#: 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:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Voeg by"
@@ -31,25 +32,34 @@ msgstr ""
msgid "Add attribute"
msgstr ""
+#. (uid)
+#: root/admin/account_group.tt:2
+msgid "Add user %1 to a new group"
+msgstr ""
+
#. (oc, dn)
#: root/admin/account_addoc.tt:1
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:49
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Die addresse verskil"
-#: lib/CatDap/Controller/register.pm:89
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "'n Rekening met hierde epos adres bestaan reeds"
-#: lib/CatDap/Controller/register.pm:94
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "'n Rekening met hierdie gebruikersnaam bestaan reeds"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:145
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -60,7 +70,7 @@ msgstr ""
"was. Foute: %1"
#. ($errors)
-#: lib/CatDap/Controller/admin.pm:548
+#: lib/CatDap/Controller/admin.pm:562
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"
@@ -80,11 +90,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:56
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -96,6 +106,10 @@ msgstr "Verander"
msgid "Change password"
msgstr "Verander wagwoord"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Kyk jou epos vir aktiverings instruksies."
@@ -104,7 +118,7 @@ msgstr "Kyk jou epos vir aktiverings instruksies."
msgid "Check your mail for password reset instructions."
msgstr "Kyk jou epos vir herwinnings instruksies."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Bevestig epos adres"
@@ -119,23 +133,33 @@ msgstr "Huidige wagwoord"
msgid "Dear %1,"
msgstr "Liewe %1,"
-#: root/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Vee uit"
+#. (uid)
+#: root/admin/account_group.tt:19
+msgid "Delete user %1 from an existing group:"
+msgstr ""
+
#: root/user/fake.tt:1
msgid "Edit"
msgstr "Wysig"
-#: root/admin/account.tt:33 root/admin/account.tt:8
-#: root/admin/account_promote.tt:6 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Epos"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Epos adres"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Gebruikersnaam nie toegelaat om gebruik te word nie"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Epos is gestuur"
@@ -144,7 +168,7 @@ msgstr "Epos is gestuur"
msgid "Enter new password."
msgstr "Sleutel nuwe wagwoord in."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Sleutel teks in"
@@ -153,11 +177,7 @@ msgstr "Sleutel teks in"
msgid "Error while searching for account: "
msgstr "Fout terwyl die rekening gesoek is: "
-#: root/admin/account.tt:34 root/admin/account_promote.tt:7
-msgid "First Name"
-msgstr "Voornaam"
-
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Voornaam"
@@ -169,20 +189,20 @@ msgstr "Jou wagwoord vergeet?"
msgid "Forgotten password"
msgstr "Vergete wagwoord"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Wagwoord vergeet?"
-#: root/admin/account.tt:36 root/admin/account.tt:9
-#: root/admin/account_promote.tt:9
+#: root/admin/account.tt:9
msgid "Full Name"
msgstr "Volle Naam"
-#: root/admin/group.tt:27
-msgid "Group Name"
-msgstr "Groep Naam"
+#: lib/CatDap/Controller/admin.pm:625
+#, fuzzy
+msgid "Group contains illegal characters"
+msgstr "Die verskafte van sluit ondeldige karakters in"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Groep naam"
@@ -190,37 +210,58 @@ msgstr "Groep naam"
msgid "Groups"
msgstr "Groepe"
-#: lib/CatDap/Controller/register.pm:52
+#: lib/CatDap/Controller/admin.pm:598
+msgid "Groups matching search criteria"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:591
+#, fuzzy
+msgid "Groups you manage"
+msgstr "Groep naam"
+
+#: lib/CatDap/Controller/register.pm:58
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
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Ongeldige epos adres"
-#: lib/CatDap/Controller/register.pm:42
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Ongeldige gebruikersnaam"
-#: lib/CatDap/Controller/register.pm:59
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Ongeldige gebruikersnaam, in gebruik deur stelsel"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/admin/account_promote.tt:3
+msgid "List of users promoted :"
+msgstr ""
+
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Teken uit"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Teken in"
+#: lib/CatDap/Controller/admin.pm:185
+msgid "More than one ID Pool"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
+msgid "More than one entry matched"
+msgstr ""
+
#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
#: root/user/password.tt:9
msgid "New Password"
msgstr "Nuwe Wagwoord"
-#: lib/CatDap/Controller/user.pm:295
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nuwe wagwoorde verskil"
@@ -228,19 +269,24 @@ msgstr "Nuwe wagwoorde verskil"
msgid "Operation was successful."
msgstr "Operasie was suksesvol."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Wagwoord : "
-#: lib/CatDap/Controller/user.pm:289
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Wagwoord inkorrek"
-#: lib/CatDap/Controller/admin.pm:551
+#: lib/CatDap/Controller/admin.pm:565
msgid "Password reset and email sent"
msgstr "Wagwoord is herstel en epos gestuur"
-#: root/register/index.tt:12
+#: lib/CatDap/Controller/admin.pm:535
+#, fuzzy
+msgid "Password reset failed: "
+msgstr "Wagwoord is herstel en epos gestuur"
+
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Persoonlike Inligting"
@@ -252,15 +298,10 @@ msgstr "Volg die skakel onder en verander jou wagwoord"
msgid "Please use the menus above."
msgstr ""
-#: root/admin/account_promote.tt:25
+#: root/admin/account_promote.tt:24
msgid "Primary group"
msgstr "Primêre groep"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Rekening met hoër vooregte mag nie wagwoorde op hierdie manier herwin nie"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Bevorder"
@@ -269,10 +310,15 @@ msgstr "Bevorder"
msgid "Promote user to posixAccount with primary group:"
msgstr "Bevorder gebruiker na posixAccount met primêre groep:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registreer"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrasie voltooi"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrasie voltooi"
@@ -286,40 +332,62 @@ msgstr "Registrasie was suksesvol."
msgid "Repeat New Password"
msgstr "Herhaal Nuwe Wagwoord"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Herstel wagwoord"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Soek"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Soek met"
-#: root/admin/account_promote.tt:4
-msgid "Select"
-msgstr "Selekteer"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Stel nuwe wagwoord"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Sukses"
-#: root/admin/account.tt:10 root/admin/account.tt:35
-#: root/admin/account_promote.tt:8 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Van"
-#: lib/CatDap/Controller/register.pm:70
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Die verskafte noemnaam sluit ongeldige karakters in"
-#: lib/CatDap/Controller/register.pm:75
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Die verskafte van sluit ondeldige karakters in"
@@ -335,13 +403,15 @@ msgstr "Om U rekening te aktiveer, volg asseblief die volgende skakel."
msgid "To reset your password, please follow the link below."
msgstr "Om U wagwoord te herstel, volg asseblief die volgende skakel."
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: lib/CatDap/Controller/admin.pm:528
+msgid "Transaction ID mismatch"
+msgstr ""
+
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Opdateer"
-#: root/admin/account.tt:32 root/admin/account.tt:7
-#: root/admin/account_promote.tt:5 root/register/index.tt:7
-#: root/register/index.tt:8
+#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr "Gebruikersnaam"
@@ -349,7 +419,7 @@ msgstr "Gebruikersnaam"
msgid "Username : "
msgstr "Gebruikersnaam : "
-#: lib/CatDap/Controller/register.pm:65
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Gebruikersnaam nie toegelaat om gebruik te word nie"
@@ -358,6 +428,24 @@ msgstr "Gebruikersnaam nie toegelaat om gebruik te word nie"
msgid "Value"
msgstr "Waarde"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -378,35 +466,35 @@ msgstr "Jou %1 rekening is suksesvol geskep, maar aktivering is benodig"
msgid "Your password was reset by %1"
msgstr "Jou wagwoord is herstel deur %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Jou sessie het verstrek"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "sluit in"
-#: root/admin/group_modify.tt:14
+#: root/admin/group_modify.tt:15
msgid "delete"
msgstr "vee uit"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "groter of gelyk aan"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "is presies"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "minder as"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "lid"
-#: lib/CatDap/Controller/admin.pm:535
+#: lib/CatDap/Controller/admin.pm:549
msgid "password reset"
msgstr "Wagwoord herstelling"
@@ -414,6 +502,19 @@ msgstr "Wagwoord herstelling"
msgid "with value"
msgstr "met waarde"
+#~ msgid "Group Name"
+#~ msgstr "Groep Naam"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Rekening met hoër vooregte mag nie wagwoorde op hierdie manier herwin nie"
+
+#~ msgid "First Name"
+#~ msgstr "Voornaam"
+
+#~ msgid "Select"
+#~ msgstr "Selekteer"
+
#~ msgid "Forgot password"
#~ msgstr "Wagwoord vergeet"
diff --git a/lib/CatDap/I18N/bn.po b/lib/CatDap/I18N/bn.po
index 62bb068..6fe1bf2 100644
--- a/lib/CatDap/I18N/bn.po
+++ b/lib/CatDap/I18N/bn.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "সক্রিয়করণ"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "যোগ"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "অ্যাটট্রিবিউট যোগ করুন"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -46,20 +46,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "ঠিকানাগুলো মিলছে না"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -83,11 +87,11 @@ msgstr ""
msgid "Attribute"
msgstr "অ্যাটট্রিবিউট"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "ক্যাপচা"
@@ -99,6 +103,10 @@ msgstr "বদলান"
msgid "Change password"
msgstr "পাসওয়ার্ড বদলান"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -107,7 +115,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -122,13 +130,13 @@ msgstr ""
msgid "Dear %1,"
msgstr "সুপ্রিয় %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "মুছে ফেলুন"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -136,14 +144,18 @@ msgstr ""
msgid "Edit"
msgstr "সম্পাদন করুন"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "ইমেইল"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "ইমেইল ঠিকানা"
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "ইমেইল পাঠান হয়ে গেছে।"
@@ -152,7 +164,7 @@ msgstr "ইমেইল পাঠান হয়ে গেছে।"
msgid "Enter new password."
msgstr "নতুন পাসওয়ার্ড দিন।"
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "লেখুন"
@@ -161,7 +173,7 @@ msgstr "লেখুন"
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "প্রথম নাম"
@@ -173,7 +185,7 @@ msgstr "পাসওয়ার্ড ভুলে গেছেন?"
msgid "Forgotten password"
msgstr "ভুলে যাওয়া পাসওয়ার্ড"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "ভুলে যাওয়া পাসওয়ার্ড?"
@@ -181,15 +193,11 @@ msgstr "ভুলে যাওয়া পাসওয়ার্ড?"
msgid "Full Name"
msgstr "সম্পূর্ণ নাম"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "গ্রুপের নাম"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "গ্রুপের নাম"
@@ -205,20 +213,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -226,11 +234,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "লগ আউট"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "লগইন"
@@ -238,7 +246,7 @@ msgstr "লগইন"
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -247,7 +255,7 @@ msgstr ""
msgid "New Password"
msgstr "নতুন পাসওয়ার্ড"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "নতুন পাসওয়ার্ডগুলো মিলছে না"
@@ -255,11 +263,11 @@ msgstr "নতুন পাসওয়ার্ডগুলো মিলছে ন
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "পাসওয়ার্ড:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "পাসওয়ার্ড সঠিক নয়"
@@ -271,7 +279,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "ব্যক্তিগত তথ্য"
@@ -287,10 +295,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -299,10 +303,15 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "রেজিস্টার"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "রেজিস্ট্রেশন সম্পন্ন হয়েছে"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "রেজিস্ট্রেশন সম্পন্ন হয়েছে"
@@ -316,35 +325,62 @@ msgstr "রেজিস্ট্রেশন সফল হয়েছে"
msgid "Repeat New Password"
msgstr "নতুন পাসওয়ার্ড আবার লেখুন"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "খোঁজ"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "নতুন পাসওয়ার্ড ঠিক করুন"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "সফলতা"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "পরিবারের নাম"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -364,7 +400,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "আপডেট"
@@ -376,7 +412,7 @@ msgstr "ইউজারনেম"
msgid "Username : "
msgstr "ইউজারনেম :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -385,6 +421,24 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -402,11 +456,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -414,19 +468,19 @@ msgstr ""
msgid "delete"
msgstr "মুছে ফেলুন"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "ঠিক ঠিক"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -437,3 +491,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "গ্রুপের নাম"
diff --git a/lib/CatDap/I18N/ca.po b/lib/CatDap/I18N/ca.po
index bdecb90..93efb9a 100644
--- a/lib/CatDap/I18N/ca.po
+++ b/lib/CatDap/I18N/ca.po
@@ -20,13 +20,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Activació"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Afegeix"
@@ -39,7 +39,7 @@ msgid "Add attribute"
msgstr "Afegeix atribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Afegeix l'usuari %1 a un nou grup"
@@ -48,20 +48,24 @@ msgstr "Afegeix l'usuari %1 a un nou grup"
msgid "Adding objectclass %1 to dn %2"
msgstr "S'està afegint objectclass %1 a dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Les adreces no coincideixen"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Ja existeix un compte amb aquesta adreça electrònica"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Ja existeix un compte amb aquest nom d'usuari"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -93,11 +97,11 @@ msgstr ""
msgid "Attribute"
msgstr "Atribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "No es pot comprovar /etc/passwd, aviseu els administradors del sistema"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -109,6 +113,10 @@ msgstr "Canvia"
msgid "Change password"
msgstr "Canvia la contrasenya"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Comproveu el vostre correu per a les instruccions d'activació."
@@ -119,7 +127,7 @@ msgstr ""
"Comproveu el vostre correu per a les instruccions de restabliment de la "
"contrasenya."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Confirmeu l'adreça de correu electrònic"
@@ -134,13 +142,13 @@ msgstr "Contrasenya actual"
msgid "Dear %1,"
msgstr "Benvolgut %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Esborra"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Esborra l'usuari %1 d'un grup existent:"
@@ -148,14 +156,19 @@ msgstr "Esborra l'usuari %1 d'un grup existent:"
msgid "Edit"
msgstr "Edita"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Correu electrònic"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Adreça de correu electrònic"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "No es pot fer servir Username"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Missatge de correu electrònic enviat."
@@ -164,7 +177,7 @@ msgstr "Missatge de correu electrònic enviat."
msgid "Enter new password."
msgstr "Entreu una contrasenya nova."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Introduïu el text"
@@ -173,7 +186,7 @@ msgstr "Introduïu el text"
msgid "Error while searching for account: "
msgstr "Error durant la cerca del compte:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Nom"
@@ -185,7 +198,7 @@ msgstr "Heu oblidat la contrasenya?"
msgid "Forgotten password"
msgstr "Contrasenya oblidada"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Contrasenya oblidada?"
@@ -193,15 +206,11 @@ msgstr "Contrasenya oblidada?"
msgid "Full Name"
msgstr "Nom complet"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nom de grup"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "El grup conté caràcters il·legals"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nom de grup"
@@ -217,20 +226,20 @@ msgstr "Grups que responen als criteris de cerca"
msgid "Groups you manage"
msgstr "Grups que gestioneu"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Text de validació incorrecte, torneu a provar"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Adreça de correu electrònic no vàlida"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Nom d'usuari no vàlid"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nom d'usuari no vàlid, el sistema ja l'utilitza"
@@ -238,11 +247,11 @@ msgstr "Nom d'usuari no vàlid, el sistema ja l'utilitza"
msgid "List of users promoted :"
msgstr "Llista d'usuaris promocionats:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Desconnexió"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Connexió"
@@ -250,7 +259,7 @@ msgstr "Connexió"
msgid "More than one ID Pool"
msgstr "Més d'una ID Pool"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Més d'una entrada coincident"
@@ -259,7 +268,7 @@ msgstr "Més d'una entrada coincident"
msgid "New Password"
msgstr "Contrasenya nova"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Les noves contrasenyes no coincideixen"
@@ -267,11 +276,11 @@ msgstr "Les noves contrasenyes no coincideixen"
msgid "Operation was successful."
msgstr "L'operació ha estat un èxit."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Contrasenya: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Contrasenya incorrecta"
@@ -284,7 +293,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr "La restauració de contrasenya ha fallat:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informació personal"
@@ -300,11 +309,6 @@ msgstr "Utilitzeu els menús de dalt."
msgid "Primary group"
msgstr "Grup primari"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Els comptes privilegiats no poden recuperar la contrasenya d'aquesta manera"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promou"
@@ -313,10 +317,15 @@ msgstr "Promou"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promou l'usuari a un compte posixAccount amb grup primari:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registra"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "S'ha completat el registre"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "S'ha completat el registre"
@@ -330,35 +339,62 @@ msgstr "El registre s'ha fet correctament."
msgid "Repeat New Password"
msgstr "Repetiu la nova contrasenya"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Reinicia la contrasenya"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Cerca"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Cerca segons"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Estableix la nova contrasenya"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Èxit"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Cognom"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "El nom introduït conté caràcters no permesos"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "El cognom introduït conté caràcters no permesos"
@@ -378,7 +414,7 @@ msgstr "Per reiniciar la contrasenya heu de seguir l'enllaç següent."
msgid "Transaction ID mismatch"
msgstr "ID de transacció no coincident"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Actualitza"
@@ -390,7 +426,7 @@ msgstr "Nom d'usuari"
msgid "Username : "
msgstr "Nom d'usuari: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "No es pot fer servir Username"
@@ -399,6 +435,24 @@ msgstr "No es pot fer servir Username"
msgid "Value"
msgstr "Valor"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -418,11 +472,11 @@ msgstr "El compte %1 s'ha creat correctament, però s'ha d'activar."
msgid "Your password was reset by %1"
msgstr "La vostra contrasenya ha estat reiniciada per %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "La vostra sessió ha caducat"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "conté"
@@ -430,19 +484,19 @@ msgstr "conté"
msgid "delete"
msgstr "esborra"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "més gran o igual que"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "és exactament"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "menys que"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "membre"
@@ -453,3 +507,11 @@ msgstr "contrasenya reiniciada"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "amb el valor"
+
+#~ msgid "Group Name"
+#~ msgstr "Nom de grup"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Els comptes privilegiats no poden recuperar la contrasenya d'aquesta "
+#~ "manera"
diff --git a/lib/CatDap/I18N/cs.po b/lib/CatDap/I18N/cs.po
index ffeb4fb..ed965e7 100644
--- a/lib/CatDap/I18N/cs.po
+++ b/lib/CatDap/I18N/cs.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# fri, 2013,2015
msgid ""
@@ -10,20 +10,21 @@ msgstr ""
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2015-02-01 22:01+0000\n"
"Last-Translator: fri\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
+"cs/)\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivace"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Přidat"
@@ -36,7 +37,7 @@ msgid "Add attribute"
msgstr "Přidat vlastnost"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Přidat uživatele %1 do nové skupiny"
@@ -45,48 +46,59 @@ msgstr "Přidat uživatele %1 do nové skupiny"
msgid "Adding objectclass %1 to dn %2"
msgstr "Přidat vlastnost %1 k dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresy se neshodují"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Účet s touto e-mailovou adresou již byl založen"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Účet s tímto přihlašovacím jménem již byl založen"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
+"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 "Váš účet byl založen, ale při odesílání e-mailu došlo k chybě. Pakliže vámi zadaný e-mail byl správný, pokračujte, prosím, stejně, jako byste zapomněli heslo. Chyba %1"
+msgstr ""
+"Váš účet byl založen, ale při odesílání e-mailu došlo k chybě. Pakliže vámi "
+"zadaný e-mail byl správný, pokračujte, prosím, stejně, jako byste zapomněli "
+"heslo. Chyba %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
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 "Váš účet byl založen, ale při odesílání e-mailu došlo k chybě. Pokračujte, prosím, stejně, jako byste zapomněli heslo, jestliže jste zadali v žádosti správný e-mail: %1"
+"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 ""
+"Váš účet byl založen, ale při odesílání e-mailu došlo k chybě. Pokračujte, "
+"prosím, stejně, jako byste zapomněli heslo, jestliže jste zadali v žádosti "
+"správný e-mail: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
-msgstr "Při odesílání e-mailu došlo k chybě. Zkuste to, prosím, později. Chyba %1"
+msgstr ""
+"Při odesílání e-mailu došlo k chybě. Zkuste to, prosím, později. Chyba %1"
#: 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 "Vlastnost"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "Nelze zkontrolovat /etc/passwd. Prosím, upozorněte správce systému"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -98,6 +110,10 @@ msgstr "Změnit"
msgid "Change password"
msgstr "Změnit heslo"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Instrukce pro aktivaci účtu naleznete ve svém e-mailu."
@@ -106,7 +122,7 @@ msgstr "Instrukce pro aktivaci účtu naleznete ve svém e-mailu."
msgid "Check your mail for password reset instructions."
msgstr "Instrukce pro obnovení hesla k Vašemu účtu naleznete ve svém e-mailu-"
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Potvrďte svou e-mailovou adresu"
@@ -121,13 +137,13 @@ msgstr "Současné heslo"
msgid "Dear %1,"
msgstr "Vážený(á) %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Smazat"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Smazat uživatele %1 ze stávající skupiny:"
@@ -135,14 +151,19 @@ msgstr "Smazat uživatele %1 ze stávající skupiny:"
msgid "Edit"
msgstr "Upravit"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-mail"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-mailová adresa"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Toto přihlašovací jméno nelze použít"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-mail odeslán."
@@ -151,7 +172,7 @@ msgstr "E-mail odeslán."
msgid "Enter new password."
msgstr "Zadejte nové heslo."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Vložte text"
@@ -160,7 +181,7 @@ msgstr "Vložte text"
msgid "Error while searching for account: "
msgstr "Chyba při vyhledávání účtu: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Jméno"
@@ -172,7 +193,7 @@ msgstr "Zapomněli jste heslo?"
msgid "Forgotten password"
msgstr "Zapomenuté heslo"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Zapomenuté heslo?"
@@ -180,15 +201,11 @@ msgstr "Zapomenuté heslo?"
msgid "Full Name"
msgstr "Celé jméno"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Jméno skupiny"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Skupina obsahuje nedovolené znaky"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Jméno skupiny"
@@ -204,20 +221,20 @@ msgstr "Skupina odpovídá hlediskům hledání"
msgid "Groups you manage"
msgstr "Vámi spravované skupiny"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Špatně zadaný ověřovací text. Prosím, zkuste to znovu"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Špatná e-mailová adresa"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Špatné přihlašovací jméno"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Toto přihlašovací nelze použít, je užíváno systémem"
@@ -225,11 +242,11 @@ msgstr "Toto přihlašovací nelze použít, je užíváno systémem"
msgid "List of users promoted :"
msgstr "Seznam povýšených uživatelů:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Odhlásit"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Přihlásit"
@@ -237,7 +254,7 @@ msgstr "Přihlásit"
msgid "More than one ID Pool"
msgstr "Více než jedna skupina ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Nalezen více než jeden záznam"
@@ -246,7 +263,7 @@ msgstr "Nalezen více než jeden záznam"
msgid "New Password"
msgstr "Nové heslo"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nová hesla se neshodují"
@@ -254,11 +271,11 @@ msgstr "Nová hesla se neshodují"
msgid "Operation was successful."
msgstr "Operace proběhla úspěšně."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Heslo: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Nesprávné heslo"
@@ -270,7 +287,7 @@ msgstr "Heslo bylo obnoveno a e-mail odeslán"
msgid "Password reset failed: "
msgstr "Obnovení hesla se nezdařilo:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Osobní údaje"
@@ -286,10 +303,6 @@ msgstr "Prosím, využijte nabídku nahoře."
msgid "Primary group"
msgstr "Hlavní skupina"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Hesla k účtům se zvláštními oprávněními nemohou být obnovena tímto způsobem"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Povýšit"
@@ -298,10 +311,15 @@ msgstr "Povýšit"
msgid "Promote user to posixAccount with primary group:"
msgstr "Povýšit uživatele na posixAccount s primární skupinou:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registrace"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrace dokončena."
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrace dokončena."
@@ -315,35 +333,62 @@ msgstr "Registrace byla úspěšná."
msgid "Repeat New Password"
msgstr "Zadejte znovu své nové heslo"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Obnovit heslo"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Hledat"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Hledat podle "
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Nastavit nové heslo"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Úspěch"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Příjmení"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Vámi zadané (křestní) jméno obsahuje nedovolené znaky"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Vámi zadané příjmení obsahuje nedovolené znaky"
@@ -363,7 +408,7 @@ msgstr "Pro obnovu Vašeho hesla klikněte na odkaz níže."
msgid "Transaction ID mismatch"
msgstr "Nesoulad ID transakce"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Aktualizovat"
@@ -375,7 +420,7 @@ msgstr "Přihlašovací jméno"
msgid "Username : "
msgstr "Přihlašovací jméno: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Toto přihlašovací jméno nelze použít"
@@ -384,17 +429,36 @@ msgstr "Toto přihlašovací jméno nelze použít"
msgid "Value"
msgstr "Hodnota"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "U vašeho účtu %1 byla zaznamenána žádost o obnovení hesla. Pokud nechcete heslo měnit, ani jste tuto žádost nepodával, není třeba nic dalšího dělat."
+"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 ""
+"U vašeho účtu %1 byla zaznamenána žádost o obnovení hesla. Pokud nechcete "
+"heslo měnit, ani jste tuto žádost nepodával, není třeba nic dalšího dělat."
#. (c.config.organisation)
#: root/email/activation.tt:2
-msgid ""
-"Your %1 account has been successfully created, but requires activation."
+msgid "Your %1 account has been successfully created, but requires activation."
msgstr "Váš účet %1 byl úspěšně vytvořen, ale musí být zprovozněn."
#. (c.user.username)
@@ -402,11 +466,11 @@ msgstr "Váš účet %1 byl úspěšně vytvořen, ale musí být zprovozněn."
msgid "Your password was reset by %1"
msgstr "Vaše heslo bylo obnoveno přes %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Vaše relace byla ukončena pro nečinnost"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "obsahuje"
@@ -414,19 +478,19 @@ msgstr "obsahuje"
msgid "delete"
msgstr "smazat"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "větší nebo rovno "
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "je právě"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "menší než"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "člen"
@@ -437,3 +501,11 @@ msgstr "obnova hesla"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "s hodnotou"
+
+#~ msgid "Group Name"
+#~ msgstr "Jméno skupiny"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Hesla k účtům se zvláštními oprávněními nemohou být obnovena tímto "
+#~ "způsobem"
diff --git a/lib/CatDap/I18N/cy.po b/lib/CatDap/I18N/cy.po
index bbf77a5..f9a89dd 100644
--- a/lib/CatDap/I18N/cy.po
+++ b/lib/CatDap/I18N/cy.po
@@ -20,13 +20,13 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
"11) ? 2 : 3;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Ychwanegu"
@@ -39,7 +39,7 @@ msgid "Add attribute"
msgstr "Ychwanegu priodoledd"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Ychwanegu'r defnyddiwr %1 at grŵp newydd"
@@ -48,20 +48,24 @@ msgstr "Ychwanegu'r defnyddiwr %1 at grŵp newydd"
msgid "Adding objectclass %1 to dn %2"
msgstr "Ychwanegu objectclass %1 i dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Nid yw'r cyfeiriadau'n cyd-fynd"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Mae cyfrif â'r cyfeiriad e-bost hwn eisoes yn bodoli"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Mae cyfrif â'r enw defnyddiwr hwn eisoes yn bodoli"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -90,11 +94,11 @@ msgstr ""
msgid "Attribute"
msgstr "Priodoledd"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "Methu gwirio /etc/passwd, rhowch wybod i weinyddwyr y system"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -106,6 +110,10 @@ msgstr "Newid"
msgid "Change password"
msgstr "Newid y cyfrinair"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Gwiriwch eich e-bost am gyfarwyddiadau bywiogi."
@@ -114,7 +122,7 @@ msgstr "Gwiriwch eich e-bost am gyfarwyddiadau bywiogi."
msgid "Check your mail for password reset instructions."
msgstr "Gwiriwch eich e-bost am gyfarwyddiadau i ailosod eich cyfrinair."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Cadarnhau'r cyfeiriad e-bost"
@@ -129,13 +137,13 @@ msgstr "Cyfrinair cyfredol"
msgid "Dear %1,"
msgstr "Annwyl %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Dileu"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Dileu defnyddiwr %1 o grŵp sy'n bodoli eisoes:"
@@ -143,14 +151,18 @@ msgstr "Dileu defnyddiwr %1 o grŵp sy'n bodoli eisoes:"
msgid "Edit"
msgstr "Golygu"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-bost"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Cyfeiriad e-bost"
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Anfonwyd yr e-bost."
@@ -159,7 +171,7 @@ msgstr "Anfonwyd yr e-bost."
msgid "Enter new password."
msgstr "Rhowch gyfrinair newydd."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Rhowch destun"
@@ -168,7 +180,7 @@ msgstr "Rhowch destun"
msgid "Error while searching for account: "
msgstr "Gwall tra'n chwilio am gyfrif:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Enw cyntaf"
@@ -180,7 +192,7 @@ msgstr "Wedi anghofio eich cyfrinair?"
msgid "Forgotten password"
msgstr "Wedi anghofio'r cyfrinair"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Wedi anghofio'r cyfrinair?"
@@ -188,15 +200,11 @@ msgstr "Wedi anghofio'r cyfrinair?"
msgid "Full Name"
msgstr "Enw llawn"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Enw'r grŵp"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Mae'r grŵp yn cynnwys nodau annilys"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Enw'r grwp:"
@@ -212,20 +220,20 @@ msgstr "Grwpiau sy'n cyd-fynd â'r termau chwilio"
msgid "Groups you manage"
msgstr "Grwpiau rydych chi'n eu rheol"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Testun dilysu anghywir, ceisiwch eto"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Cyfeiriad e-bost annily"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Enw defnyddiwr annilys"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Enw defnyddiwr annilys, defnyddir gan y system"
@@ -233,11 +241,11 @@ msgstr "Enw defnyddiwr annilys, defnyddir gan y system"
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Allgofnodi"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Mewngofnodi"
@@ -245,7 +253,7 @@ msgstr "Mewngofnodi"
msgid "More than one ID Pool"
msgstr "Mwy nag un pwll ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -254,7 +262,7 @@ msgstr ""
msgid "New Password"
msgstr "Cyfrinair newydd"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nid yw'r cyfrineiriau newydd yn cyd-fynd"
@@ -262,11 +270,11 @@ msgstr "Nid yw'r cyfrineiriau newydd yn cyd-fynd"
msgid "Operation was successful."
msgstr "Gweithred lwyddiannus."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Cyfrinair :"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Cyfrinair anghywir"
@@ -278,7 +286,7 @@ msgstr "Ailosodwyd y cyfrinair ac anfonwyd yr e-bost"
msgid "Password reset failed: "
msgstr "Methu ailosod y cyfrinair:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Gwybodaeth bersono"
@@ -294,10 +302,6 @@ msgstr "Defnyddiwch y dewislenni uchod."
msgid "Primary group"
msgstr "Grŵp cynradd"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Hyrwyddo"
@@ -306,10 +310,15 @@ msgstr "Hyrwyddo"
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Cofrestru"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Cwblhawyd y cofrestru"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Cwblhawyd y cofrestru"
@@ -323,35 +332,62 @@ msgstr "Cofrestru llwyddiannus."
msgid "Repeat New Password"
msgstr "Ailadrodd y cyfrinair newydd"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Ailosod y cyfrinair"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Chwilio"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Chwilio yn ôl"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Gosod cyfrinair newydd"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Llwyddiant"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Cyfenw"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Mae'r enw cyntaf yn cynnwys nodau annily"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Mae'r cyfenw'n cynnwys nodau annilys"
@@ -371,7 +407,7 @@ msgstr "I ailosod eich cyfrinair, dilynwch y ddolen isod."
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Diweddaru"
@@ -383,7 +419,7 @@ msgstr "Enw defnyddiwr"
msgid "Username : "
msgstr "Enw defnyddiwr :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -392,6 +428,24 @@ msgstr ""
msgid "Value"
msgstr "Gwerth"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -409,11 +463,11 @@ msgstr "Crëwyd eich cyfrif %1 yn llwyddiannus, ond mae angen ei fywiogi."
msgid "Your password was reset by %1"
msgstr "Ailosodwyd eich cyfrinair gan %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Mae eich sesiwn wedi dod i ben"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "yn cynnwys"
@@ -421,19 +475,19 @@ msgstr "yn cynnwys"
msgid "delete"
msgstr "dileu"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "mwy na neu'n hafal i"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "yn union"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "llai na"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "aelod"
@@ -444,3 +498,6 @@ msgstr "ailosod cyfrinair"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "o fewn"
+
+#~ msgid "Group Name"
+#~ msgstr "Enw'r grŵp"
diff --git a/lib/CatDap/I18N/da.po b/lib/CatDap/I18N/da.po
index 4057e4f..b03bfe2 100644
--- a/lib/CatDap/I18N/da.po
+++ b/lib/CatDap/I18N/da.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivering"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Tilføj"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "Tilføj attribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Tilføj bruger %1 til en ny gruppe"
@@ -46,20 +46,24 @@ msgstr "Tilføj bruger %1 til en ny gruppe"
msgid "Adding objectclass %1 to dn %2"
msgstr "Tilføjer objectclass %1 til dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresser er ikke ens"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Der findes allerede en konto med denne e-mailadresse"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Der findes allerede en konto med dette brugernavn"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -89,11 +93,11 @@ msgstr ""
msgid "Attribute"
msgstr "Attribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "Kan ikke tjekke /etc/passwd, advar venligst systemadministratorer"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -105,6 +109,10 @@ msgstr "Skift"
msgid "Change password"
msgstr "Skift adgangskode"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Tjek din e-mail for instruktioner til aktivering."
@@ -113,7 +121,7 @@ msgstr "Tjek din e-mail for instruktioner til aktivering."
msgid "Check your mail for password reset instructions."
msgstr "Tjek din e-mail for instruktioner til nulstilling af adgangskode."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Bekræft e-mailadresse"
@@ -128,13 +136,13 @@ msgstr "Aktuelle adgangskode"
msgid "Dear %1,"
msgstr "Kære %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Slet"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Slet bruger %1 fra en eksisterende gruppe:"
@@ -142,14 +150,19 @@ msgstr "Slet bruger %1 fra en eksisterende gruppe:"
msgid "Edit"
msgstr "Redigér"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-mail"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-mailadresse"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Brugernavn er ikke autoiseret til at blive brugt"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-mail afsendt."
@@ -158,7 +171,7 @@ msgstr "E-mail afsendt."
msgid "Enter new password."
msgstr "Indtast ny adangskode."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Indtast tekst"
@@ -167,7 +180,7 @@ msgstr "Indtast tekst"
msgid "Error while searching for account: "
msgstr "Fejl under søgning efter konto: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Fornavn"
@@ -179,7 +192,7 @@ msgstr "Glemt din adgangskode?"
msgid "Forgotten password"
msgstr "Glemt adgangskode"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Glemt adgangskode?"
@@ -187,15 +200,11 @@ msgstr "Glemt adgangskode?"
msgid "Full Name"
msgstr "Fulde navn"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Gruppenavn"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Gruppe indeholder ulovlige tegn"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Gruppenavn"
@@ -211,20 +220,20 @@ msgstr "Grupper som passer søgekriterie"
msgid "Groups you manage"
msgstr "Grupper som du håndterer"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Ukorrekt valideringetekst, prøv venligst igen"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Ugyldig e-mailadresse"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Ugyldigt brugernavn"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Ugyldigt brugernavn, allerede i brug i systemet"
@@ -232,11 +241,11 @@ msgstr "Ugyldigt brugernavn, allerede i brug i systemet"
msgid "List of users promoted :"
msgstr "Liste med brugere som er forfremmet:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Log ud"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Log ind"
@@ -244,7 +253,7 @@ msgstr "Log ind"
msgid "More than one ID Pool"
msgstr "Mere end én ID-pool"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Mere end én post passer"
@@ -253,7 +262,7 @@ msgstr "Mere end én post passer"
msgid "New Password"
msgstr "Ny adangskode"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nye adgangskoder er ikke ens"
@@ -261,11 +270,11 @@ msgstr "Nye adgangskoder er ikke ens"
msgid "Operation was successful."
msgstr "Handling lykkedes."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Adangskode : "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Adgangskoden er forkert"
@@ -277,7 +286,7 @@ msgstr "Adgangskode nulstillet og e-mail afsendt"
msgid "Password reset failed: "
msgstr "Nulstilling af adgangskode mislykkedes: "
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Personlig information"
@@ -293,10 +302,6 @@ msgstr "Brug venligst menuerne ovenfor."
msgid "Primary group"
msgstr "Primær gruppe"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Forfremmede konti må ikke gendanne adgangskode via denne mekanisme"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promovér"
@@ -305,10 +310,15 @@ msgstr "Promovér"
msgid "Promote user to posixAccount with primary group:"
msgstr "Forfrem bruger til posixAccount med primær gruppe:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Tilmeld"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Tilmelding færdig"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Tilmelding færdig"
@@ -322,35 +332,62 @@ msgstr "Tilmeldingen lykkedes."
msgid "Repeat New Password"
msgstr "Gentag ny adgangskode"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Nulstil adgangskode"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Søg"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Søg efter"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Sæt ny adgangskode"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Lykkedes"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Efternavn"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Fornavnet indeholder ulovlige tegn"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Efternavnet indeholder ulovlige tegn"
@@ -370,7 +407,7 @@ msgstr "Følg venligst følgende link, for at nulstill din adgangskode."
msgid "Transaction ID mismatch"
msgstr "Uoverensstemmende transaktions ID"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Opdatér"
@@ -382,7 +419,7 @@ msgstr "Brugernavn"
msgid "Username : "
msgstr "Brugernavn : "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Brugernavn er ikke autoiseret til at blive brugt"
@@ -391,6 +428,24 @@ msgstr "Brugernavn er ikke autoiseret til at blive brugt"
msgid "Value"
msgstr "Værdi"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -411,11 +466,11 @@ msgstr "Din %1-konto er blevet oprettet, men kræver aktivering."
msgid "Your password was reset by %1"
msgstr "Din adgangskode blev nulstillet af %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Din session er udløbet"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "indeholder"
@@ -423,19 +478,19 @@ msgstr "indeholder"
msgid "delete"
msgstr "slet"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "større end eller lig med"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "er præcist"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "mindre end"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "medlem"
@@ -446,3 +501,9 @@ msgstr "nulstilling af adgangskode"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "med værdi"
+
+#~ msgid "Group Name"
+#~ msgstr "Gruppenavn"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "Forfremmede konti må ikke gendanne adgangskode via denne mekanisme"
diff --git a/lib/CatDap/I18N/de.po b/lib/CatDap/I18N/de.po
index 63529df..8235db7 100644
--- a/lib/CatDap/I18N/de.po
+++ b/lib/CatDap/I18N/de.po
@@ -20,13 +20,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivierung"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Hinzufügen"
@@ -39,7 +39,7 @@ msgid "Add attribute"
msgstr "Attribut hinzufügen"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Benutzer %1 zu einer neuen Gruppe hinzufügen"
@@ -48,20 +48,24 @@ msgstr "Benutzer %1 zu einer neuen Gruppe hinzufügen"
msgid "Adding objectclass %1 to dn %2"
msgstr "Objektklasse %1 zu dn %2 hinzufügen"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Die Adressen stimmen nicht überein"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Ein Zugang mit dieser E-Mail-Adresse existiert bereits"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Ein Zugang mit diesem Benutzernamen existiert bereits"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -94,13 +98,13 @@ msgstr ""
msgid "Attribute"
msgstr "Attribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Die Datei /etc/passwd kann nicht überprüft werden, bitte warnen Sie die "
"System-Administratoren"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -112,6 +116,10 @@ msgstr "Ändern"
msgid "Change password"
msgstr "Das Passwort ändern"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Überprüfen Sie Ihre E-Mails auf Aktivierungsanweisungen."
@@ -122,7 +130,7 @@ msgstr ""
"Überprüfen Sie Ihre E-Mails auf Anweisungen zum Zurücksetzen Ihres "
"Passwortes."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Bestätigen Sie die E-Mailadresse"
@@ -137,13 +145,13 @@ msgstr "Aktuelles Passwort"
msgid "Dear %1,"
msgstr "Sehr geehrte(r) %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Löschen"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Benutzer %1 aus einer bestehenden Gruppe löschen"
@@ -151,14 +159,19 @@ msgstr "Benutzer %1 aus einer bestehenden Gruppe löschen"
msgid "Edit"
msgstr "Ändern"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-Mail"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-Mail-Adresse"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Der Benutzername darf nicht verwendet werden"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-Mail versandt."
@@ -167,7 +180,7 @@ msgstr "E-Mail versandt."
msgid "Enter new password."
msgstr "Neues Passwort eingeben."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Text eingeben"
@@ -176,7 +189,7 @@ msgstr "Text eingeben"
msgid "Error while searching for account: "
msgstr "Fehler bei der Suche nach dem Benutzerkonto: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Vorname"
@@ -188,7 +201,7 @@ msgstr "Haben Sie Ihr Passwort vergessen?"
msgid "Forgotten password"
msgstr "Vergessenes Passwort"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Vergessenes Passwort?"
@@ -196,15 +209,11 @@ msgstr "Vergessenes Passwort?"
msgid "Full Name"
msgstr "Vollständiger Name"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Gruppenname"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Die Gruppe enthält unerlaubte Zeichen"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Gruppenname"
@@ -220,20 +229,20 @@ msgstr "Gruppen, die den Suchkriterien entspechen"
msgid "Groups you manage"
msgstr "von ihnen verwaltete Gruppe"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Inkorrekter Überprüfungstext, bitte versuchen Sie es erneut"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Ungültige E-Mail-Adresse"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Ungültiger Benutzername"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Ungültiger Benutzername, wird vom System bereits genutzt"
@@ -241,11 +250,11 @@ msgstr "Ungültiger Benutzername, wird vom System bereits genutzt"
msgid "List of users promoted :"
msgstr "Liste aller User"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Abmelden"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Anmelden"
@@ -253,7 +262,7 @@ msgstr "Anmelden"
msgid "More than one ID Pool"
msgstr "Mehr als ein ID Pool"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Mehr als ein Eintrag passt"
@@ -262,7 +271,7 @@ msgstr "Mehr als ein Eintrag passt"
msgid "New Password"
msgstr "Neues Passwort"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Die neuen Passwörter stimmen nicht überein"
@@ -270,11 +279,11 @@ msgstr "Die neuen Passwörter stimmen nicht überein"
msgid "Operation was successful."
msgstr "Die Operation war erfolgreich."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Passwort:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Falsches Passwort"
@@ -286,7 +295,7 @@ msgstr "Passwort zurückgesetzt und E-Mail versandt"
msgid "Password reset failed: "
msgstr "Passwort zurücksetzen schlug fehl"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Persönliche Informationen"
@@ -302,12 +311,6 @@ msgstr "Bitte benutzen Sie die Menüs oben."
msgid "Primary group"
msgstr "Primäre Gruppe"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Privilegierte Konten können das Passwort nicht mit diesem Verfahren wieder "
-"herstellen"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Hochstufen"
@@ -316,10 +319,15 @@ msgstr "Hochstufen"
msgid "Promote user to posixAccount with primary group:"
msgstr "Benutzer hochstufen zu einem posixAccount in der primären Gruppe"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registrieren"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrierung vollständig"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrierung vollständig"
@@ -333,35 +341,62 @@ msgstr "Die Registrierung war erfolgreich."
msgid "Repeat New Password"
msgstr "Neues Passwort wiederholen"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Passwort wiederherstellen"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Suchen"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Suchen nach"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Neues Passwort setzen"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Erfolg"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Nachname"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Der angegebene Vorname enthält ungültige Zeichen"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Der angegebene Nachname enthält ungültige Zeichen"
@@ -381,7 +416,7 @@ msgstr "Um Ihr Passwort zurückzusetzen, folgen Sie bitte den Links unten."
msgid "Transaction ID mismatch"
msgstr "Transaktion ID ungleich"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Aktualisieren"
@@ -393,7 +428,7 @@ msgstr "Benutzername"
msgid "Username : "
msgstr "Benutzername:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Der Benutzername darf nicht verwendet werden"
@@ -402,6 +437,24 @@ msgstr "Der Benutzername darf nicht verwendet werden"
msgid "Value"
msgstr "Wert"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -423,11 +476,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr "Ihr Passwort wurde von %1 zurückgesetzt"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Ihre Sitzung ist abgelaufen"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "enthält"
@@ -435,19 +488,19 @@ msgstr "enthält"
msgid "delete"
msgstr "löschen"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "Größer als oder gleich wie"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "ist genau"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "weniger als"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "Mitglied"
@@ -458,3 +511,11 @@ msgstr "Passwort zurückgesetzt"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "mit dem Wert"
+
+#~ msgid "Group Name"
+#~ msgstr "Gruppenname"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Privilegierte Konten können das Passwort nicht mit diesem Verfahren "
+#~ "wieder herstellen"
diff --git a/lib/CatDap/I18N/el.po b/lib/CatDap/I18N/el.po
index b289ce5..3eed752 100644
--- a/lib/CatDap/I18N/el.po
+++ b/lib/CatDap/I18N/el.po
@@ -9,18 +9,20 @@ msgstr ""
"PO-Revision-Date: 2012-02-18 21:59+0100\n"
"Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
"Language-Team: Greek <i18n-el@ml.mageia.org>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Ενεργοποίηση"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11 root/admin/account_modify.tt:24 root/admin/group_modify.tt:21 root/user/index.tt:19 root/user/index.tt:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Προσθήκη"
@@ -33,7 +35,7 @@ msgid "Add attribute"
msgstr "Προσθήκη ιδιότητας"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Προσθήκη του χρήστη %1 σε μια νέα ομάδα"
@@ -42,20 +44,24 @@ msgstr "Προσθήκη του χρήστη %1 σε μια νέα ομάδα"
msgid "Adding objectclass %1 to dn %2"
msgstr "Προσθήκη του objectclass %1 στο dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Οι διευθύνσεις δεν ταιριάζουν"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Υπάρχει ήδη ένας λογαριασμός με αυτή τη διεύθυνση ηλ. αλληλογραφίας"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Υπάρχει ήδη ένας λογαριασμός με αυτό το όνομα χρήστη"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -63,8 +69,8 @@ msgid ""
msgstr ""
"Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του μηνύματος ηλ. αλληλογραφίας, "
"αλλά ο λογαριασμός σας έχει δημιουργηθεί. Μπορείτε να χρησιμοποιήσετε την "
-"λειτουργία "
-"ανάκτησης του κωδικού πρόσβασης αν η διεύθυνσή σας είναι σωστή. Σφάλματα %1"
+"λειτουργία ανάκτησης του κωδικού πρόσβασης αν η διεύθυνσή σας είναι σωστή. "
+"Σφάλματα %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
@@ -74,8 +80,7 @@ msgid ""
msgstr ""
"Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του μηνύματος ηλ αλληλογραφίας, "
"αλλά ο λογαριασμός σας έχει δημιουργηθεί. Μπορείτε να χρησιμοποιήσετε την "
-"λειτουργία "
-"ανάκτησης του κωδικού πρόσβασης αν η διεύθυνσή σας είναι σωστή: %1"
+"λειτουργία ανάκτησης του κωδικού πρόσβασης αν η διεύθυνσή σας είναι σωστή: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
@@ -84,17 +89,18 @@ msgstr ""
"Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του μηνύματος ηλ. αλληλογραφίας, "
"παρακαλώ προσπαθήστε ξανά αργότερα. Σφάλματα %1"
-#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
+#: 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:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Αδύνατος ο έλεγχος του /etc/passwd, παρακαλώ ειδοποιείστε τους διαχειριστές "
"του συστήματος"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -106,6 +112,10 @@ msgstr "Αλλαγή"
msgid "Change password"
msgstr "Αλλαγή κωδικού πρόσβασης"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -115,7 +125,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr "Ελέγξτε την ηλεκτρονική σας αλληλογραφία για τις οδηγίες επαναφοράς."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Επιβεβαιώστε την διεύθυνση της ηλ.αλληλογραφίας"
@@ -125,16 +135,18 @@ msgstr "Τρέχων κωδικός πρόσβασης"
#. (cn)
#. (entry.cn)
-#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_password.tt:1
+#: root/email/activation.tt:1 root/email/admin/password.tt:1
+#: root/email/forgot_password.tt:1
msgid "Dear %1,"
msgstr "Αγαπητέ/ή %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Διαγραφή"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Διαγραφή του χρήστη %1 από μια υπάρχουσα ομάδα:"
@@ -142,14 +154,19 @@ msgstr "Διαγραφή του χρήστη %1 από μια υπάρχουσα
msgid "Edit"
msgstr "Επεξεργασία"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Ηλ. αλληλογραφία"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Διεύθυνση ηλ. αλληλογραφίας"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Αυτό το όνομα χρήστη δεν επιτρέπεται"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Η ηλ. αλληλογραφία εστάλη"
@@ -158,15 +175,16 @@ msgstr "Η ηλ. αλληλογραφία εστάλη"
msgid "Enter new password."
msgstr "Εισάγετε νέο κωδικό πρόσβασης."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Εισάγετε κείμενο"
-#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76
+#: lib/CatDap/Controller/forgot_password.pm:62
+#: lib/CatDap/Controller/forgot_password.pm:76
msgid "Error while searching for account: "
msgstr "Σφάλμα κατά την αναζήτηση του λογαριασμού"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Όνομα"
@@ -178,7 +196,7 @@ msgstr "Ξεχάσατε τον κωδικό σας;"
msgid "Forgotten password"
msgstr "Έχω ξεχάσει τον κωδικό πρόσβασης"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Έχετε ξεχάσει τον κωδικό πρόσβασης;"
@@ -186,15 +204,11 @@ msgstr "Έχετε ξεχάσει τον κωδικό πρόσβασης;"
msgid "Full Name"
msgstr "Ονοματεπώνυμο"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Όνομα ομάδας"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Το όνομα ομάδας περιέχει μη έγκυρους χαρακτήρες"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Όνομα ομάδας"
@@ -210,19 +224,20 @@ msgstr "Ομάδες που ταιριάζουν με τα κριτήρια αν
msgid "Groups you manage"
msgstr "Ομάδες που διαχειρίζεστε"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Λάθος κείμενο επικύρωσης, παρακαλώ προσπαθήστε ξανά"
-#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/forgot_password.pm:45
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Μη έγκυρη διεύθυνση ηλ. αλληλογραφίας"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Μη έγκυρο όνομα χρήστη"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Μη έγκυρο όνομα χρήστη, χρησιμοποιείται ήδη από το σύστημα"
@@ -230,11 +245,11 @@ msgstr "Μη έγκυρο όνομα χρήστη, χρησιμοποιείτα
msgid "List of users promoted :"
msgstr "Λίστα προωθημένων χρηστών:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Αποσύνδεση"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Σύνδεση"
@@ -242,15 +257,16 @@ msgstr "Σύνδεση"
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Ταιριάζουν περισσότερες από μια καταχωρήσεις"
-#: root/forgot_password/confirm.tt:8 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:9
msgid "New Password"
msgstr "Νέος κωδικός πρόσβασης"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Οι νέοι κωδικοί πρόσβασης δεν ταιριάζουν"
@@ -258,11 +274,11 @@ msgstr "Οι νέοι κωδικοί πρόσβασης δεν ταιριάζο
msgid "Operation was successful."
msgstr "Η διεργασία ήταν επιτυχής."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Κωδικός πρόσβασης: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Λανθασμένος κωδικός πρόσβασης"
@@ -274,7 +290,7 @@ msgstr "Επαναφορά κωδικού πρόσβασης, εστάλη ηλ.
msgid "Password reset failed: "
msgstr "Αποτυχία επαναφοράς κωδικού πρόσβασης: "
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Προσωπικές πληροφορίες"
@@ -290,12 +306,6 @@ msgstr "Παρακαλώ χρησιμοποιήστε τα ανωτέρω μεν
msgid "Primary group"
msgstr "Κύρια ομάδα"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Οι λογαριασμοί με προνόμια δεν μπορούν να ανακτήσουν τους κωδικούς τους "
-"πρόσβασης μέσω αυτού του μηχανισμού "
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Προώθησε"
@@ -304,10 +314,15 @@ msgstr "Προώθησε"
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Εγγραφή"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Η εγγραφή ολοκληρώθηκε"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Η εγγραφή ολοκληρώθηκε"
@@ -316,39 +331,67 @@ msgstr "Η εγγραφή ολοκληρώθηκε"
msgid "Registration was successful."
msgstr "Η εγγραφή ολοκληρώθηκε με επιτυχία."
-#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
+#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr "Επαναλάβετε το νέο κωδικό πρόσβασης"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Επαναφορά κωδικού πρόσβασης"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Αναζήτηση"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Αναζήτηση ανά"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Ορισμός νέου κωδικού πρόσβασης"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Επιτυχία"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Επώνυμο"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Το προτεινόμενο όνομα περιέχει απαγορευμένους χαρακτήρες"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Το προτεινόμενο επίθετο περιέχει απαγορευμένους χαρακτήρες"
@@ -371,7 +414,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Ενημέρωση"
@@ -383,14 +426,33 @@ msgstr "Όνομα χρήστη"
msgid "Username : "
msgstr "Όνομα χρήστη: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
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
+#: 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 "Τιμή"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -411,11 +473,11 @@ msgstr "Ο λογαριασμός σας %1 έχει δημιουργηθεί α
msgid "Your password was reset by %1"
msgstr "Έγινε επαναφορά του κωδικού πρόσβασης από %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Η συνεδρία σας έχει λήξει"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "περιέχει"
@@ -423,19 +485,19 @@ msgstr "περιέχει"
msgid "delete"
msgstr "διαγραφή"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "μεγαλύτερο ή ίσο από"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "είναι ακριβώς"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "λιγότερο από"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "μέλος"
@@ -447,3 +509,10 @@ msgstr "επαναφορά κωδικού πρόσβασης"
msgid "with value"
msgstr "με την τιμή"
+#~ msgid "Group Name"
+#~ msgstr "Όνομα ομάδας"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Οι λογαριασμοί με προνόμια δεν μπορούν να ανακτήσουν τους κωδικούς τους "
+#~ "πρόσβασης μέσω αυτού του μηχανισμού "
diff --git a/lib/CatDap/I18N/en.po b/lib/CatDap/I18N/en.po
index b35748b..c2b8cbd 100644
--- a/lib/CatDap/I18N/en.po
+++ b/lib/CatDap/I18N/en.po
@@ -9,17 +9,20 @@ msgstr ""
"PO-Revision-Date: 2011-02-17 21:58+0200\n"
"Last-Translator: Buchan Milne <bgmilne@staff.telkomsa.net>\n"
"Language-Team: British English <kde-i18n-doc@kde.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:133
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: 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:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr ""
@@ -31,48 +34,68 @@ msgstr ""
msgid "Add attribute"
msgstr ""
+#. (uid)
+#: root/admin/account_group.tt:2
+msgid "Add user %1 to a new group"
+msgstr ""
+
#. (oc, dn)
#: root/admin/account_addoc.tt:1
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:49
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:89
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:94
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: 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"
+#: lib/CatDap/Controller/register.pm:154
+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 ""
-"An error occurred sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1"
+"An error occurred sending the email, but your account was created. Please "
+"try the password recovery process if you entered the correct email address. "
+"Errors %1"
#. ($errors)
-#: lib/CatDap/Controller/admin.pm:548
-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 "An error occurred sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: %1"
+#: lib/CatDap/Controller/admin.pm:562
+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 ""
+"An error occurred sending the email, but your account was created. Please "
+"try the password recovery process if you entered the correct email address: "
+"%1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
msgstr "An error occurred sending the email, please try again later. Errors %1"
-#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
+#: 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
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -84,6 +107,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -92,7 +119,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -102,26 +129,37 @@ msgstr ""
#. (cn)
#. (entry.cn)
-#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_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/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr ""
+#. (uid)
+#: root/admin/account_group.tt:19
+msgid "Delete user %1 from an existing group:"
+msgstr ""
+
#: root/user/fake.tt:1
msgid "Edit"
msgstr ""
-#: root/admin/account.tt:33 root/admin/account.tt:8 root/admin/account_promote.tt:6 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -130,19 +168,16 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76
+#: lib/CatDap/Controller/forgot_password.pm:62
+#: lib/CatDap/Controller/forgot_password.pm:76
msgid "Error while searching for account: "
msgstr ""
-#: root/admin/account.tt:34 root/admin/account_promote.tt:7
-msgid "First Name"
-msgstr ""
-
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -154,19 +189,19 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
-#: root/admin/account.tt:36 root/admin/account.tt:9 root/admin/account_promote.tt:9
+#: root/admin/account.tt:9
msgid "Full Name"
msgstr ""
-#: root/admin/group.tt:27
-msgid "Group Name"
+#: lib/CatDap/Controller/admin.pm:625
+msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -174,35 +209,57 @@ msgstr ""
msgid "Groups"
msgstr ""
-#: lib/CatDap/Controller/register.pm:52
+#: lib/CatDap/Controller/admin.pm:598
+msgid "Groups matching search criteria"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:591
+msgid "Groups you manage"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:46
+#: lib/CatDap/Controller/forgot_password.pm:45
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:42
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:59
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/admin/account_promote.tt:3
+msgid "List of users promoted :"
+msgstr ""
+
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
-#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:9
+#: lib/CatDap/Controller/admin.pm:185
+msgid "More than one ID Pool"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
+msgid "More than one entry matched"
+msgstr ""
+
+#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
+#: root/user/password.tt:9
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:295
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "New passwords don't match"
@@ -210,19 +267,23 @@ msgstr "New passwords don't match"
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:289
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:551
+#: lib/CatDap/Controller/admin.pm:565
msgid "Password reset and email sent"
msgstr ""
-#: root/register/index.tt:12
+#: lib/CatDap/Controller/admin.pm:535
+msgid "Password reset failed: "
+msgstr ""
+
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -234,14 +295,10 @@ msgstr ""
msgid "Please use the menus above."
msgstr ""
-#: root/admin/account_promote.tt:25
+#: root/admin/account_promote.tt:24
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -250,10 +307,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -262,43 +323,67 @@ msgstr ""
msgid "Registration was successful."
msgstr ""
-#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
+#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
-#: root/admin/account_promote.tt:4
-msgid "Select"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
msgstr ""
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+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
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:70
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:75
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -314,11 +399,15 @@ msgstr ""
msgid "To reset your password, please follow the link below."
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: lib/CatDap/Controller/admin.pm:528
+msgid "Transaction ID mismatch"
+msgstr ""
+
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr ""
-#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/register/index.tt:7 root/register/index.tt:8
+#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr ""
@@ -326,17 +415,38 @@ msgstr ""
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:65
+#: lib/CatDap/Controller/register.pm:71
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
+#: 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 ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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."
+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)
@@ -349,39 +459,38 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
-#: root/admin/group_modify.tt:14
+#: root/admin/group_modify.tt:15
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:535
+#: lib/CatDap/Controller/admin.pm:549
msgid "password reset"
msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
-
diff --git a/lib/CatDap/I18N/en_gb.po b/lib/CatDap/I18N/en_gb.po
index b35748b..c2b8cbd 100644
--- a/lib/CatDap/I18N/en_gb.po
+++ b/lib/CatDap/I18N/en_gb.po
@@ -9,17 +9,20 @@ msgstr ""
"PO-Revision-Date: 2011-02-17 21:58+0200\n"
"Last-Translator: Buchan Milne <bgmilne@staff.telkomsa.net>\n"
"Language-Team: British English <kde-i18n-doc@kde.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:133
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: 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:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr ""
@@ -31,48 +34,68 @@ msgstr ""
msgid "Add attribute"
msgstr ""
+#. (uid)
+#: root/admin/account_group.tt:2
+msgid "Add user %1 to a new group"
+msgstr ""
+
#. (oc, dn)
#: root/admin/account_addoc.tt:1
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:49
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:89
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:94
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: 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"
+#: lib/CatDap/Controller/register.pm:154
+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 ""
-"An error occurred sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1"
+"An error occurred sending the email, but your account was created. Please "
+"try the password recovery process if you entered the correct email address. "
+"Errors %1"
#. ($errors)
-#: lib/CatDap/Controller/admin.pm:548
-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 "An error occurred sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: %1"
+#: lib/CatDap/Controller/admin.pm:562
+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 ""
+"An error occurred sending the email, but your account was created. Please "
+"try the password recovery process if you entered the correct email address: "
+"%1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
msgstr "An error occurred sending the email, please try again later. Errors %1"
-#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
+#: 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
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -84,6 +107,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -92,7 +119,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -102,26 +129,37 @@ msgstr ""
#. (cn)
#. (entry.cn)
-#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_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/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr ""
+#. (uid)
+#: root/admin/account_group.tt:19
+msgid "Delete user %1 from an existing group:"
+msgstr ""
+
#: root/user/fake.tt:1
msgid "Edit"
msgstr ""
-#: root/admin/account.tt:33 root/admin/account.tt:8 root/admin/account_promote.tt:6 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -130,19 +168,16 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76
+#: lib/CatDap/Controller/forgot_password.pm:62
+#: lib/CatDap/Controller/forgot_password.pm:76
msgid "Error while searching for account: "
msgstr ""
-#: root/admin/account.tt:34 root/admin/account_promote.tt:7
-msgid "First Name"
-msgstr ""
-
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -154,19 +189,19 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
-#: root/admin/account.tt:36 root/admin/account.tt:9 root/admin/account_promote.tt:9
+#: root/admin/account.tt:9
msgid "Full Name"
msgstr ""
-#: root/admin/group.tt:27
-msgid "Group Name"
+#: lib/CatDap/Controller/admin.pm:625
+msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -174,35 +209,57 @@ msgstr ""
msgid "Groups"
msgstr ""
-#: lib/CatDap/Controller/register.pm:52
+#: lib/CatDap/Controller/admin.pm:598
+msgid "Groups matching search criteria"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:591
+msgid "Groups you manage"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:46
+#: lib/CatDap/Controller/forgot_password.pm:45
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:42
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:59
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/admin/account_promote.tt:3
+msgid "List of users promoted :"
+msgstr ""
+
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
-#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:9
+#: lib/CatDap/Controller/admin.pm:185
+msgid "More than one ID Pool"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
+msgid "More than one entry matched"
+msgstr ""
+
+#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
+#: root/user/password.tt:9
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:295
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "New passwords don't match"
@@ -210,19 +267,23 @@ msgstr "New passwords don't match"
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:289
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:551
+#: lib/CatDap/Controller/admin.pm:565
msgid "Password reset and email sent"
msgstr ""
-#: root/register/index.tt:12
+#: lib/CatDap/Controller/admin.pm:535
+msgid "Password reset failed: "
+msgstr ""
+
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -234,14 +295,10 @@ msgstr ""
msgid "Please use the menus above."
msgstr ""
-#: root/admin/account_promote.tt:25
+#: root/admin/account_promote.tt:24
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -250,10 +307,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -262,43 +323,67 @@ msgstr ""
msgid "Registration was successful."
msgstr ""
-#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
+#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
-#: root/admin/account_promote.tt:4
-msgid "Select"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
msgstr ""
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+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
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:70
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:75
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -314,11 +399,15 @@ msgstr ""
msgid "To reset your password, please follow the link below."
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: lib/CatDap/Controller/admin.pm:528
+msgid "Transaction ID mismatch"
+msgstr ""
+
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr ""
-#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/register/index.tt:7 root/register/index.tt:8
+#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr ""
@@ -326,17 +415,38 @@ msgstr ""
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:65
+#: lib/CatDap/Controller/register.pm:71
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
+#: 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 ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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."
+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)
@@ -349,39 +459,38 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
-#: root/admin/group_modify.tt:14
+#: root/admin/group_modify.tt:15
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:535
+#: lib/CatDap/Controller/admin.pm:549
msgid "password reset"
msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
-
diff --git a/lib/CatDap/I18N/en_us.po b/lib/CatDap/I18N/en_us.po
index b35748b..c2b8cbd 100644
--- a/lib/CatDap/I18N/en_us.po
+++ b/lib/CatDap/I18N/en_us.po
@@ -9,17 +9,20 @@ msgstr ""
"PO-Revision-Date: 2011-02-17 21:58+0200\n"
"Last-Translator: Buchan Milne <bgmilne@staff.telkomsa.net>\n"
"Language-Team: British English <kde-i18n-doc@kde.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:133
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: 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:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr ""
@@ -31,48 +34,68 @@ msgstr ""
msgid "Add attribute"
msgstr ""
+#. (uid)
+#: root/admin/account_group.tt:2
+msgid "Add user %1 to a new group"
+msgstr ""
+
#. (oc, dn)
#: root/admin/account_addoc.tt:1
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:49
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:89
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:94
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: 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"
+#: lib/CatDap/Controller/register.pm:154
+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 ""
-"An error occurred sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1"
+"An error occurred sending the email, but your account was created. Please "
+"try the password recovery process if you entered the correct email address. "
+"Errors %1"
#. ($errors)
-#: lib/CatDap/Controller/admin.pm:548
-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 "An error occurred sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: %1"
+#: lib/CatDap/Controller/admin.pm:562
+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 ""
+"An error occurred sending the email, but your account was created. Please "
+"try the password recovery process if you entered the correct email address: "
+"%1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
msgstr "An error occurred sending the email, please try again later. Errors %1"
-#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
+#: 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
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -84,6 +107,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -92,7 +119,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -102,26 +129,37 @@ msgstr ""
#. (cn)
#. (entry.cn)
-#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_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/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr ""
+#. (uid)
+#: root/admin/account_group.tt:19
+msgid "Delete user %1 from an existing group:"
+msgstr ""
+
#: root/user/fake.tt:1
msgid "Edit"
msgstr ""
-#: root/admin/account.tt:33 root/admin/account.tt:8 root/admin/account_promote.tt:6 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -130,19 +168,16 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76
+#: lib/CatDap/Controller/forgot_password.pm:62
+#: lib/CatDap/Controller/forgot_password.pm:76
msgid "Error while searching for account: "
msgstr ""
-#: root/admin/account.tt:34 root/admin/account_promote.tt:7
-msgid "First Name"
-msgstr ""
-
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -154,19 +189,19 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
-#: root/admin/account.tt:36 root/admin/account.tt:9 root/admin/account_promote.tt:9
+#: root/admin/account.tt:9
msgid "Full Name"
msgstr ""
-#: root/admin/group.tt:27
-msgid "Group Name"
+#: lib/CatDap/Controller/admin.pm:625
+msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -174,35 +209,57 @@ msgstr ""
msgid "Groups"
msgstr ""
-#: lib/CatDap/Controller/register.pm:52
+#: lib/CatDap/Controller/admin.pm:598
+msgid "Groups matching search criteria"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:591
+msgid "Groups you manage"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:46
+#: lib/CatDap/Controller/forgot_password.pm:45
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:42
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:59
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/admin/account_promote.tt:3
+msgid "List of users promoted :"
+msgstr ""
+
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
-#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:9
+#: lib/CatDap/Controller/admin.pm:185
+msgid "More than one ID Pool"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
+msgid "More than one entry matched"
+msgstr ""
+
+#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
+#: root/user/password.tt:9
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:295
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "New passwords don't match"
@@ -210,19 +267,23 @@ msgstr "New passwords don't match"
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:289
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:551
+#: lib/CatDap/Controller/admin.pm:565
msgid "Password reset and email sent"
msgstr ""
-#: root/register/index.tt:12
+#: lib/CatDap/Controller/admin.pm:535
+msgid "Password reset failed: "
+msgstr ""
+
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -234,14 +295,10 @@ msgstr ""
msgid "Please use the menus above."
msgstr ""
-#: root/admin/account_promote.tt:25
+#: root/admin/account_promote.tt:24
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -250,10 +307,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -262,43 +323,67 @@ msgstr ""
msgid "Registration was successful."
msgstr ""
-#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
+#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
-#: root/admin/account_promote.tt:4
-msgid "Select"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
msgstr ""
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+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
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:70
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:75
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -314,11 +399,15 @@ msgstr ""
msgid "To reset your password, please follow the link below."
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: lib/CatDap/Controller/admin.pm:528
+msgid "Transaction ID mismatch"
+msgstr ""
+
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr ""
-#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/register/index.tt:7 root/register/index.tt:8
+#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr ""
@@ -326,17 +415,38 @@ msgstr ""
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:65
+#: lib/CatDap/Controller/register.pm:71
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
+#: 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 ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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."
+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)
@@ -349,39 +459,38 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
-#: root/admin/group_modify.tt:14
+#: root/admin/group_modify.tt:15
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:535
+#: lib/CatDap/Controller/admin.pm:549
msgid "password reset"
msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
-
diff --git a/lib/CatDap/I18N/eo.po b/lib/CatDap/I18N/eo.po
index b221757..1ea69d6 100644
--- a/lib/CatDap/I18N/eo.po
+++ b/lib/CatDap/I18N/eo.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivigo"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Aldonu"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -46,20 +46,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -83,11 +87,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -99,6 +103,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -107,7 +115,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -122,13 +130,13 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Forigi"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -136,14 +144,18 @@ msgstr ""
msgid "Edit"
msgstr "Redakti"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -152,7 +164,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -161,7 +173,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -173,7 +185,7 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -181,15 +193,11 @@ msgstr ""
msgid "Full Name"
msgstr "Plena Nomo"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Grupa Nomo"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -205,20 +213,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -226,11 +234,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -238,7 +246,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -247,7 +255,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -255,11 +263,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -271,7 +279,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -287,10 +295,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -299,10 +303,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -316,35 +324,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Serĉi"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -364,7 +399,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Ĝisdatigu"
@@ -376,7 +411,7 @@ msgstr "Uzulnomo"
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -385,6 +420,24 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -402,11 +455,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -414,19 +467,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -437,3 +490,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "Grupa Nomo"
diff --git a/lib/CatDap/I18N/es.po b/lib/CatDap/I18N/es.po
index 73ff53c..37faeea 100644
--- a/lib/CatDap/I18N/es.po
+++ b/lib/CatDap/I18N/es.po
@@ -21,13 +21,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Activación"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Añadir"
@@ -40,7 +40,7 @@ msgid "Add attribute"
msgstr "Añadir atributo"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Añadir usuario %1 a nuevo grupo"
@@ -49,20 +49,24 @@ msgstr "Añadir usuario %1 a nuevo grupo"
msgid "Adding objectclass %1 to dn %2"
msgstr "Añadiendo clase de objeto %1 a dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Las direcciones no concuerdan"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Ya existe una cuenta con este correo electrónico"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Ya existe una cuenta con este nombre de usuario"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -94,13 +98,13 @@ msgstr ""
msgid "Attribute"
msgstr "Atributo"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"No se puede comprobar /etc/passwd, por favor, avise al administrador del "
"sistema"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -112,6 +116,10 @@ msgstr "Cambiar"
msgid "Change password"
msgstr "Cambiar contraseña"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Debería recibir en su correo las instrucciones de activación"
@@ -121,7 +129,7 @@ msgid "Check your mail for password reset instructions."
msgstr ""
"Debería recibir en su correo las instrucciones para cambiar la contraseña"
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Confirme su cuenta de correo electrónico"
@@ -136,13 +144,13 @@ msgstr "Contraseña actual"
msgid "Dear %1,"
msgstr "Estimado %1:"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Borrar"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Eliminar usuario %1 de un grupo:"
@@ -150,14 +158,19 @@ msgstr "Eliminar usuario %1 de un grupo:"
msgid "Edit"
msgstr "Editar"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Correo electrónico"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Correo electrónico"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "No se permite el uso de este nombre de usuario"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Correo electrónico enviado."
@@ -166,7 +179,7 @@ msgstr "Correo electrónico enviado."
msgid "Enter new password."
msgstr "Teclee su nueva contraseña"
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Teclee texto"
@@ -175,7 +188,7 @@ msgstr "Teclee texto"
msgid "Error while searching for account: "
msgstr "Error mientras se buscaba la cuenta"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Nombre de pila"
@@ -187,7 +200,7 @@ msgstr "¿Olvidó su contraseña?"
msgid "Forgotten password"
msgstr "Contraseña olvidada"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "¿Contraseña olvidada?"
@@ -195,15 +208,11 @@ msgstr "¿Contraseña olvidada?"
msgid "Full Name"
msgstr "Nombre completo"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nombre del grupo"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "El grupo contiene caracteres ilegales"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nombre del grupo"
@@ -219,20 +228,20 @@ msgstr "Grupos resultantes de la búsqueda"
msgid "Groups you manage"
msgstr "Grupos que administra"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Texto de validación incorrecto, por favor, inténtelo de nuevo."
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Correo electrónico incorrecto"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Nombre de usuario incorrecto"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nombre de usuario incorrecto, ya usado por el sistema"
@@ -240,11 +249,11 @@ msgstr "Nombre de usuario incorrecto, ya usado por el sistema"
msgid "List of users promoted :"
msgstr "Lista de usuarios promocionados:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Cerrar sesión"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Abrir sesión"
@@ -252,7 +261,7 @@ msgstr "Abrir sesión"
msgid "More than one ID Pool"
msgstr "Más de una fuente ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Más de una entrada coincidente"
@@ -261,7 +270,7 @@ msgstr "Más de una entrada coincidente"
msgid "New Password"
msgstr "Nueva contraseña"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Las nuevas contraseñas no concuerdan"
@@ -269,11 +278,11 @@ msgstr "Las nuevas contraseñas no concuerdan"
msgid "Operation was successful."
msgstr "Operación finalizada con éxito"
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Contraseña :"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Contraseña incorrecta"
@@ -285,7 +294,7 @@ msgstr "Contraseña cambiada y correo enviado"
msgid "Password reset failed: "
msgstr "Falló el cambio de contraseña"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Información personal"
@@ -301,12 +310,6 @@ msgstr "Por favor, use los menús anteriores."
msgid "Primary group"
msgstr "Grupo primario"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Las cuentas privilegiadas no pueden recuperar la contraseña mediante este "
-"mecanismo"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promocionar"
@@ -315,10 +318,15 @@ msgstr "Promocionar"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promocionar usuario a posixAccount con grupo primario:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registrarse"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registro completo"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registro completo"
@@ -332,35 +340,62 @@ msgstr "Registro exitoso"
msgid "Repeat New Password"
msgstr "Repita nueva contraseña"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Cambiar contraseña"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Búsqueda"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Buscar por"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Fijar nueva contraseña"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Éxito"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Apellido"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "El nombre de pila contiene caracteres ilegales"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "El apellido contiene caracteres ilegales"
@@ -380,7 +415,7 @@ msgstr "Para cambiar su contraseña, por favor, siga el enlace siguiente."
msgid "Transaction ID mismatch"
msgstr "Error en el ID de la transacción."
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Actualizar"
@@ -392,7 +427,7 @@ msgstr "Nombre de usuario"
msgid "Username : "
msgstr "Usuario :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "No se permite el uso de este nombre de usuario"
@@ -401,6 +436,24 @@ msgstr "No se permite el uso de este nombre de usuario"
msgid "Value"
msgstr "Valor"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -420,11 +473,11 @@ msgstr "Se creó su cuenta %1 satisfactoriamente, pero requiere de activación."
msgid "Your password was reset by %1"
msgstr "Su contraseña se cambió por %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Su sesión ha expirado"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "contiene"
@@ -432,19 +485,19 @@ msgstr "contiene"
msgid "delete"
msgstr "borrar"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "mayor o igual que"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "es exactamente"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "menor que"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "miembro"
@@ -455,3 +508,11 @@ msgstr "cambio de cotraseña"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "con valor"
+
+#~ msgid "Group Name"
+#~ msgstr "Nombre del grupo"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Las cuentas privilegiadas no pueden recuperar la contraseña mediante este "
+#~ "mecanismo"
diff --git a/lib/CatDap/I18N/et.po b/lib/CatDap/I18N/et.po
index e445e10..37001a4 100644
--- a/lib/CatDap/I18N/et.po
+++ b/lib/CatDap/I18N/et.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktiveerimine"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Lisa"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "Atribuudi lisamine"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Kasutaja %1 lisamine uude gruppi"
@@ -46,20 +46,24 @@ msgstr "Kasutaja %1 lisamine uude gruppi"
msgid "Adding objectclass %1 to dn %2"
msgstr "Objektiklassi %1 lisamine DN-ile %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Aadressid ei klapi"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Selle e-posti aadressiga konto on juba olemas"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Selle kasutajanimega konto on juba olemas"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -87,12 +91,12 @@ msgstr "Kirja saatmisel tekkis tõrge, palun proovige hiljem uuesti. Tõrked %1"
msgid "Attribute"
msgstr "Atribuut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"/etc/passwd kontrollimine nurjus, palun hoiatage süsteemiadministraatoreid"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Kinnituskood"
@@ -104,6 +108,10 @@ msgstr "Muuda"
msgid "Change password"
msgstr "Muuda parooli"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Kontrollige oma e-posti, kust leiate kirja aktiveerimisjuhistega."
@@ -112,7 +120,7 @@ msgstr "Kontrollige oma e-posti, kust leiate kirja aktiveerimisjuhistega."
msgid "Check your mail for password reset instructions."
msgstr "Kontrollige oma e-posti, kust leiate parooli lähtestamise juhised."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "E-posti aadress teist korda"
@@ -127,13 +135,13 @@ msgstr "Praegune parool"
msgid "Dear %1,"
msgstr "Armas %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Kustuta"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Kasutaja %1 kustutamine olemasolevast grupist:"
@@ -141,14 +149,19 @@ msgstr "Kasutaja %1 kustutamine olemasolevast grupist:"
msgid "Edit"
msgstr "Muuda"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-post"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-posti aadress"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Kasutajanime ei ole õigust kasutada"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Kiri on saadetud."
@@ -157,7 +170,7 @@ msgstr "Kiri on saadetud."
msgid "Enter new password."
msgstr "Sisestage uus parool."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Sisestage tekst"
@@ -166,7 +179,7 @@ msgstr "Sisestage tekst"
msgid "Error while searching for account: "
msgstr "Tõrge konto otsimisel: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Eesnimi"
@@ -178,7 +191,7 @@ msgstr "Kas unustasite parooli?"
msgid "Forgotten password"
msgstr "Unustatud parool"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Kas unustasite parooli?"
@@ -186,15 +199,11 @@ msgstr "Kas unustasite parooli?"
msgid "Full Name"
msgstr "Täielik nimi"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Grupi nimi"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Grupi nimi sisaldab lubamatuid märke"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Grupi nimi"
@@ -210,20 +219,20 @@ msgstr "Otsingule vastavad grupid"
msgid "Groups you manage"
msgstr "Teie hallatavad grupid"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Valideerimistekst oli vigane, palun proovige uuesti"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Vigane e-posti aadress"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Vigane kasutajanimi"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Vigane kasutajanimi, see on süsteemis juba kasutusel"
@@ -231,11 +240,11 @@ msgstr "Vigane kasutajanimi, see on süsteemis juba kasutusel"
msgid "List of users promoted :"
msgstr "Ülendatud kasutajate loend:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Logi välja"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Sisselogimine"
@@ -243,7 +252,7 @@ msgstr "Sisselogimine"
msgid "More than one ID Pool"
msgstr "Üle ühe ID-puuli"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Leiti rohkem kui üks kirje"
@@ -252,7 +261,7 @@ msgstr "Leiti rohkem kui üks kirje"
msgid "New Password"
msgstr "Uus parool"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Uued paroolid ei klapi"
@@ -260,11 +269,11 @@ msgstr "Uued paroolid ei klapi"
msgid "Operation was successful."
msgstr "Toiming õnnestus"
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Parool: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Parool ei ole õige"
@@ -276,7 +285,7 @@ msgstr "Parool on nullitud ja kiri saadetud"
msgid "Password reset failed: "
msgstr "Parooli lähtestamine nurjus:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Isiklik teave"
@@ -292,10 +301,6 @@ msgstr "Palun kasutage ülal olevaid menüüsid."
msgid "Primary group"
msgstr "Esmane grupp"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Privileegidega kontode paroole ei saa selle mehhanismiga taastada"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Ülenda"
@@ -304,10 +309,15 @@ msgstr "Ülenda"
msgid "Promote user to posixAccount with primary group:"
msgstr "Kasutaja ülendamine posixAccount'ile esmase grupiga:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registreerimine"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registreerimine on lõpetatud"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registreerimine on lõpetatud"
@@ -321,35 +331,62 @@ msgstr "Registreerimine õnnestus."
msgid "Repeat New Password"
msgstr "Uus parool teist korda"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Lähtesta parool"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Otsi"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Otsingu alus"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Määra uus parool"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Õnnestus"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Perekonnanimi"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Eesnimi sisaldab lubamatuid märke"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Perekonnanimi sisaldab lubamatuid märke"
@@ -369,7 +406,7 @@ msgstr "Oma parooli nullimiseks kasutage palun allolevat linki."
msgid "Transaction ID mismatch"
msgstr "Tehingu ID ei klapi"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Uuenda"
@@ -381,7 +418,7 @@ msgstr "Kasutajanimi"
msgid "Username : "
msgstr "Kasutajanimi: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Kasutajanime ei ole õigust kasutada"
@@ -390,6 +427,24 @@ msgstr "Kasutajanime ei ole õigust kasutada"
msgid "Value"
msgstr "Väärtus"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -409,11 +464,11 @@ msgstr "Teie %1 konto on edukalt loodud, aga vajab aktiveerimist."
msgid "Your password was reset by %1"
msgstr "Teie parooli nullis %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Teie seanss on aegunud"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "sisaldab"
@@ -421,19 +476,19 @@ msgstr "sisaldab"
msgid "delete"
msgstr "Kustuta"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "suurem kui või võrdne"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "on täpselt"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "väiksem kui"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "liige"
@@ -444,3 +499,9 @@ msgstr "parool lähtestatud"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "väärtusega"
+
+#~ msgid "Group Name"
+#~ msgstr "Grupi nimi"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "Privileegidega kontode paroole ei saa selle mehhanismiga taastada"
diff --git a/lib/CatDap/I18N/eu.po b/lib/CatDap/I18N/eu.po
index 838df9a..ef53b47 100644
--- a/lib/CatDap/I18N/eu.po
+++ b/lib/CatDap/I18N/eu.po
@@ -12,20 +12,20 @@ msgstr ""
"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
"eu/)\n"
+"Language: eu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.7\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktibaketa"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Gehitu"
@@ -38,7 +38,7 @@ msgid "Add attribute"
msgstr "Gehitu Atributu"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Gehitu %1 erabiltzailea talde berrira"
@@ -47,20 +47,24 @@ msgstr "Gehitu %1 erabiltzailea talde berrira"
msgid "Adding objectclass %1 to dn %2"
msgstr "%1 objektu klasea %2-ra gehitzen"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Helbideak ez datoz bat"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Kontu bat dago jadanik helbide elektroniko horrekin"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Kontu bat dago jadanik erabiltzaile izen horrekin"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -92,12 +96,12 @@ msgstr ""
msgid "Attribute"
msgstr "Atributu"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Ezin da begiratu /etc/passwd, mesedez abisatu sistemako administratzaileak"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -109,6 +113,10 @@ msgstr "Aldatu"
msgid "Change password"
msgstr "Pasahitza aldatu"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Zure postontzian aktibazio argibideak ikusi."
@@ -117,7 +125,7 @@ msgstr "Zure postontzian aktibazio argibideak ikusi."
msgid "Check your mail for password reset instructions."
msgstr "Zure postontzian pasahitza berrezartzeko argibideak ikusi."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Posta elektronikoaren helbidea egiztatu"
@@ -132,13 +140,13 @@ msgstr "Uneko pasahitza"
msgid "Dear %1,"
msgstr "%1 laztana."
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Ezabatu"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Ezabatu %1 erabiltzailea existitzen den taldetik:"
@@ -146,14 +154,19 @@ msgstr "Ezabatu %1 erabiltzailea existitzen den taldetik:"
msgid "Edit"
msgstr "Editatu"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Posta Elektronikoa"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Posta helbidea"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Erabiltzaile izena ez dago baimenduta erbiltzeko"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Bidali posta elektronikoa."
@@ -162,7 +175,7 @@ msgstr "Bidali posta elektronikoa."
msgid "Enter new password."
msgstr "Sartu pasahitz berria"
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Idatzi textua"
@@ -171,7 +184,7 @@ msgstr "Idatzi textua"
msgid "Error while searching for account: "
msgstr "Huts egin du kontua bilatu bitartean:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Izena"
@@ -183,7 +196,7 @@ msgstr "Pasahitza ahaztu duzu?"
msgid "Forgotten password"
msgstr "Ahaztutako pasahitza"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Pasahitza ahaztuta?"
@@ -191,15 +204,11 @@ msgstr "Pasahitza ahaztuta?"
msgid "Full Name"
msgstr "Izen Osoa"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Talde Izena"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Taldeak legez kanpoko karaktereak ditu"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Talde izena"
@@ -215,20 +224,20 @@ msgstr "Bilaketa irizpideak betetzen dituzten taldeak"
msgid "Groups you manage"
msgstr "Kudeatu ditzakezun taldeak"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Balidazio testu okerra, saiatu berriro mesedez"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Okerreko posta helbidea"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Okerreko erbiltzaile izena"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Erabiltzaile izen baliogabea, sisteman erabilita dago jadanik"
@@ -236,11 +245,11 @@ msgstr "Erabiltzaile izen baliogabea, sisteman erabilita dago jadanik"
msgid "List of users promoted :"
msgstr "Sustatutako erabiltzaileen zerrenda:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Saioa amaitu"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Saioa hasi"
@@ -248,7 +257,7 @@ msgstr "Saioa hasi"
msgid "More than one ID Pool"
msgstr "ID Iturri bat baino gehiago"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Bat datozen sarrera bat baino gehiago"
@@ -257,7 +266,7 @@ msgstr "Bat datozen sarrera bat baino gehiago"
msgid "New Password"
msgstr "Pasahitz Berria"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Pasahitz berriak ez datoz bat"
@@ -265,11 +274,11 @@ msgstr "Pasahitz berriak ez datoz bat"
msgid "Operation was successful."
msgstr "Ekintza arrakastatsuki amaitu da."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Pasahitza:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Okerreko pasahitza"
@@ -281,7 +290,7 @@ msgstr "Pasahitza berrezarri eta postaz bidali"
msgid "Password reset failed: "
msgstr "Pasahitza berrezartzeak huts egin du:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informazio Pertsonala"
@@ -297,12 +306,6 @@ msgstr "Mesedez aurreko menuak erabili."
msgid "Primary group"
msgstr "Lehen taldea"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Baliteke kontu pribilegiatuetako pasahitzak ez berreskuratzea mekanismo "
-"honen bidez"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Sustatu"
@@ -311,10 +314,15 @@ msgstr "Sustatu"
msgid "Promote user to posixAccount with primary group:"
msgstr "Erabiltzaileak sustatzeko posixAccount lehen taldearekin :"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Izena eman"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Harpidetza bukatuta"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Harpidetza bukatuta"
@@ -328,35 +336,62 @@ msgstr "Harpidetza arrakastaz egin zen."
msgid "Repeat New Password"
msgstr "Pasahitz berria errepikatu"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Pasahitza berrezarri"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Bilatu"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "-gatik bilatu"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Pasahitz berri bat ezarri"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Arrakasta"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Abizenak"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Emandako izena legez kanpoko karaktereak ditu"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Emandako abizenak legez kanpoko karaktereak ditu"
@@ -376,7 +411,7 @@ msgstr "Zure pasahitza berritzeko, beheko esteka jarraitu ezazu."
msgid "Transaction ID mismatch"
msgstr "Transakzio ID-a ez dator bat"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Eguneratu"
@@ -388,7 +423,7 @@ msgstr "Erabiltzaile-izena"
msgid "Username : "
msgstr "Erabiltzaile izena :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Erabiltzaile izena ez dago baimenduta erbiltzeko"
@@ -397,6 +432,24 @@ msgstr "Erabiltzaile izena ez dago baimenduta erbiltzeko"
msgid "Value"
msgstr "Balioa"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -416,11 +469,11 @@ msgstr "Zure %1 kontua behar bezala sortu dira, baina aktibazioa eskatzen du."
msgid "Your password was reset by %1"
msgstr "%1-gatik berrezarri da zure pasahitza"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Zure saioa iraungi da"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "dauka"
@@ -428,19 +481,19 @@ msgstr "dauka"
msgid "delete"
msgstr "ezabatu"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "baino handiagoa edo berdina"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "da zehazki"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "baino gutxiago"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "kide"
@@ -451,3 +504,11 @@ msgstr "pasahitza berrezarri"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "balio honekin"
+
+#~ msgid "Group Name"
+#~ msgstr "Talde Izena"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Baliteke kontu pribilegiatuetako pasahitzak ez berreskuratzea mekanismo "
+#~ "honen bidez"
diff --git a/lib/CatDap/I18N/fr.po b/lib/CatDap/I18N/fr.po
index a6302bc..54e0542 100644
--- a/lib/CatDap/I18N/fr.po
+++ b/lib/CatDap/I18N/fr.po
@@ -13,20 +13,20 @@ msgstr ""
"Last-Translator: Rémi Verschelde <akien@mageia.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
"fr/)\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 1.6.9\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Activation"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Ajouter"
@@ -39,7 +39,7 @@ msgid "Add attribute"
msgstr "Ajouter un attribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Ajouter l'utilisateur %1 à un nouveau groupe"
@@ -48,20 +48,24 @@ msgstr "Ajouter l'utilisateur %1 à un nouveau groupe"
msgid "Adding objectclass %1 to dn %2"
msgstr "Ajout de la classe-objet %1 au dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Les adresses ne correspondent pas"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Un compte existe déjà avec cette adresse e-mail"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Un compte existe déjà pour ce nom d'utilisateur"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -93,13 +97,13 @@ msgstr ""
msgid "Attribute"
msgstr "Attribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Le fichier /etc/passwd n'est pas accessible, veuillez prévenir les "
"administrateurs système"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -111,6 +115,10 @@ msgstr "Changer"
msgid "Change password"
msgstr "Changer le mot de passe"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Consultez votre boite mail pour les instructions d'activation."
@@ -121,7 +129,7 @@ msgstr ""
"Vérifiez votre boite mail pour les instructions de réinitialisation du mot "
"de passe."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Confirmer l'adresse e-mail"
@@ -136,13 +144,13 @@ msgstr "Mot de passe actuel"
msgid "Dear %1,"
msgstr "Cher/Chère %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Supprimer"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Supprimer l'utilisateur %1 d'un groupe existant:"
@@ -150,14 +158,19 @@ msgstr "Supprimer l'utilisateur %1 d'un groupe existant:"
msgid "Edit"
msgstr "Éditer"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-mail"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Adresse e-mail"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Ce nom d'utilisateur n'est pas autorisé"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "L'e-mail a été envoyé."
@@ -166,7 +179,7 @@ msgstr "L'e-mail a été envoyé."
msgid "Enter new password."
msgstr "Entrez le nouveau mot de passe."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Entrez le texte"
@@ -175,7 +188,7 @@ msgstr "Entrez le texte"
msgid "Error while searching for account: "
msgstr "Une erreur s'est produite lors de la recherche du compte : "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Prénom"
@@ -187,7 +200,7 @@ msgstr "Vous avez oublié votre mot de passe ?"
msgid "Forgotten password"
msgstr "Mot de passe oublié"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Mot de passe oublié ?"
@@ -195,15 +208,11 @@ msgstr "Mot de passe oublié ?"
msgid "Full Name"
msgstr "Nom et prénom"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nom du groupe"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Le Groupe contient des caratères interdits"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nom du groupe"
@@ -219,20 +228,20 @@ msgstr "Groupes correspondant aux critères de recherche"
msgid "Groups you manage"
msgstr "Les groupes que vous gérez"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Texte de validation incorrect, merci de réessayer"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Adresse e-mail invalide"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Nom d'utilisateur invalide"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nom d'utilisateur invalide, car déjà utilisé par le système"
@@ -240,11 +249,11 @@ msgstr "Nom d'utilisateur invalide, car déjà utilisé par le système"
msgid "List of users promoted :"
msgstr "Liste des utilisateurs promus :"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Se déconnecter"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Connexion"
@@ -252,7 +261,7 @@ msgstr "Connexion"
msgid "More than one ID Pool"
msgstr "Plus d'un groupe d'ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Cela correspond à plus d'une entrée."
@@ -261,7 +270,7 @@ msgstr "Cela correspond à plus d'une entrée."
msgid "New Password"
msgstr "Nouveau mot de passe"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Les nouveaux mots de passe ne correspondent pas"
@@ -269,11 +278,11 @@ msgstr "Les nouveaux mots de passe ne correspondent pas"
msgid "Operation was successful."
msgstr "L'opération est terminée avec succès."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Mot de passe : "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Mot de passe incorrect"
@@ -285,7 +294,7 @@ msgstr "Le mot de passe a été réinitialisé et vous a été envoyé par e-mai
msgid "Password reset failed: "
msgstr "La réinitialisation du mot de passe a échoué:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informations personnelles"
@@ -301,12 +310,6 @@ msgstr "Veuillez utiliser les menus ci-dessus."
msgid "Primary group"
msgstr "Groupe principal"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Les comptes à privilèges ne peuvent pas récupérer leurs mots de passe de "
-"cette manière"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promouvoir"
@@ -316,10 +319,15 @@ msgid "Promote user to posixAccount with primary group:"
msgstr ""
"Promouvoir l'utilisateur à un posixAccount au sein du groupe principal :"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "S'enregistrer"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Enregistrement terminé"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Enregistrement terminé"
@@ -333,35 +341,62 @@ msgstr "Enregistrement terminé avec succès."
msgid "Repeat New Password"
msgstr "Répéter le nouveau de passe"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Rechercher"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Rechercher par"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Définir le nouveau mot de passe"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Succès"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Nom"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Le prénom proposé contient des caractères interdits"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Le nom proposé contient des caractères interdits"
@@ -382,7 +417,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr "L'ID de transaction ne correspond pas"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Mettre à jour"
@@ -394,7 +429,7 @@ msgstr "Nom d'utilisateur"
msgid "Username : "
msgstr "Nom d'utilisateur : "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Ce nom d'utilisateur n'est pas autorisé"
@@ -403,6 +438,24 @@ msgstr "Ce nom d'utilisateur n'est pas autorisé"
msgid "Value"
msgstr "Valeur"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -423,11 +476,11 @@ msgstr "Votre compte %1 a été créé mais requiert d'être activé."
msgid "Your password was reset by %1"
msgstr "Votre mot de passe a été réinitialisé par %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Votre session a expiré"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "contient"
@@ -435,19 +488,19 @@ msgstr "contient"
msgid "delete"
msgstr "supprimer"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "supérieur ou égal à"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "est exactement"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "moins que"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "membre"
@@ -458,3 +511,11 @@ msgstr "réinitialisation du mot de passe"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "avec la valeur"
+
+#~ msgid "Group Name"
+#~ msgstr "Nom du groupe"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Les comptes à privilèges ne peuvent pas récupérer leurs mots de passe de "
+#~ "cette manière"
diff --git a/lib/CatDap/I18N/hr.po b/lib/CatDap/I18N/hr.po
index be4837b..e355c3c 100644
--- a/lib/CatDap/I18N/hr.po
+++ b/lib/CatDap/I18N/hr.po
@@ -19,13 +19,13 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivacija"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Dodaj"
@@ -38,7 +38,7 @@ msgid "Add attribute"
msgstr "Dodaj atribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Dodaj korisnika %1 u novu grupu"
@@ -47,20 +47,24 @@ msgstr "Dodaj korisnika %1 u novu grupu"
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adrese se ne podudaraju"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Već postoji račun sa ovom email adresom"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Već postoji račun sa ovim korisničkim imenom"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -84,11 +88,11 @@ msgstr ""
msgid "Attribute"
msgstr "Atribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -100,6 +104,10 @@ msgstr "Promjeni"
msgid "Change password"
msgstr "Promjeni lozinku"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Promjeni instrukcija za aktivaciju emaila."
@@ -108,7 +116,7 @@ msgstr "Promjeni instrukcija za aktivaciju emaila."
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Potvrdi email adresu"
@@ -123,13 +131,13 @@ msgstr "Trenutna lozinka"
msgid "Dear %1,"
msgstr "Dragi %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Izbriši"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Izbriši korisnika %1 iz postojeće grupe:"
@@ -137,14 +145,18 @@ msgstr "Izbriši korisnika %1 iz postojeće grupe:"
msgid "Edit"
msgstr "Uredi"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Email adresa"
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Email je poslan."
@@ -153,7 +165,7 @@ msgstr "Email je poslan."
msgid "Enter new password."
msgstr "Unesite novu lozinku."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Unesite tekst"
@@ -162,7 +174,7 @@ msgstr "Unesite tekst"
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Ime"
@@ -174,7 +186,7 @@ msgstr "Zaboravili ste vašu lozinku?"
msgid "Forgotten password"
msgstr "Zaboravljena lozinka"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
" \n"
@@ -184,15 +196,11 @@ msgstr ""
msgid "Full Name"
msgstr "Puno ime"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Ime grupe"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Grupa sadrži nelegalne znakove"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Ime grupe"
@@ -208,20 +216,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Neispravna email adresa"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Neispravno korisničko ime"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Neispravno korisničko ime, već ga koristi sustav"
@@ -229,11 +237,11 @@ msgstr "Neispravno korisničko ime, već ga koristi sustav"
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Odjava"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Prijava"
@@ -241,7 +249,7 @@ msgstr "Prijava"
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -250,7 +258,7 @@ msgstr ""
msgid "New Password"
msgstr "Nova lozinka"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nove lozinke se ne podudaraju"
@@ -258,11 +266,11 @@ msgstr "Nove lozinke se ne podudaraju"
msgid "Operation was successful."
msgstr "Operacija je bila uspješna."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Lozinka:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Neispravna lozinka"
@@ -274,7 +282,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informacije o lozinki"
@@ -290,10 +298,6 @@ msgstr "Molim koristite izbornike gore."
msgid "Primary group"
msgstr "Primarna grupa"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -302,10 +306,15 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registriraj"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registracija je zaršena"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registracija je zaršena"
@@ -319,35 +328,62 @@ msgstr "Registracija je bila uspješna."
msgid "Repeat New Password"
msgstr "Ponovi novu lozinku"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Ponovi lozinku"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Traži"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Postavi novu lozinku"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Uspjeh"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Prezime"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -367,7 +403,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Nadogradi"
@@ -379,7 +415,7 @@ msgstr "Korisničko ime"
msgid "Username : "
msgstr "Korisničko ime:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -388,6 +424,24 @@ msgstr ""
msgid "Value"
msgstr "Vrijednost"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -405,11 +459,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "sadrži"
@@ -417,19 +471,19 @@ msgstr "sadrži"
msgid "delete"
msgstr "izbriši"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "veći ili jednak"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "manji od"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "član"
@@ -440,3 +494,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "Ime grupe"
diff --git a/lib/CatDap/I18N/hu.po b/lib/CatDap/I18N/hu.po
index 6351832..5cc3ea0 100644
--- a/lib/CatDap/I18N/hu.po
+++ b/lib/CatDap/I18N/hu.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Zoltan Siposs <zoltan.siposs@gmail.com>, 2015
msgid ""
@@ -10,20 +10,21 @@ msgstr ""
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2015-12-29 21:03+0000\n"
"Last-Translator: Zoltan Siposs <zoltan.siposs@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
+"language/hu/)\n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktiválás"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Hozzáadás"
@@ -36,7 +37,7 @@ msgid "Add attribute"
msgstr "Tulajdonság hozzáadása"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "%1 nevű felhasználó hozzáadása új csoporthoz"
@@ -45,32 +46,40 @@ msgstr "%1 nevű felhasználó hozzáadása új csoporthoz"
msgid "Adding objectclass %1 to dn %2"
msgstr "%1 nevű objektumosztály hozzáadása a %2 nevű dn-hez."
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "A címek nem egyeznek"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Ezzel az email címmel már létezik fiók"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Ilyen nevű felhasználó már létezik"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
+"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 "Az email küldése közben hiba történt, de a fiókod létrejött. Ha megfelelő email címet adtál meg, próbálkozz a jelszóvisszaállítással! Hiba: %1"
+msgstr ""
+"Az email küldése közben hiba történt, de a fiókod létrejött. Ha megfelelő "
+"email címet adtál meg, próbálkozz a jelszóvisszaállítással! Hiba: %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
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 "Az email küldése közben hiba történt, de a fiókod létrejött. Próbálkozz a jelszóvisszaállítással ha megfelelő email címet adtál meg: %1"
+"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 ""
+"Az email küldése közben hiba történt, de a fiókod létrejött. Próbálkozz a "
+"jelszóvisszaállítással ha megfelelő email címet adtál meg: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
@@ -82,11 +91,13 @@ msgstr "Az email küldése közben hiba történt, próbálkozz később! Hiba:
msgid "Attribute"
msgstr "Tulajdonság"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
-msgstr "Nem tudom ellenőrizni a /etc/passwd fájlt, értesítsd a rendszeradminisztrátort!"
+msgstr ""
+"Nem tudom ellenőrizni a /etc/passwd fájlt, értesítsd a "
+"rendszeradminisztrátort!"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -98,6 +109,10 @@ msgstr "Változtatás"
msgid "Change password"
msgstr "Jelszó megváltoztatása"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Nézd meg az emailjeidet az aktivációs lépésekért!"
@@ -106,7 +121,7 @@ msgstr "Nézd meg az emailjeidet az aktivációs lépésekért!"
msgid "Check your mail for password reset instructions."
msgstr "Nézd meg az emailjeidet a jelszóvisszaállítási lépésekért!"
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Email cím megerősítése"
@@ -121,13 +136,13 @@ msgstr "Jelenlegi jelszó"
msgid "Dear %1,"
msgstr "Kedves %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Törlés"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "%1 nevű felhasználó törlése egy létező csoportból:"
@@ -135,14 +150,19 @@ msgstr "%1 nevű felhasználó törlése egy létező csoportból:"
msgid "Edit"
msgstr "Módosítás"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Email cím"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Ez a felhasználónév nem engedélyezett"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Email elküldve"
@@ -151,7 +171,7 @@ msgstr "Email elküldve"
msgid "Enter new password."
msgstr "Új jelszó"
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Szöveg beírása"
@@ -160,7 +180,7 @@ msgstr "Szöveg beírása"
msgid "Error while searching for account: "
msgstr "Hiba történt a felhasználói fiók keresése közben:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Keresztnév"
@@ -172,7 +192,7 @@ msgstr "Elfelejtett edjelszavad?"
msgid "Forgotten password"
msgstr "Elfelejtett jelszó"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Elfelejtett jelszó?"
@@ -180,15 +200,11 @@ msgstr "Elfelejtett jelszó?"
msgid "Full Name"
msgstr "Teljes név"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Csoportnév"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "A csoport nevében nem megfelelő karakterek vannak"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Csoportnév"
@@ -204,20 +220,20 @@ msgstr "A keresési feltételnek megfelelő csoportok"
msgid "Groups you manage"
msgstr "Az általad kezelt csoportok"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Helyetelen érvényesítő szöveg, próbáld újra!"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Érvénytelen email cím"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Érvénytelen felhasználónév"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Érvénytelen felhasználónév, a rendszer által foglalt"
@@ -225,11 +241,11 @@ msgstr "Érvénytelen felhasználónév, a rendszer által foglalt"
msgid "List of users promoted :"
msgstr "Az előléptetett felhasználók listája:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Kijelentkezés"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Bejelentkezés"
@@ -237,7 +253,7 @@ msgstr "Bejelentkezés"
msgid "More than one ID Pool"
msgstr "Egynél több ID Pool van"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Több mint egy illeszkedő bejegyzés"
@@ -246,7 +262,7 @@ msgstr "Több mint egy illeszkedő bejegyzés"
msgid "New Password"
msgstr "Új jelszó"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Az új jelszavak nem egyeznek"
@@ -254,11 +270,11 @@ msgstr "Az új jelszavak nem egyeznek"
msgid "Operation was successful."
msgstr "A művelet sikeres volt"
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Jelszó:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Helytelen jelszó"
@@ -270,7 +286,7 @@ msgstr "A jelszó visszaállítva, email kiküldve"
msgid "Password reset failed: "
msgstr "A jelszó visszaállítása nem sikerült"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Személyes adatok"
@@ -286,22 +302,25 @@ msgstr "Használd a fenti menüt"
msgid "Primary group"
msgstr "Elsődleges csoport"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "A kiemelt felhasználók jelszava nem állítható vissza ezzel az eljárással"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Előléptetés"
#: root/admin/account_modify.tt:62
msgid "Promote user to posixAccount with primary group:"
-msgstr "A felhasználó előléptetve posixAccount-ként, a következő elsődleges csoportttal:"
+msgstr ""
+"A felhasználó előléptetve posixAccount-ként, a következő elsődleges "
+"csoportttal:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Regisztráció"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "A regisztráció elkészült"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "A regisztráció elkészült"
@@ -315,35 +334,62 @@ msgstr "A regisztráció sikeres volt."
msgid "Repeat New Password"
msgstr "Az új jelszó ismét"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Jelszó törlése"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Keresés"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Keresés ez alapján"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Új jelszó megadása"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Sikerült"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Vezetéknév"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "A megadott keresztnév helytelen karaktereket tartalmaz"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "A megadott vezetéknév helytelen karaktereket tartalmaz"
@@ -363,7 +409,7 @@ msgstr "A jelszó visszaállításához kövesd az alábbi linket!"
msgid "Transaction ID mismatch"
msgstr "A tranzakciós azonosító nem egyezik"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Frissítés"
@@ -375,7 +421,7 @@ msgstr "Felhasználónév"
msgid "Username : "
msgstr "Felhasználónév:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Ez a felhasználónév nem engedélyezett"
@@ -384,29 +430,49 @@ msgstr "Ez a felhasználónév nem engedélyezett"
msgid "Value"
msgstr "Érték"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "Valaki jelszóváltoztatást kezdeményezett a %1 nevű fiókodon. Ha nem te voltál, vagy mégsem akarod megváltoztatni a jelszót, nem kell tenned semmit."
+"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 ""
+"Valaki jelszóváltoztatást kezdeményezett a %1 nevű fiókodon. Ha nem te "
+"voltál, vagy mégsem akarod megváltoztatni a jelszót, nem kell tenned semmit."
#. (c.config.organisation)
#: root/email/activation.tt:2
-msgid ""
-"Your %1 account has been successfully created, but requires activation."
-msgstr "A %1 nevű felhasználói fiókod sikeresen létrejött, de még aktiválni kell."
+msgid "Your %1 account has been successfully created, but requires activation."
+msgstr ""
+"A %1 nevű felhasználói fiókod sikeresen létrejött, de még aktiválni kell."
#. (c.user.username)
#: root/email/admin/password.tt:3
msgid "Your password was reset by %1"
msgstr "A jelszavadat visszaállította: %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "A munkameneted lejárt."
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "tartalmazza"
@@ -414,19 +480,19 @@ msgstr "tartalmazza"
msgid "delete"
msgstr "törlés"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "nagyobb vagy egyenlő"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "pontosan"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "kevesebb mint"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "tag"
@@ -437,3 +503,10 @@ msgstr "jelszótörlés"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "értékkel"
+
+#~ msgid "Group Name"
+#~ msgstr "Csoportnév"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "A kiemelt felhasználók jelszava nem állítható vissza ezzel az eljárással"
diff --git a/lib/CatDap/I18N/id.po b/lib/CatDap/I18N/id.po
index e1c50e8..42782c1 100644
--- a/lib/CatDap/I18N/id.po
+++ b/lib/CatDap/I18N/id.po
@@ -10,17 +10,19 @@ msgstr ""
"PO-Revision-Date: 2012-12-21 15:10+0700\n"
"Last-Translator: Kiki Syahadat <kiki.syahadat@yahoo.co.id>\n"
"Language-Team: Indonesian <mageia-i18n@mageia.org>\n"
+"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivasi"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11 root/admin/account_modify.tt:24 root/admin/group_modify.tt:21 root/user/index.tt:19 root/user/index.tt:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Tambah"
@@ -33,7 +35,7 @@ msgid "Add attribute"
msgstr "Tambah atribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Tambahkan pengguna %1 ke grup baru"
@@ -42,42 +44,59 @@ msgstr "Tambahkan pengguna %1 ke grup baru"
msgid "Adding objectclass %1 to dn %2"
msgstr "Menambahkan kelas-objek %1 ke dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Alamat tidak cocok"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Sebuah akun sudah ada dengan alamat email ini"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Sebuah akun sudah ada dengan nama pengguna ini"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
-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 "Terjadi error saat mengirim email, tapi akun Anda telah dibuat. Silakan coba proses pemulihan sandi jika Anda sudah memasukkan alamat email yang benar. Error %1"
+#: lib/CatDap/Controller/register.pm:154
+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 ""
+"Terjadi error saat mengirim email, tapi akun Anda telah dibuat. Silakan coba "
+"proses pemulihan sandi jika Anda sudah memasukkan alamat email yang benar. "
+"Error %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
-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 "Terjadi error saat mengirim email, tapi akun Anda telah dibuat. Silakan coba proses pemulihan sandi jika Anda sudah memasukkan alamat email yang benar: %1"
+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 ""
+"Terjadi error saat mengirim email, tapi akun Anda telah dibuat. Silakan coba "
+"proses pemulihan sandi jika Anda sudah memasukkan alamat email yang benar: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
-msgstr "Terjadi error saat mengirim email, silakan coba lagi lain waktu. Error %1"
+msgstr ""
+"Terjadi error saat mengirim email, silakan coba lagi lain waktu. Error %1"
-#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
+#: 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 "Atribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
-msgstr "Tidak bisa memeriksa /etc/passwd, silakan peringatkan administrator sistem"
+msgstr ""
+"Tidak bisa memeriksa /etc/passwd, silakan peringatkan administrator sistem"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -89,6 +108,10 @@ msgstr "Ubah"
msgid "Change password"
msgstr "Ubah sandi"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Periksa email Anda untuk instruksi aktivasi."
@@ -97,7 +120,7 @@ msgstr "Periksa email Anda untuk instruksi aktivasi."
msgid "Check your mail for password reset instructions."
msgstr "Periksa email Anda untuk instruksi mereset sandi."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Konfirmasi alamat Email"
@@ -107,16 +130,18 @@ msgstr "Sandi saat ini"
#. (cn)
#. (entry.cn)
-#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_password.tt:1
+#: root/email/activation.tt:1 root/email/admin/password.tt:1
+#: root/email/forgot_password.tt:1
msgid "Dear %1,"
msgstr "Yang terhormat %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Hapus"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Hapus pengguna %1 dari grup yang ada:"
@@ -124,14 +149,19 @@ msgstr "Hapus pengguna %1 dari grup yang ada:"
msgid "Edit"
msgstr "Edit"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Alamat email"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Nama pengguna tidak diizinkan untuk digunakan"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Email terkirim."
@@ -140,15 +170,16 @@ msgstr "Email terkirim."
msgid "Enter new password."
msgstr "Masukkan sandi baru."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Masukkan teks"
-#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76
+#: lib/CatDap/Controller/forgot_password.pm:62
+#: lib/CatDap/Controller/forgot_password.pm:76
msgid "Error while searching for account: "
msgstr "Error saat mencari akun: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Nama depan"
@@ -160,7 +191,7 @@ msgstr "Lupa sandi Anda?"
msgid "Forgotten password"
msgstr "Lupa sandi"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Lupa sandi?"
@@ -168,15 +199,11 @@ msgstr "Lupa sandi?"
msgid "Full Name"
msgstr "Nama Lengkap"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nama Grup"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Grup berisi karakter yang tidak sah"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nama grup"
@@ -192,19 +219,20 @@ msgstr "Grup yang cocok dengan kriteria pencarian"
msgid "Groups you manage"
msgstr "Grup yang Anda kelola"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Teks validasi salah, silakan coba lagi"
-#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/forgot_password.pm:45
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Alamat email salah"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Nama pengguna salah"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nama penguna salah, sudah digunakan oleh sistem"
@@ -212,11 +240,11 @@ msgstr "Nama penguna salah, sudah digunakan oleh sistem"
msgid "List of users promoted :"
msgstr "Daftar pengguna yang dipromosikan :"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Keluar"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Masuk"
@@ -224,15 +252,16 @@ msgstr "Masuk"
msgid "More than one ID Pool"
msgstr "Lebih dari satu Pool ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Lebih dari satu daftar yang cocok"
-#: root/forgot_password/confirm.tt:8 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:9
msgid "New Password"
msgstr "Sandi Baru"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Sandi baru tidak cocok"
@@ -240,11 +269,11 @@ msgstr "Sandi baru tidak cocok"
msgid "Operation was successful."
msgstr "Operasi berhasil."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Sandi : "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Sandi salah"
@@ -256,7 +285,7 @@ msgstr "Reset sandi dan email terkirim"
msgid "Password reset failed: "
msgstr "Reset sandi gagal: "
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informasi Pribadi"
@@ -272,10 +301,6 @@ msgstr "Silakan gunakan menu di atas."
msgid "Primary group"
msgstr "Grup primer"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Akun istimewa mungkin tidak memulihkan sandi melalui mekanisme ini"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promosikan"
@@ -284,10 +309,15 @@ msgstr "Promosikan"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promosikan pengguna ke possixAccount dengan grup primer:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Register"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrasi selesai"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrasi selesai"
@@ -296,39 +326,67 @@ msgstr "Registrasi selesai"
msgid "Registration was successful."
msgstr "Registrasi berhasil."
-#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
+#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr "Ulangi Sandi Baru"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Reset sandi"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Cari"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Cari dengan"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Atur sandi baru"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Berhasil"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Nama asli"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Nama depan yang diberikan berisi karakter yang tidak sah"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Nama asli yang diberikan berisi karakter yang tidak sah"
@@ -348,7 +406,7 @@ msgstr "Untuk mereset sandi Anda, silakan ikuti link di bawah."
msgid "Transaction ID mismatch"
msgstr "ID transaksi tidak cocok"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Update"
@@ -360,18 +418,41 @@ msgstr "Nama pengguna"
msgid "Username : "
msgstr "Nama pengguna : "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Nama pengguna tidak diizinkan untuk digunakan"
-#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9 root/admin/group_modify.tt:6 root/user/index.tt:4
+#: 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 "Nilai"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "Akun %1 Anda meminta perubahan sandi. Jika Anda tidak melakukan ini, atau Anda tidak ingin mengubah sandi; Anda tidak perlu melakukan apapun."
+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 ""
+"Akun %1 Anda meminta perubahan sandi. Jika Anda tidak melakukan ini, atau "
+"Anda tidak ingin mengubah sandi; Anda tidak perlu melakukan apapun."
#. (c.config.organisation)
#: root/email/activation.tt:2
@@ -383,11 +464,11 @@ msgstr "Akun %1 Anda telah berhasil dibuat, tapi memerlukan aktivasi."
msgid "Your password was reset by %1"
msgstr "Sandi Anda direset oleh %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Sesi Anda telah kadaluarsa"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "berisi"
@@ -395,19 +476,19 @@ msgstr "berisi"
msgid "delete"
msgstr "hapus"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "lebih besar atau sama dengan"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "adalah tepat"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "kurang dari"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "anggota"
@@ -418,3 +499,9 @@ msgstr "reset sandi"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "dengan nilai"
+
+#~ msgid "Group Name"
+#~ msgstr "Nama Grup"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "Akun istimewa mungkin tidak memulihkan sandi melalui mekanisme ini"
diff --git a/lib/CatDap/I18N/it.po b/lib/CatDap/I18N/it.po
index 73daef0..71ed599 100644
--- a/lib/CatDap/I18N/it.po
+++ b/lib/CatDap/I18N/it.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Attivazione"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Aggiungi"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "Aggiungi un attributo"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Aggiungi utente %1 a un nuovo gruppo"
@@ -46,20 +46,24 @@ msgstr "Aggiungi utente %1 a un nuovo gruppo"
msgid "Adding objectclass %1 to dn %2"
msgstr "Aggiungi objectclass %1 al dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Gli Indirizzi non sono uguali"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Un account con questo indirizzo di email esiste già"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Un account con questo username esiste già"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -91,13 +95,13 @@ msgstr ""
msgid "Attribute"
msgstr "Attribuito"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Non è stato possibile controllare il file /etc/passwd, per favore informa "
"l'amministratore di sistema."
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -109,6 +113,10 @@ msgstr "Modifica"
msgid "Change password"
msgstr "Modifica la password"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Controlla la tua email per le istruzioni di attivazione."
@@ -117,7 +125,7 @@ msgstr "Controlla la tua email per le istruzioni di attivazione."
msgid "Check your mail for password reset instructions."
msgstr "Controlla la tua email per le istruzioni di reset della password."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Conferma l'indirizzo di email"
@@ -132,13 +140,13 @@ msgstr "Password attuale"
msgid "Dear %1,"
msgstr "Caro %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Cancella"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Rimuovi l'utente %1 da un gruppo esistente:"
@@ -146,14 +154,19 @@ msgstr "Rimuovi l'utente %1 da un gruppo esistente:"
msgid "Edit"
msgstr "Modifica"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Indirizzo di email"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Il nome utente non è autorizzato ad essere usato. "
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Email spedita."
@@ -162,7 +175,7 @@ msgstr "Email spedita."
msgid "Enter new password."
msgstr "Inserisci la nuova password."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Inserisci il testo"
@@ -171,7 +184,7 @@ msgstr "Inserisci il testo"
msgid "Error while searching for account: "
msgstr "Errore nella ricerca dell'account:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Nome"
@@ -183,7 +196,7 @@ msgstr "Hai dimenticato la password?"
msgid "Forgotten password"
msgstr "Password dimenticata"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Password dimenticata?"
@@ -191,15 +204,11 @@ msgstr "Password dimenticata?"
msgid "Full Name"
msgstr "Nome compelto"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nome del gruppo"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Gruppi contenenti caratteri non consentiti"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nome del gruppo"
@@ -215,20 +224,20 @@ msgstr "Gruppi che corrispondono ai criteri di ricerca"
msgid "Groups you manage"
msgstr "Gruppi che gestisci"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Il testo di validazione è errato, per favore prova nuovamente"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Indirizzo di email non valido"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "username non valido"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "username non valido, già usato dal sistema"
@@ -236,11 +245,11 @@ msgstr "username non valido, già usato dal sistema"
msgid "List of users promoted :"
msgstr "Lista di utenti promossi:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Logout"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Login"
@@ -248,7 +257,7 @@ msgstr "Login"
msgid "More than one ID Pool"
msgstr "Più di una corrispondenza ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Più di una voce corrispondente"
@@ -257,7 +266,7 @@ msgstr "Più di una voce corrispondente"
msgid "New Password"
msgstr "Nuova password"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "La nuova password non corrisponde"
@@ -265,11 +274,11 @@ msgstr "La nuova password non corrisponde"
msgid "Operation was successful."
msgstr "L'operazione è andata a buon fine."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Password:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Password errata"
@@ -281,7 +290,7 @@ msgstr "Password cancellata ed email spedita"
msgid "Password reset failed: "
msgstr "Modifica della password fallita:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informazione personali"
@@ -297,12 +306,6 @@ msgstr "Per favore usa i menù di sopra."
msgid "Primary group"
msgstr "Gruppo primario"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Gli account privilegiati non possono eseguire il recupero password con "
-"questo metodo."
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promuovi"
@@ -311,10 +314,15 @@ msgstr "Promuovi"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promuovi l'utente a posixAccount con il gruppo primario:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registra"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrazione completata"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrazione completata"
@@ -328,35 +336,62 @@ msgstr "la registrazione è andata a buon fine."
msgid "Repeat New Password"
msgstr "Ripeti la nuova password"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Cancella la password"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Cerca"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Cerca per"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Imposta la nuova password"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Successo"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Cognome"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Il nome fornito contiene caratteri non consentiti"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Il cognome fornito contiene caratteri non consentiti"
@@ -376,7 +411,7 @@ msgstr "Per cancellare la tua password, per favore segui il link sotto."
msgid "Transaction ID mismatch"
msgstr "L'ID della transazione non corrisponde"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Aggiorna"
@@ -388,7 +423,7 @@ msgstr "Utente"
msgid "Username : "
msgstr "Utente:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Il nome utente non è autorizzato ad essere usato. "
@@ -397,6 +432,24 @@ msgstr "Il nome utente non è autorizzato ad essere usato. "
msgid "Value"
msgstr "Valore"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -416,11 +469,11 @@ msgstr "L'account %1 è stato creato con successo, ma richiede l'attivazione."
msgid "Your password was reset by %1"
msgstr "La tua password è stata reimpostata da %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "La tua sessione è terminata"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "contiene"
@@ -428,19 +481,19 @@ msgstr "contiene"
msgid "delete"
msgstr "cancella"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "maggiore o uguale a"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "è esattamente"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "minore di"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "membro"
@@ -451,3 +504,11 @@ msgstr "password reset"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "con valore"
+
+#~ msgid "Group Name"
+#~ msgstr "Nome del gruppo"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Gli account privilegiati non possono eseguire il recupero password con "
+#~ "questo metodo."
diff --git a/lib/CatDap/I18N/ja.po b/lib/CatDap/I18N/ja.po
index 0f5a267..3fc6e26 100644
--- a/lib/CatDap/I18N/ja.po
+++ b/lib/CatDap/I18N/ja.po
@@ -17,13 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "追加"
@@ -36,7 +36,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -45,20 +45,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -82,11 +86,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -98,6 +102,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -106,7 +114,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -121,13 +129,13 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "削除"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -135,14 +143,18 @@ msgstr ""
msgid "Edit"
msgstr "編集"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -151,7 +163,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -160,7 +172,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -172,7 +184,7 @@ msgstr ""
msgid "Forgotten password"
msgstr "パスワードを忘れました"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -180,15 +192,11 @@ msgstr ""
msgid "Full Name"
msgstr "フルネーム"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "グループ名"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "グループ名"
@@ -204,20 +212,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -225,11 +233,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -237,7 +245,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -246,7 +254,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -254,11 +262,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -270,7 +278,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -286,10 +294,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -298,10 +302,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -315,35 +323,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -363,7 +398,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "更新"
@@ -375,7 +410,7 @@ msgstr "ユーザ名"
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -384,6 +419,24 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -401,11 +454,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -413,19 +466,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -436,3 +489,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "グループ名"
diff --git a/lib/CatDap/I18N/ko.po b/lib/CatDap/I18N/ko.po
index c70f689..b87dd94 100644
--- a/lib/CatDap/I18N/ko.po
+++ b/lib/CatDap/I18N/ko.po
@@ -17,13 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "추가"
@@ -36,7 +36,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -45,20 +45,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -82,11 +86,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -98,6 +102,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -106,7 +114,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -121,13 +129,13 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "삭제"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -135,14 +143,18 @@ msgstr ""
msgid "Edit"
msgstr "편집"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -151,7 +163,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -160,7 +172,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -172,7 +184,7 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -180,15 +192,11 @@ msgstr ""
msgid "Full Name"
msgstr "전체 이름"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "그룹 이름"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -204,20 +212,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -225,11 +233,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -237,7 +245,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -246,7 +254,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -254,11 +262,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -270,7 +278,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -286,10 +294,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -298,10 +302,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -315,35 +323,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -363,7 +398,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "업데이트 버전"
@@ -375,7 +410,7 @@ msgstr "사용자명"
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -384,6 +419,24 @@ msgstr ""
msgid "Value"
msgstr "값"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -401,11 +454,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -413,19 +466,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -436,3 +489,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "그룹 이름"
diff --git a/lib/CatDap/I18N/lt.po b/lib/CatDap/I18N/lt.po
index 5eb5a00..db86a91 100644
--- a/lib/CatDap/I18N/lt.po
+++ b/lib/CatDap/I18N/lt.po
@@ -20,13 +20,13 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
"%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktyvavimas"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Pridėti"
@@ -39,7 +39,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -48,20 +48,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresai nesutampa"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -85,11 +89,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Saugos kodas"
@@ -101,6 +105,10 @@ msgstr "Keisti"
msgid "Change password"
msgstr "Keisti slaptažodį"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -109,7 +117,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -124,13 +132,13 @@ msgstr "Dabartinis slaptažodis"
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Ištrinti"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -138,14 +146,18 @@ msgstr ""
msgid "Edit"
msgstr "Taisyti"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "El. pašto adresas"
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "El. paštas išsiųstas."
@@ -154,7 +166,7 @@ msgstr "El. paštas išsiųstas."
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -163,7 +175,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -175,7 +187,7 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -183,15 +195,11 @@ msgstr ""
msgid "Full Name"
msgstr "Vardas, pavardė"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Grupės pavadinimas"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -207,20 +215,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -228,11 +236,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -240,7 +248,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -249,7 +257,7 @@ msgstr ""
msgid "New Password"
msgstr "Naujas Slaptažodis"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nauji slaptažodžiai nesutampa"
@@ -257,11 +265,11 @@ msgstr "Nauji slaptažodžiai nesutampa"
msgid "Operation was successful."
msgstr "Operacija buvo sėkminga."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Slaptažodis : "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -273,7 +281,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Asmeninė informacija"
@@ -289,10 +297,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -301,10 +305,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -318,35 +326,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Paieška"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -366,7 +401,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Atnaujinti"
@@ -378,7 +413,7 @@ msgstr "Vartotojas"
msgid "Username : "
msgstr "Naudotojo vardas : "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -387,6 +422,24 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -404,11 +457,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -416,19 +469,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -439,3 +492,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "Grupės pavadinimas"
diff --git a/lib/CatDap/I18N/lv.po b/lib/CatDap/I18N/lv.po
index 8a57f5a..87f1843 100644
--- a/lib/CatDap/I18N/lv.po
+++ b/lib/CatDap/I18N/lv.po
@@ -18,13 +18,13 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
"2);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Pievienot"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -46,20 +46,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -83,11 +87,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -99,6 +103,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -107,7 +115,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -122,13 +130,13 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Dzēst"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -136,14 +144,18 @@ msgstr ""
msgid "Edit"
msgstr "Rediģēt"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -152,7 +164,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -161,7 +173,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -173,7 +185,7 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -181,15 +193,11 @@ msgstr ""
msgid "Full Name"
msgstr "Pilns vārds"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Grupas nosaukums"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -205,20 +213,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -226,11 +234,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -238,7 +246,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -247,7 +255,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -255,11 +263,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -271,7 +279,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -287,10 +295,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -299,10 +303,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -316,35 +324,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -364,7 +399,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Atjaunināt"
@@ -376,7 +411,7 @@ msgstr "Lietotāja vārds"
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -385,6 +420,24 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -402,11 +455,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -414,19 +467,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -437,3 +490,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "Grupas nosaukums"
diff --git a/lib/CatDap/I18N/messages.pot b/lib/CatDap/I18N/messages.pot
index a45f4ca..a11a076 100644
--- a/lib/CatDap/I18N/messages.pot
+++ b/lib/CatDap/I18N/messages.pot
@@ -15,11 +15,11 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr ""
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11 root/admin/account_modify.tt:24 root/admin/group_modify.tt:21 root/user/index.tt:19 root/user/index.tt:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12 root/admin/account_modify.tt:24 root/admin/group_modify.tt:21 root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr ""
@@ -32,7 +32,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -41,20 +41,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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 ""
@@ -72,11 +76,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -88,6 +92,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -96,7 +104,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -110,12 +118,12 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27 root/user/index.tt:24
msgid "Delete"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -123,14 +131,18 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -139,7 +151,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -147,7 +159,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -159,7 +171,7 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -167,15 +179,11 @@ msgstr ""
msgid "Full Name"
msgstr ""
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr ""
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -191,19 +199,19 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -211,11 +219,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -223,7 +231,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -231,7 +239,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -239,11 +247,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -255,7 +263,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -271,10 +279,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -283,10 +287,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -299,35 +307,60 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid "Send an email containing a link to change their password to the following addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -347,7 +380,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr ""
@@ -359,7 +392,7 @@ msgstr ""
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -367,6 +400,21 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid "You have a privileged account, and may not recover your password this way: please get in touch with a member of the sysadmin team (#mageia-sysadm on IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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."
@@ -382,11 +430,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -394,19 +442,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
diff --git a/lib/CatDap/I18N/nb.po b/lib/CatDap/I18N/nb.po
index 4cdeba4..ecb49e4 100644
--- a/lib/CatDap/I18N/nb.po
+++ b/lib/CatDap/I18N/nb.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivering"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Legg til"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "Legg til atributt"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Legg til bruker %1 i en ny gruppe"
@@ -46,20 +46,24 @@ msgstr "Legg til bruker %1 i en ny gruppe"
msgid "Adding objectclass %1 to dn %2"
msgstr "Legg til objektklasse %1 til dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adressene er ikke like"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "En konto finnes allerede med denne e-post adressen"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "En konto finnes allere med dette navnet"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -91,11 +95,11 @@ msgstr ""
msgid "Attribute"
msgstr "Atributt"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "Kan ikke sjekke /etc/passwd, vennligst kontakt system admin"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -107,6 +111,10 @@ msgstr "Endre"
msgid "Change password"
msgstr "Bytt passord"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Sjekk e-posten for aktiverings instruksjoner"
@@ -115,7 +123,7 @@ msgstr "Sjekk e-posten for aktiverings instruksjoner"
msgid "Check your mail for password reset instructions."
msgstr "Sjekk e-posten for instruksjoner om hvordan du bytter passord."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Bekreft e-post adresse"
@@ -130,13 +138,13 @@ msgstr "Nåværende passord"
msgid "Dear %1,"
msgstr "Kjære %1"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Slett"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Slett bruker %1 fra en eksisterende gruppe:"
@@ -144,14 +152,19 @@ msgstr "Slett bruker %1 fra en eksisterende gruppe:"
msgid "Edit"
msgstr "Rediger"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-post"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-postadresse"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Brukernavnet er ikke autorisert for bruk"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-post er sendt."
@@ -160,7 +173,7 @@ msgstr "E-post er sendt."
msgid "Enter new password."
msgstr "Skriv inn nytt passord."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Skriv tekst"
@@ -169,7 +182,7 @@ msgstr "Skriv tekst"
msgid "Error while searching for account: "
msgstr "Feil ved søking etter konto:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Fornavn"
@@ -181,7 +194,7 @@ msgstr "Har du glemt passordet?"
msgid "Forgotten password"
msgstr "Glemt passord"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Glemt passord?"
@@ -189,15 +202,11 @@ msgstr "Glemt passord?"
msgid "Full Name"
msgstr "Fullt navn"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Gruppenavn"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Gruppenavn inneholder ulovlige tegn"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Gruppenavn"
@@ -213,20 +222,20 @@ msgstr "Grupper oppfyller søkekriteria"
msgid "Groups you manage"
msgstr "Grupper du administrerer"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Feil valideringstekst, prøv igjen"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Ugyldig e-post adresse"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Ugyldig brukernavn"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Ugyldig brukernavn, er allerede i bruk på systemet"
@@ -234,11 +243,11 @@ msgstr "Ugyldig brukernavn, er allerede i bruk på systemet"
msgid "List of users promoted :"
msgstr "Liste over promoterte brukere:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Logg ut"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Logg inn"
@@ -246,7 +255,7 @@ msgstr "Logg inn"
msgid "More than one ID Pool"
msgstr "Mer enn en ID pool"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Mer enn en oppføring finnes"
@@ -255,7 +264,7 @@ msgstr "Mer enn en oppføring finnes"
msgid "New Password"
msgstr "Nytt passord"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nye passord stemmer ikke"
@@ -263,11 +272,11 @@ msgstr "Nye passord stemmer ikke"
msgid "Operation was successful."
msgstr "Operasjonen var vellykket."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Passord :"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Feil passord"
@@ -279,7 +288,7 @@ msgstr "Passor er gjenopprettet og e-post er sendt"
msgid "Password reset failed: "
msgstr "Gjenoppretting av passord feilet:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Personlig informasjon"
@@ -295,10 +304,6 @@ msgstr "Vennligst bruk menyene over"
msgid "Primary group"
msgstr "Primærgruppe"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Priviligerte konti kan ikke gjenopprette passord via denne mekanismen"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promotere"
@@ -307,10 +312,15 @@ msgstr "Promotere"
msgid "Promote user to posixAccount with primary group:"
msgstr "Få brukere til posixKonto med primærgruppe:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registrer"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrering ferdig"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrering ferdig"
@@ -324,35 +334,62 @@ msgstr "Registreringen lyktes"
msgid "Repeat New Password"
msgstr "Gjenta nytt passord"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Gjenopprett passordet"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Søk"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Søk med"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Skriv inn nytt passord."
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Suksess"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Etternavn"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Oppgitt fornavn inneholder ugyldige tegn"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Oppgitt etternavn inneholder ugyldige tegn"
@@ -372,7 +409,7 @@ msgstr "For å gjenopprette passordet, vennligst følg lenken under."
msgid "Transaction ID mismatch"
msgstr "Transaksjons ID mismatch"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Oppdater"
@@ -384,7 +421,7 @@ msgstr "Brukernavn"
msgid "Username : "
msgstr "Brukernavn:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Brukernavnet er ikke autorisert for bruk"
@@ -393,6 +430,24 @@ msgstr "Brukernavnet er ikke autorisert for bruk"
msgid "Value"
msgstr "Verdi"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -412,11 +467,11 @@ msgstr "Din %1 konto er opprettet, men krever aktivering."
msgid "Your password was reset by %1"
msgstr "Ditt passord ble gjenopprettet av %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Økten din er utgått"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "inneholder"
@@ -424,19 +479,19 @@ msgstr "inneholder"
msgid "delete"
msgstr "slett"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "større enn eller lik"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "er eksakt"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "mindre enn"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "medlem"
@@ -447,3 +502,10 @@ msgstr "passor gjenopprettet"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "med verdi"
+
+#~ msgid "Group Name"
+#~ msgstr "Gruppenavn"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Priviligerte konti kan ikke gjenopprette passord via denne mekanismen"
diff --git a/lib/CatDap/I18N/nl.po b/lib/CatDap/I18N/nl.po
index 0e13451..753450b 100644
--- a/lib/CatDap/I18N/nl.po
+++ b/lib/CatDap/I18N/nl.po
@@ -13,21 +13,20 @@ msgstr ""
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2015-11-23 10:51+0100\n"
"Last-Translator: Marja van Waes <marja@mageia.org>\n"
-"Language-Team: Dutch <i18n-nl@ml.mageia.org>"
-"nl/)\n"
+"Language-Team: Dutch <i18n-nl@ml.mageia.org>nl/)\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Activeren"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Toevoegen"
@@ -40,7 +39,7 @@ msgid "Add attribute"
msgstr "Attribuut toevoegen"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Gebruiker %1 toevoegen aan een nieuwe groep"
@@ -49,20 +48,24 @@ msgstr "Gebruiker %1 toevoegen aan een nieuwe groep"
msgid "Adding objectclass %1 to dn %2"
msgstr "Objectclass %1 wordt toegevoegd aan dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adressen komen niet overeen"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Er bestaat al een account met dit e-mailadres"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Er bestaat al een account met deze gebruikersnaam"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -96,13 +99,13 @@ msgstr ""
msgid "Attribute"
msgstr "Attribuut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Can /etc/password niet controleren, waarschuwt u alstublieft de "
"systeembeheerders"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -114,6 +117,10 @@ msgstr "Wijzig"
msgid "Change password"
msgstr "Verander paswoord"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Controleer uw e-mail for activatie instructies."
@@ -122,7 +129,7 @@ msgstr "Controleer uw e-mail for activatie instructies."
msgid "Check your mail for password reset instructions."
msgstr "Controleer uw e-mail voor instructies om uw paswoord te resetten."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Bevestig e-mailadres"
@@ -137,13 +144,13 @@ msgstr "Huidige paswoord"
msgid "Dear %1,"
msgstr "Beste %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Verwijder"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Gebruiker %1 verwijderen uit een bestaande groep:"
@@ -151,14 +158,19 @@ msgstr "Gebruiker %1 verwijderen uit een bestaande groep:"
msgid "Edit"
msgstr "Wijzig"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-mail"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-mailadres"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Deze gebruikersnaam mag niet gebruikt worden"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-mail verstuurd."
@@ -167,7 +179,7 @@ msgstr "E-mail verstuurd."
msgid "Enter new password."
msgstr "Voer uw nieuwe paswoord in."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Voer tekst in"
@@ -176,7 +188,7 @@ msgstr "Voer tekst in"
msgid "Error while searching for account: "
msgstr "Er is een fout opgetreden bij het zoeken naar account:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Voornaam"
@@ -188,7 +200,7 @@ msgstr "Bent u uw paswoord kwijt?"
msgid "Forgotten password"
msgstr "Paswoord kwijt"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Paswoord kwijt?"
@@ -196,15 +208,11 @@ msgstr "Paswoord kwijt?"
msgid "Full Name"
msgstr "Volledige naam"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Groepsnaam"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Groep bevat ongeldige tekens"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Groepsnaam"
@@ -220,20 +228,20 @@ msgstr "Groepen die overeenkomen met de zoektermen"
msgid "Groups you manage"
msgstr "Groepen die u beheert"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Incorrecte validatietekst, probeert u het nogmaals"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Ongeldig e-mailadres"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Ongeldige gebruikersnaam"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Ongeldige gebruikersnaam, al in gebruik door het systeem"
@@ -241,11 +249,11 @@ msgstr "Ongeldige gebruikersnaam, al in gebruik door het systeem"
msgid "List of users promoted :"
msgstr "Lijst van gepromoveerde gebruikers:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Uitloggen"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Inloggen"
@@ -253,7 +261,7 @@ msgstr "Inloggen"
msgid "More than one ID Pool"
msgstr "Meer dan één ID-pool"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Meer dan één input kwam overeen"
@@ -262,7 +270,7 @@ msgstr "Meer dan één input kwam overeen"
msgid "New Password"
msgstr "Nieuw paswoord"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nieuwe paswoorden komen niet overeen"
@@ -270,11 +278,11 @@ msgstr "Nieuwe paswoorden komen niet overeen"
msgid "Operation was successful."
msgstr "Operatie succesvol voltooid."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Paswoord :"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Paswoord incorrect"
@@ -286,7 +294,7 @@ msgstr "Paswoord gereset en e-mail verstuurd"
msgid "Password reset failed: "
msgstr "Paswoord resetten faalde: "
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Persoonlijke informatie"
@@ -302,12 +310,6 @@ msgstr "Gebruikt u de bovenstaande menu's."
msgid "Primary group"
msgstr "Primaire groep"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Paswoorden van bevoorrechte accounts kunnen niet via dit proces herstelt "
-"worden"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promoveer"
@@ -316,10 +318,15 @@ msgstr "Promoveer"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promoveer gebruiker naar posix-account met primaire groep:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registreren"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registratie afgerond"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registratie afgerond"
@@ -333,35 +340,62 @@ msgstr "Registratie was succesvol."
msgid "Repeat New Password"
msgstr "Herhaal uw nieuwe paswoord"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Paswoord opnieuw instellen"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Zoek"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Zoeken op"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Nieuw paswoord instellen"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Succes"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Achternaam"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "De opgegeven voornaam bevat niet toegestane tekens"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "De opgegeven achternaam bevat niet toegestane tekens"
@@ -381,7 +415,7 @@ msgstr "Om uw paswoord opnieuw in te stellen volgt u de onderstaande link."
msgid "Transaction ID mismatch"
msgstr "Transactie-ID komt niet overeen"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Bijwerken"
@@ -393,7 +427,7 @@ msgstr "Gebruikersnaam"
msgid "Username : "
msgstr "Gebruikersnaam :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Deze gebruikersnaam mag niet gebruikt worden"
@@ -402,6 +436,24 @@ msgstr "Deze gebruikersnaam mag niet gebruikt worden"
msgid "Value"
msgstr "Waarde"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -423,11 +475,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr "Uw paswoord is hersteld door %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Uw sessie is verlopen"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "bevat"
@@ -435,19 +487,19 @@ msgstr "bevat"
msgid "delete"
msgstr "verwijder"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "groter dan of gelijk aan"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "is exact"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "minder dan"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "lid"
@@ -458,3 +510,11 @@ msgstr "paswoord opnieuw ingesteld"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "met waarde"
+
+#~ msgid "Group Name"
+#~ msgstr "Groepsnaam"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Paswoorden van bevoorrechte accounts kunnen niet via dit proces herstelt "
+#~ "worden"
diff --git a/lib/CatDap/I18N/pl.po b/lib/CatDap/I18N/pl.po
index 5f8576c..898e457 100644
--- a/lib/CatDap/I18N/pl.po
+++ b/lib/CatDap/I18N/pl.po
@@ -23,13 +23,13 @@ msgstr ""
"%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktywacja"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Dodaj"
@@ -42,7 +42,7 @@ msgid "Add attribute"
msgstr "Dodaj atrybut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Dodaj użytkownika %1 do nowej grupy"
@@ -51,20 +51,24 @@ msgstr "Dodaj użytkownika %1 do nowej grupy"
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresy się nie zgadzają"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Konto z tym adresem e-mail już istnieje"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Konto z tą nazwą użytkownika już istnieje"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -96,13 +100,13 @@ msgstr ""
msgid "Attribute"
msgstr "Atrybut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Nie można sprawdzić pliku /etc/passwd, proszę powiadomić administratorów "
"systemu"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -114,6 +118,10 @@ msgstr "Zmień"
msgid "Change password"
msgstr "Zmień hasło"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Sprawdź swoją pocztę dla instrukcji aktywacji."
@@ -122,7 +130,7 @@ msgstr "Sprawdź swoją pocztę dla instrukcji aktywacji."
msgid "Check your mail for password reset instructions."
msgstr "Sprawdź swoją pocztę dla instrukcji resetu hasła."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Potwierdź adres e-mail"
@@ -137,13 +145,13 @@ msgstr "Aktualne hasło"
msgid "Dear %1,"
msgstr "Drogi(a) %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Usuń"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Usuń użytkownika %1 z istniejącej grupy:"
@@ -151,14 +159,19 @@ msgstr "Usuń użytkownika %1 z istniejącej grupy:"
msgid "Edit"
msgstr "Edytuj"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Adres e-mail"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Użycie tej nazwy użytkownika jest niedozwolone"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-mail wysłany"
@@ -167,7 +180,7 @@ msgstr "E-mail wysłany"
msgid "Enter new password."
msgstr "Wprowadź nowe hasło."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Wpisz tekst"
@@ -176,7 +189,7 @@ msgstr "Wpisz tekst"
msgid "Error while searching for account: "
msgstr "Błąd podczas wyszukiwania konta:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Pierwsze imię"
@@ -188,7 +201,7 @@ msgstr "Zapomniałeś hasło?"
msgid "Forgotten password"
msgstr "Zapomniałem hasła"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Zapomniałeś hasła?"
@@ -196,15 +209,11 @@ msgstr "Zapomniałeś hasła?"
msgid "Full Name"
msgstr "Pełna nazwa"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nazwa grupy"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Grupa zawiera niedozwolone znaki"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nazwa grupy"
@@ -220,20 +229,20 @@ msgstr "Grupy pasujące do kryteriów wyszukiwania"
msgid "Groups you manage"
msgstr "Grupy którymi zarządzasz"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Nieprawidłowy tekst potwierdzający, spróbuj ponownie"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Nieprawidłowy adres e-mail"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Nieprawidłowa nazwa użytkownika"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nieprawidłowa nazwa użytkownika, już używana w systemie"
@@ -241,11 +250,11 @@ msgstr "Nieprawidłowa nazwa użytkownika, już używana w systemie"
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Wyloguj się"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Zaloguj się"
@@ -253,7 +262,7 @@ msgstr "Zaloguj się"
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -262,7 +271,7 @@ msgstr ""
msgid "New Password"
msgstr "Nowe hasło"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -270,11 +279,11 @@ msgstr ""
msgid "Operation was successful."
msgstr "Operacja zakończona powodzeniem."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Hasło:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Hasło nieprawidłowe"
@@ -286,7 +295,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informacje osobiste"
@@ -302,10 +311,6 @@ msgstr ""
msgid "Primary group"
msgstr "Podstawowa grupa"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Uprzywilejowane konta nie mogą odzyskać hasła w ten sposób"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -314,10 +319,15 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Zarejestruj się"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Rejestracja zakończona"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Rejestracja zakończona"
@@ -331,35 +341,62 @@ msgstr "Rejestracja zakończona sukcesem."
msgid "Repeat New Password"
msgstr "Powtórz nowe hasło"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Zresetuj hasło"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Wyszukaj"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Ustaw nowe hasło"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Sukces"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Nazwisko"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Wprowadzone pierwsze imię zawiera niedozwolone znaki"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Nazwisko zawiera niedozwolone znaki"
@@ -379,7 +416,7 @@ msgstr "Podążaj za linkiem poniżej, żeby zresetować swoje hasło."
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Aktualizuj"
@@ -391,7 +428,7 @@ msgstr "Nazwa użytkownika"
msgid "Username : "
msgstr "Nazwa użytkownika :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Użycie tej nazwy użytkownika jest niedozwolone"
@@ -400,6 +437,24 @@ msgstr "Użycie tej nazwy użytkownika jest niedozwolone"
msgid "Value"
msgstr "Wartość"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -417,11 +472,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Twoja sesja wygasła"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -429,19 +484,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -452,3 +507,9 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "Nazwa grupy"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "Uprzywilejowane konta nie mogą odzyskać hasła w ten sposób"
diff --git a/lib/CatDap/I18N/pt.po b/lib/CatDap/I18N/pt.po
index e7dc5fd..9487444 100644
--- a/lib/CatDap/I18N/pt.po
+++ b/lib/CatDap/I18N/pt.po
@@ -10,25 +10,22 @@ msgstr ""
"PO-Revision-Date: 2012-06-19 18:13-0000\n"
"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
"Language-Team: \n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: Portugal\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Ativação"
-#: root/admin/account_addoc.tt:28
-#: root/admin/account_group.tt:11
-#: root/admin/account_modify.tt:24
-#: root/admin/group_modify.tt:21
-#: root/user/index.tt:19
-#: root/user/index.tt:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Adicionar"
@@ -41,7 +38,7 @@ msgid "Add attribute"
msgstr "Adicionar atributo"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Adicionar utilizador %1 a um novo grupo"
@@ -50,50 +47,66 @@ msgstr "Adicionar utilizador %1 a um novo grupo"
msgid "Adding objectclass %1 to dn %2"
msgstr "Adicionar objectclass %1 para dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Os endereços não são iguais"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Já existe uma conta com este endereço eletrónico"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Já existe uma conta com este nome de utilizador"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
-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 "Ocorreu um erro ao enviar a mensagem eletrónica, mas a sua conta foi criada. Por favor tente o processo de recuperação de senha se indicou o endereço eletrónico correto. Erros %1"
+#: lib/CatDap/Controller/register.pm:154
+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 ""
+"Ocorreu um erro ao enviar a mensagem eletrónica, mas a sua conta foi criada. "
+"Por favor tente o processo de recuperação de senha se indicou o endereço "
+"eletrónico correto. Erros %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
-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 "Ocorreu um erro ao enviar a mensagem eletrónica, mas a sua conta foi criada. Por favor tente o processo de recuperação de senha se indicou o endereço eletrónico correto: %1"
+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 ""
+"Ocorreu um erro ao enviar a mensagem eletrónica, mas a sua conta foi criada. "
+"Por favor tente o processo de recuperação de senha se indicou o endereço "
+"eletrónico correto: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
-msgstr "Ocorreu um erro ao enviar a mensagem eletrónica. Por favor tente mais tarde. Erros %1"
+msgstr ""
+"Ocorreu um erro ao enviar a mensagem eletrónica. Por favor tente mais tarde. "
+"Erros %1"
-#: root/admin/account_addoc.tt:9
-#: root/admin/account_modify.tt:8
-#: root/admin/group_modify.tt:5
-#: root/user/index.tt:4
+#: 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 "Atribuir"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
-msgstr "Não foi possível verificar /etc/passwd. Por favor avise os administradores do sistema"
+msgstr ""
+"Não foi possível verificar /etc/passwd. Por favor avise os administradores "
+"do sistema"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
-#: root/user/firstlogin.tt:14
-#: root/user/password.tt:15
+#: root/user/firstlogin.tt:14 root/user/password.tt:15
msgid "Change"
msgstr "Alterar"
@@ -101,15 +114,21 @@ msgstr "Alterar"
msgid "Change password"
msgstr "Alterar senha"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Verifique o correio eletrónico acerca das instruções de ativação."
#: root/forgot_password/complete.tt:5
msgid "Check your mail for password reset instructions."
-msgstr "Verifique o seu correio eletrónico acerca das instruções de recuperação de senha."
+msgstr ""
+"Verifique o seu correio eletrónico acerca das instruções de recuperação de "
+"senha."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Confirmar Endereço Eletrónico"
@@ -119,20 +138,18 @@ msgstr "Senha atual"
#. (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 "Caro %1,"
-#: root/admin/account_group.tt:27
-#: root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Apagar"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Remover utilizador %s de um grupo existente:"
@@ -140,16 +157,19 @@ msgstr "Remover utilizador %s de um grupo existente:"
msgid "Edit"
msgstr "Editar"
-#: root/admin/account.tt:8
-#: root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Mensagem eletrónica"
-#: root/forgot_password/index.tt:8
-#: root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Endereço eletrónico"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "O nome de utilizador não está autorizado a ser usado"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Mensagem enviada."
@@ -158,7 +178,7 @@ msgstr "Mensagem enviada."
msgid "Enter new password."
msgstr "Indique uma nova senha."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Indique o texto."
@@ -167,7 +187,7 @@ msgstr "Indique o texto."
msgid "Error while searching for account: "
msgstr "Erro ao procurar a sua conta: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Primeiro nome"
@@ -179,7 +199,7 @@ msgstr "Esqueceu-se da sua senha?"
msgid "Forgotten password"
msgstr "Senha esquecida"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Senha esquecida?"
@@ -187,15 +207,11 @@ msgstr "Senha esquecida?"
msgid "Full Name"
msgstr "Nome Completo"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nome do Grupo"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "O grupo contém caracteres ilegais"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nome do grupo"
@@ -211,20 +227,20 @@ msgstr "Grupos coincidentes com os critérios"
msgid "Groups you manage"
msgstr "Grupos que gere"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Texto de validação incorreto. Por favor tente novamente"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Endereço eletrónico inválido"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Nome de utilizador inválido"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nome de utilizador inválido, já está a ser usado no sistema"
@@ -232,13 +248,11 @@ msgstr "Nome de utilizador inválido, já está a ser usado no sistema"
msgid "List of users promoted :"
msgstr "Lista de utilizadores promovidos:"
-#: root/template/header:10
-#: root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Sair"
-#: root/index.tt:1
-#: root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Entrar"
@@ -246,18 +260,16 @@ msgstr "Entrar"
msgid "More than one ID Pool"
msgstr "Mais do que uma ID"
-#: lib/CatDap/Controller/admin.pm:515
-#: lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Mais do que uma entrada coincidente"
-#: root/forgot_password/confirm.tt:8
-#: root/user/firstlogin.tt:5
+#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
#: root/user/password.tt:9
msgid "New Password"
msgstr "Nova Senha"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "As senhas novas não são iguais"
@@ -265,11 +277,11 @@ msgstr "As senhas novas não são iguais"
msgid "Operation was successful."
msgstr "A operação foi bem sucedida."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Senha: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Senha incorreta"
@@ -281,7 +293,7 @@ msgstr "Recuperação de senha e envio de mensagem"
msgid "Password reset failed: "
msgstr "Falha ao recuperar senha:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informação Pessoal"
@@ -297,10 +309,6 @@ msgstr "Por favor use os menus em cima."
msgid "Primary group"
msgstr "Grupo primário"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "As contas privilegiadas não podem recuperar senhas através deste mecanismo"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promover"
@@ -309,12 +317,15 @@ msgstr "Promover"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promover utilizador para o posixAccount com grupo primário:"
-#: root/index.tt:16
-#: root/register/index.tt:3
-#: root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registar"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registo concluído"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registo concluído"
@@ -323,44 +334,67 @@ msgstr "Registo concluído"
msgid "Registration was successful."
msgstr "O registo foi bem sucedido."
-#: root/forgot_password/confirm.tt:11
-#: root/user/firstlogin.tt:10
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr "Repetir Nova Senha"
-#: root/admin/account_modify.tt:1
-#: root/forgot_password/index.tt:12
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
+#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Recuperar senha"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Procurar"
#: root/admin/account.tt:4
-#: root/admin/group.tt:5
msgid "Search by"
msgstr "Procurar por"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Definir nova senha"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Sucesso"
-#: root/admin/account.tt:10
-#: root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Apelido"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "O primeiro nome indicado contém caracteres ilegais"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "O apelido indicado contém caracteres ilegais"
@@ -380,14 +414,11 @@ msgstr "Para recuperar a sua senha, siga a ligação em baixo."
msgid "Transaction ID mismatch"
msgstr "Discrepância na ID da transação"
-#: root/admin/account_modify.tt:35
-#: root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Atualizar"
-#: root/admin/account.tt:7
-#: root/register/index.tt:7
-#: root/register/index.tt:8
+#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr "Nome de utilizador"
@@ -395,21 +426,41 @@ msgstr "Nome de utilizador"
msgid "Username : "
msgstr "Nome de utilizador: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "O nome de utilizador não está autorizado a ser usado"
-#: root/admin/account_addoc.tt:10
-#: root/admin/account_modify.tt:9
-#: root/admin/group_modify.tt:6
-#: root/user/index.tt:4
+#: 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 "Valor"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "A sua conta %1 foi requerida para mudança de senha. Se não não pediu isto, ou não deseja alterar a sua senha, por favor ignore."
+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 ""
+"A sua conta %1 foi requerida para mudança de senha. Se não não pediu isto, "
+"ou não deseja alterar a sua senha, por favor ignore."
#. (c.config.organisation)
#: root/email/activation.tt:2
@@ -421,12 +472,11 @@ msgstr "A sua conta %1 foi criada com sucesso, mas requer ativação."
msgid "Your password was reset by %1"
msgstr "A sua senha foi recuperada por %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "A sua sessão expirou"
-#: root/admin/account.tt:15
-#: root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "contém"
@@ -434,22 +484,19 @@ msgstr "contém"
msgid "delete"
msgstr "apagar"
-#: root/admin/account.tt:17
-#: root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "maior que ou igual a"
-#: root/admin/account.tt:16
-#: root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "é exato"
-#: root/admin/account.tt:18
-#: root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "menor que"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "membro"
@@ -461,3 +508,9 @@ msgstr "recuperação de senha"
msgid "with value"
msgstr "com valor"
+#~ msgid "Group Name"
+#~ msgstr "Nome do Grupo"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "As contas privilegiadas não podem recuperar senhas através deste mecanismo"
diff --git a/lib/CatDap/I18N/pt_BR.po b/lib/CatDap/I18N/pt_BR.po
index 41d5d2e..e571e2d 100644
--- a/lib/CatDap/I18N/pt_BR.po
+++ b/lib/CatDap/I18N/pt_BR.po
@@ -10,25 +10,22 @@ msgstr ""
"PO-Revision-Date: 2012-06-19 18:13-0000\n"
"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
"Language-Team: \n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: Portugal\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Ativação"
-#: root/admin/account_addoc.tt:28
-#: root/admin/account_group.tt:11
-#: root/admin/account_modify.tt:24
-#: root/admin/group_modify.tt:21
-#: root/user/index.tt:19
-#: root/user/index.tt:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Adicionar"
@@ -41,7 +38,7 @@ msgid "Add attribute"
msgstr "Adicionar atributo"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Adicionar utilizador %1 a um novo grupo"
@@ -50,50 +47,66 @@ msgstr "Adicionar utilizador %1 a um novo grupo"
msgid "Adding objectclass %1 to dn %2"
msgstr "Adicionar objectclass %1 para dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Os endereços não são iguais"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Já existe uma conta com este endereço eletrônico"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Já existe uma conta com este nome de usuario"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
-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 "Ocorreu um erro ao enviar a mensagem eletrônica, mas a sua conta foi criada. Por favor tente o processo de recuperação de senha se indicou o endereço eletrônico correto. Erros %1"
+#: lib/CatDap/Controller/register.pm:154
+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 ""
+"Ocorreu um erro ao enviar a mensagem eletrônica, mas a sua conta foi criada. "
+"Por favor tente o processo de recuperação de senha se indicou o endereço "
+"eletrônico correto. Erros %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
-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 "Ocorreu um erro ao enviar a mensagem eletrônica, mas a sua conta foi criada. Por favor tente o processo de recuperação de senha se indicou o endereço eletrônico correto: %1"
+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 ""
+"Ocorreu um erro ao enviar a mensagem eletrônica, mas a sua conta foi criada. "
+"Por favor tente o processo de recuperação de senha se indicou o endereço "
+"eletrônico correto: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
-msgstr "Ocorreu um erro ao enviar a mensagem eletrônica. Por favor tente mais tarde. Erros %1"
+msgstr ""
+"Ocorreu um erro ao enviar a mensagem eletrônica. Por favor tente mais tarde. "
+"Erros %1"
-#: root/admin/account_addoc.tt:9
-#: root/admin/account_modify.tt:8
-#: root/admin/group_modify.tt:5
-#: root/user/index.tt:4
+#: 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 "Atribuir"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
-msgstr "Não foi possível verificar /etc/passwd. Por favor avise os administradores do sistema"
+msgstr ""
+"Não foi possível verificar /etc/passwd. Por favor avise os administradores "
+"do sistema"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
-#: root/user/firstlogin.tt:14
-#: root/user/password.tt:15
+#: root/user/firstlogin.tt:14 root/user/password.tt:15
msgid "Change"
msgstr "Alterar"
@@ -101,15 +114,21 @@ msgstr "Alterar"
msgid "Change password"
msgstr "Alterar senha"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Verifique o correio eletrônico acerca das instruções de ativação."
#: root/forgot_password/complete.tt:5
msgid "Check your mail for password reset instructions."
-msgstr "Verifique o seu correio eletrônico acerca das instruções de recuperação de senha."
+msgstr ""
+"Verifique o seu correio eletrônico acerca das instruções de recuperação de "
+"senha."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Confirmar Endereço Eletrônico"
@@ -119,20 +138,18 @@ msgstr "Senha atual"
#. (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 "Caro %1,"
-#: root/admin/account_group.tt:27
-#: root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Apagar"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Remover utilizador %s de um grupo existente:"
@@ -140,16 +157,19 @@ msgstr "Remover utilizador %s de um grupo existente:"
msgid "Edit"
msgstr "Editar"
-#: root/admin/account.tt:8
-#: root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Mensagem eletrônica"
-#: root/forgot_password/index.tt:8
-#: root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Endereço eletrônico"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "O nome de utilizador não está autorizado a ser usado"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Mensagem enviada."
@@ -158,7 +178,7 @@ msgstr "Mensagem enviada."
msgid "Enter new password."
msgstr "Indique uma nova senha."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Indique o texto."
@@ -167,7 +187,7 @@ msgstr "Indique o texto."
msgid "Error while searching for account: "
msgstr "Erro ao procurar a sua conta: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Primeiro nome"
@@ -179,7 +199,7 @@ msgstr "Esqueceu-se da sua senha?"
msgid "Forgotten password"
msgstr "Senha esquecida"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Senha esquecida?"
@@ -187,15 +207,11 @@ msgstr "Senha esquecida?"
msgid "Full Name"
msgstr "Nome Completo"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Nome do Grupo"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "O grupo contém caracteres ilegais"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Nome do grupo"
@@ -211,20 +227,20 @@ msgstr "Grupos coincidentes com os critérios"
msgid "Groups you manage"
msgstr "Grupos que gere"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Texto de validação incorreto. Por favor tente novamente"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Endereço eletrônico inválido"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Nome de utilizador inválido"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nome de utilizador inválido, já está a ser usado no sistema"
@@ -232,13 +248,11 @@ msgstr "Nome de utilizador inválido, já está a ser usado no sistema"
msgid "List of users promoted :"
msgstr "Lista de utilizadores promovidos:"
-#: root/template/header:10
-#: root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Sair"
-#: root/index.tt:1
-#: root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Entrar"
@@ -246,18 +260,16 @@ msgstr "Entrar"
msgid "More than one ID Pool"
msgstr "Mais do que uma ID"
-#: lib/CatDap/Controller/admin.pm:515
-#: lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Mais do que uma entrada coincidente"
-#: root/forgot_password/confirm.tt:8
-#: root/user/firstlogin.tt:5
+#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
#: root/user/password.tt:9
msgid "New Password"
msgstr "Nova Senha"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "As senhas novas não são iguais"
@@ -265,11 +277,11 @@ msgstr "As senhas novas não são iguais"
msgid "Operation was successful."
msgstr "A operação foi bem sucedida."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Senha: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Senha incorreta"
@@ -281,7 +293,7 @@ msgstr "Recuperação de senha e envio de mensagem"
msgid "Password reset failed: "
msgstr "Falha ao recuperar senha:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informação Pessoal"
@@ -297,10 +309,6 @@ msgstr "Por favor use os menus em cima."
msgid "Primary group"
msgstr "Grupo primário"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "As contas privilegiadas não podem recuperar senhas através deste mecanismo"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promover"
@@ -309,12 +317,15 @@ msgstr "Promover"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promover utilizador para o posixAccount com grupo primário:"
-#: root/index.tt:16
-#: root/register/index.tt:3
-#: root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registar"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registo concluído"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registo concluído"
@@ -323,44 +334,67 @@ msgstr "Registo concluído"
msgid "Registration was successful."
msgstr "O registo foi bem sucedido."
-#: root/forgot_password/confirm.tt:11
-#: root/user/firstlogin.tt:10
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr "Repetir Nova Senha"
-#: root/admin/account_modify.tt:1
-#: root/forgot_password/index.tt:12
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
+#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Recuperar senha"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Procurar"
#: root/admin/account.tt:4
-#: root/admin/group.tt:5
msgid "Search by"
msgstr "Procurar por"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Definir nova senha"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Sucesso"
-#: root/admin/account.tt:10
-#: root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Apelido"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "O primeiro nome indicado contém caracteres ilegais"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "O apelido indicado contém caracteres ilegais"
@@ -380,14 +414,11 @@ msgstr "Para recuperar a sua senha, siga a ligação em baixo."
msgid "Transaction ID mismatch"
msgstr "Discrepância na ID da transação"
-#: root/admin/account_modify.tt:35
-#: root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Atualizar"
-#: root/admin/account.tt:7
-#: root/register/index.tt:7
-#: root/register/index.tt:8
+#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr "Nome de utilizador"
@@ -395,21 +426,41 @@ msgstr "Nome de utilizador"
msgid "Username : "
msgstr "Nome de utilizador: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "O nome de utilizador não está autorizado a ser usado"
-#: root/admin/account_addoc.tt:10
-#: root/admin/account_modify.tt:9
-#: root/admin/group_modify.tt:6
-#: root/user/index.tt:4
+#: 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 "Valor"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "A sua conta %1 foi requerida para mudança de senha. Se não não pediu isto, ou não deseja alterar a sua senha, por favor ignore."
+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 ""
+"A sua conta %1 foi requerida para mudança de senha. Se não não pediu isto, "
+"ou não deseja alterar a sua senha, por favor ignore."
#. (c.config.organisation)
#: root/email/activation.tt:2
@@ -421,12 +472,11 @@ msgstr "A sua conta %1 foi criada com sucesso, mas requer ativação."
msgid "Your password was reset by %1"
msgstr "A sua senha foi recuperada por %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "A sua sessão expirou"
-#: root/admin/account.tt:15
-#: root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "contém"
@@ -434,22 +484,19 @@ msgstr "contém"
msgid "delete"
msgstr "apagar"
-#: root/admin/account.tt:17
-#: root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "maior que ou igual a"
-#: root/admin/account.tt:16
-#: root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "é exato"
-#: root/admin/account.tt:18
-#: root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "menor que"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "membro"
@@ -461,3 +508,9 @@ msgstr "recuperação de senha"
msgid "with value"
msgstr "com valor"
+#~ msgid "Group Name"
+#~ msgstr "Nome do Grupo"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "As contas privilegiadas não podem recuperar senhas através deste mecanismo"
diff --git a/lib/CatDap/I18N/ro.po b/lib/CatDap/I18N/ro.po
index e5a57e5..460abc8 100644
--- a/lib/CatDap/I18N/ro.po
+++ b/lib/CatDap/I18N/ro.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>, 2013
msgid ""
@@ -10,20 +10,22 @@ msgstr ""
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2013-11-08 21:39+0000\n"
"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
+"ro/)\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Activare"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Adaugă"
@@ -36,7 +38,7 @@ msgid "Add attribute"
msgstr "Adaugă atribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Adaugă utilizatorul %1 la un grup nou"
@@ -45,48 +47,62 @@ msgstr "Adaugă utilizatorul %1 la un grup nou"
msgid "Adding objectclass %1 to dn %2"
msgstr "Se adaugă clasa obiect de la %1 pînă la dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresele introduse nu sînt identice"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Această adresă de e-mail este asociată unui alt cont"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Acest nume de utilizator este deja înregistrat"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
+"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 "S-a produs o eroare în timpul expedierii e-mailului, însă contul a fost creat. Încercați procesul de recuperare a parolei, dacă adresa de e-mail introdusă este corectă. Erori %1"
+msgstr ""
+"S-a produs o eroare în timpul expedierii e-mailului, însă contul a fost "
+"creat. Încercați procesul de recuperare a parolei, dacă adresa de e-mail "
+"introdusă este corectă. Erori %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
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 "S-a produs o eroare în timpul expedierii e-mailului, însă contul a fost creat. Încercați procesul de recuperare a parolei, dacă adresa de e-mail introdusă este corectă: %1"
+"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 ""
+"S-a produs o eroare în timpul expedierii e-mailului, însă contul a fost "
+"creat. Încercați procesul de recuperare a parolei, dacă adresa de e-mail "
+"introdusă este corectă: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
-msgstr "S-a produs o eroare în timpul expedierii e-mailului, încercați mai tîrziu. Erori %1"
+msgstr ""
+"S-a produs o eroare în timpul expedierii e-mailului, încercați mai tîrziu. "
+"Erori %1"
#: 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 "Atribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
-msgstr "Nu s-a putut verifica fișierul /etc/passwd, avertizați administratorii de sistem"
+msgstr ""
+"Nu s-a putut verifica fișierul /etc/passwd, avertizați administratorii de "
+"sistem"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -98,15 +114,21 @@ msgstr "Schimbă"
msgid "Change password"
msgstr "Schimbă parola"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Verificați adresa de e-mail pentru instrucțiunile de activare."
#: root/forgot_password/complete.tt:5
msgid "Check your mail for password reset instructions."
-msgstr "Verificați adresa de e-mail pentru a obține informații în vederea resetării parolei."
+msgstr ""
+"Verificați adresa de e-mail pentru a obține informații în vederea resetării "
+"parolei."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Reintroduceți adresa de e-mail"
@@ -121,13 +143,13 @@ msgstr "Parola curentă"
msgid "Dear %1,"
msgstr "Dragă %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Șterge"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Șterge utilizatorul %1 dintr-un grup existent:"
@@ -135,14 +157,19 @@ msgstr "Șterge utilizatorul %1 dintr-un grup existent:"
msgid "Edit"
msgstr "Editează"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-mail"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Adresă e-mail"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Acest nume de utilizator nu poate fi folosit"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-mail expediat."
@@ -151,7 +178,7 @@ msgstr "E-mail expediat."
msgid "Enter new password."
msgstr "Introduceți noua parolă."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Introduceți text"
@@ -160,7 +187,7 @@ msgstr "Introduceți text"
msgid "Error while searching for account: "
msgstr "S-a produs o eroare în cursul căutării contului: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Prenume"
@@ -172,7 +199,7 @@ msgstr "Ați uitat parola?"
msgid "Forgotten password"
msgstr "Parolă uitată"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Parolă uitată?"
@@ -180,15 +207,11 @@ msgstr "Parolă uitată?"
msgid "Full Name"
msgstr "Nume complet"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Numele grupului"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Grupul conține caractere nepermise"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Numele grupului"
@@ -204,20 +227,20 @@ msgstr "Grupuri care se potrivesc criteriilor de căutare"
msgid "Groups you manage"
msgstr "Grupuri pe care le gestionați"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Textul introdus este greșit, reîncercați"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Adresa de e-mail este invalidă"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Numele de utilizator este invalid"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Nume de utilizator invalid, este deja utilizat"
@@ -225,11 +248,11 @@ msgstr "Nume de utilizator invalid, este deja utilizat"
msgid "List of users promoted :"
msgstr "Lista utilizatorilor promovați:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Deautentificare"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Autentificare"
@@ -237,7 +260,7 @@ msgstr "Autentificare"
msgid "More than one ID Pool"
msgstr "Mai mult de un ID Pool"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Se potrivesc mai multe intrări"
@@ -246,7 +269,7 @@ msgstr "Se potrivesc mai multe intrări"
msgid "New Password"
msgstr "Parolă nouă"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Parolele nu sînt identice"
@@ -254,11 +277,11 @@ msgstr "Parolele nu sînt identice"
msgid "Operation was successful."
msgstr "Operațiunea a fost efectuată cu succes."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Parolă : "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Parolă incorectă"
@@ -270,7 +293,7 @@ msgstr "E-mailul pentru reinițializarea parolei a fost trimis"
msgid "Password reset failed: "
msgstr "Reinițializarea parolei a eșuat:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informații personale"
@@ -286,10 +309,6 @@ msgstr "Utilizați meniurile de mai sus."
msgid "Primary group"
msgstr "Grup primar"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Conturile cu privilegii s-ar putea să nu recupereze parolele prin acest mecanism"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promovează"
@@ -298,10 +317,15 @@ msgstr "Promovează"
msgid "Promote user to posixAccount with primary group:"
msgstr "Promovează utilizatorul la posixAccount cu grupul primar:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Înregistrare"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Înregistrare efectuată"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Înregistrare efectuată"
@@ -315,35 +339,62 @@ msgstr "Înregistrarea a fost efectuată cu succes."
msgid "Repeat New Password"
msgstr "Reintroduceți noua parolă"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Reinițializează parola"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Caută"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Caută după"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Aplică noua parolă"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Succes"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Nume"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Prenumele introdus conține caractere ce nu pot fi utilizate"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Numele introdus conține caractere ce nu pot fi utilizate"
@@ -363,7 +414,7 @@ msgstr "Pentru a vă reinițializa parola accesați legatura de mai jos."
msgid "Transaction ID mismatch"
msgstr "Nepotrivire ID de tranzacție"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Actualizează"
@@ -375,7 +426,7 @@ msgstr "Nume de utilizator"
msgid "Username : "
msgstr "Nume de utilizator : "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Acest nume de utilizator nu poate fi folosit"
@@ -384,17 +435,37 @@ msgstr "Acest nume de utilizator nu poate fi folosit"
msgid "Value"
msgstr "Valoare"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "A fost înregistrată o cerere de schimbare a parolei pentru contul %1. Dacă nu ați solicitat această modificare sau dacă nu doriți continuarea procesul de reinițializare puteți ignora acest mesaj."
+"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 ""
+"A fost înregistrată o cerere de schimbare a parolei pentru contul %1. Dacă "
+"nu ați solicitat această modificare sau dacă nu doriți continuarea procesul "
+"de reinițializare puteți ignora acest mesaj."
#. (c.config.organisation)
#: root/email/activation.tt:2
-msgid ""
-"Your %1 account has been successfully created, but requires activation."
+msgid "Your %1 account has been successfully created, but requires activation."
msgstr "Contul %1 a fost creat cu succes, însă trebuie activat."
#. (c.user.username)
@@ -402,11 +473,11 @@ msgstr "Contul %1 a fost creat cu succes, însă trebuie activat."
msgid "Your password was reset by %1"
msgstr "Parola a fost neinițializată de către %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Sesiunea a expirat"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "conține"
@@ -414,19 +485,19 @@ msgstr "conține"
msgid "delete"
msgstr "șterge"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "mai mare sau egal cu"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "este exact"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "mai mic decît"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "membru"
@@ -437,3 +508,11 @@ msgstr "reinițializarea parolei"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "cu valoarea"
+
+#~ msgid "Group Name"
+#~ msgstr "Numele grupului"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Conturile cu privilegii s-ar putea să nu recupereze parolele prin acest "
+#~ "mecanism"
diff --git a/lib/CatDap/I18N/ru.po b/lib/CatDap/I18N/ru.po
index c63874d..ab83d47 100644
--- a/lib/CatDap/I18N/ru.po
+++ b/lib/CatDap/I18N/ru.po
@@ -13,19 +13,17 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Generator: Lokalize 1.0\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Активация"
-#: root/admin/account_addoc.tt:28
-#: root/admin/account_group.tt:11
-#: root/admin/account_modify.tt:24
-#: root/admin/group_modify.tt:21
-#: root/user/index.tt:19
-#: root/user/index.tt:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Добавить"
@@ -38,7 +36,7 @@ msgid "Add attribute"
msgstr "Добавить атрибут"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Добавить пользователя %1 в новую группу"
@@ -47,50 +45,66 @@ msgstr "Добавить пользователя %1 в новую группу"
msgid "Adding objectclass %1 to dn %2"
msgstr "Добавление objectclass %1 до dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Адреса не совпадают"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Учетная запись с таким адресом электронной почты уже существует"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Учетная запись с таким именем пользователя уже существует"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
-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 "Во время отправки сообщения электронной почты произошла ошибка, но ваша учетная запись создана. Пожалуйста, воспользуйтесь процедурой восстановления пароля, если адрес электронной почты был указан правильно. Ошибки: %1"
+#: lib/CatDap/Controller/register.pm:154
+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 ""
+"Во время отправки сообщения электронной почты произошла ошибка, но ваша "
+"учетная запись создана. Пожалуйста, воспользуйтесь процедурой восстановления "
+"пароля, если адрес электронной почты был указан правильно. Ошибки: %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
-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 "Во время отправки сообщения электронной почты произошла ошибка, но ваша учетная запись создана. Пожалуйста, воспользуйтесь процедурой восстановления пароля, если адрес электронной почты был указан правильно: %1"
+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 ""
+"Во время отправки сообщения электронной почты произошла ошибка, но ваша "
+"учетная запись создана. Пожалуйста, воспользуйтесь процедурой восстановления "
+"пароля, если адрес электронной почты был указан правильно: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
-msgstr "Во время отправки сообщения электронной почты произошла ошибка. Пожалуйста, повторите попытку позже. Ошибки: %1"
+msgstr ""
+"Во время отправки сообщения электронной почты произошла ошибка. Пожалуйста, "
+"повторите попытку позже. Ошибки: %1"
-#: root/admin/account_addoc.tt:9
-#: root/admin/account_modify.tt:8
-#: root/admin/group_modify.tt:5
-#: root/user/index.tt:4
+#: 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:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
-msgstr "Не удалось проверить /etc/passwd, сообщите об этом администратору вашей системы"
+msgstr ""
+"Не удалось проверить /etc/passwd, сообщите об этом администратору вашей "
+"системы"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Капча"
-#: root/user/firstlogin.tt:14
-#: root/user/password.tt:15
+#: root/user/firstlogin.tt:14 root/user/password.tt:15
msgid "Change"
msgstr "Изменить"
@@ -98,6 +112,10 @@ msgstr "Изменить"
msgid "Change password"
msgstr "Изменить пароль"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Инструкции по активации отправлены на ваш почтовый ящик."
@@ -106,7 +124,7 @@ msgstr "Инструкции по активации отправлены на
msgid "Check your mail for password reset instructions."
msgstr "Инструкции по восстановлению пароля отправлены на ваш почтовый ящик."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Подтверждение адреса электронной почты"
@@ -116,20 +134,18 @@ msgstr "Текущий пароль"
#. (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 "Уважаемый (Уважаемая) %1,"
-#: root/admin/account_group.tt:27
-#: root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Удалить"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Удалить пользователя %1 из существующей группы:"
@@ -137,16 +153,19 @@ msgstr "Удалить пользователя %1 из существующей
msgid "Edit"
msgstr "Редактировать"
-#: root/admin/account.tt:8
-#: root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Электронная почта"
-#: root/forgot_password/index.tt:8
-#: root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Адрес электронной почты"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Не разрешается использовать указанное имя пользователя"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Сообщение электронной почты отправлено."
@@ -155,7 +174,7 @@ msgstr "Сообщение электронной почты отправлен
msgid "Enter new password."
msgstr "Введите новый пароль."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Введите текст"
@@ -164,7 +183,7 @@ msgstr "Введите текст"
msgid "Error while searching for account: "
msgstr "Ошибка во время поиска учетной записи: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Имя"
@@ -176,7 +195,7 @@ msgstr "Забыли ваш пароль?"
msgid "Forgotten password"
msgstr "Забытый пароль"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Забыли пароль?"
@@ -184,15 +203,11 @@ msgstr "Забыли пароль?"
msgid "Full Name"
msgstr "Полное имя"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Название группы"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Группа содержит некорректные символы"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Название группы"
@@ -208,20 +223,20 @@ msgstr "Группы, соответствующие критерию поиск
msgid "Groups you manage"
msgstr "Группы, которыми вы управляете"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Контрольный текст введён с ошибками, пожалуйста, повторите снова"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Неверный адрес электронной почты"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Неверное имя пользователя"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Неверное имя пользователя, это имя уже используется в системе"
@@ -229,13 +244,11 @@ msgstr "Неверное имя пользователя, это имя уже
msgid "List of users promoted :"
msgstr "Выдвинутый список пользователей:"
-#: root/template/header:10
-#: root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Выйти"
-#: root/index.tt:1
-#: root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Войти"
@@ -243,18 +256,16 @@ msgstr "Войти"
msgid "More than one ID Pool"
msgstr "Более чем один пул ID"
-#: lib/CatDap/Controller/admin.pm:515
-#: lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Более чем одна запись соответствует"
-#: root/forgot_password/confirm.tt:8
-#: root/user/firstlogin.tt:5
+#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5
#: root/user/password.tt:9
msgid "New Password"
msgstr "Новый пароль"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Новые пароли не совпадают"
@@ -262,11 +273,11 @@ msgstr "Новые пароли не совпадают"
msgid "Operation was successful."
msgstr "Операция успешно завершена."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Пароль: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Неверный пароль"
@@ -278,7 +289,7 @@ msgstr "Пароль сброшен, электронное сообщение
msgid "Password reset failed: "
msgstr "Сброс пароля неудачен:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Личная информация"
@@ -294,10 +305,6 @@ msgstr "Используйте указанные выше меню."
msgid "Primary group"
msgstr "Основная группа"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Получение паролей к привилегированным учетным записям таким способом не предусмотрено"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Повысить"
@@ -306,12 +313,15 @@ msgstr "Повысить"
msgid "Promote user to posixAccount with primary group:"
msgstr "Повысить пользователя до уровня posixAccount с основной группой:"
-#: root/index.tt:16
-#: root/register/index.tt:3
-#: root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Зарегистрироваться"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Регистрация завершена"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Регистрация завершена"
@@ -320,44 +330,67 @@ msgstr "Регистрация завершена"
msgid "Registration was successful."
msgstr "Регистрация прошла успешно."
-#: root/forgot_password/confirm.tt:11
-#: root/user/firstlogin.tt:10
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr "Повторите новый пароль"
-#: root/admin/account_modify.tt:1
-#: root/forgot_password/index.tt:12
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
+#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Сбросить пароль"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Поиск"
#: root/admin/account.tt:4
-#: root/admin/group.tt:5
msgid "Search by"
msgstr "Найти по"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Установить новый пароль"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Успешно"
-#: root/admin/account.tt:10
-#: root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Фамилия"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "В указанном имени содержатся некорректные символы"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "В указанной фамилии содержатся некорректные символы"
@@ -367,7 +400,8 @@ msgstr "Этот адрес электронной почты не связан
#: root/email/activation.tt:3
msgid "To activate your account, please follow the link below."
-msgstr "Для активации вашей учетной записи, перейдите по указанной ниже ссылке."
+msgstr ""
+"Для активации вашей учетной записи, перейдите по указанной ниже ссылке."
#: root/email/forgot_password.tt:3
msgid "To reset your password, please follow the link below."
@@ -377,14 +411,11 @@ msgstr "Чтобы сбросить ваш пароль, перейдите по
msgid "Transaction ID mismatch"
msgstr "Несоответствие ID транзакции"
-#: root/admin/account_modify.tt:35
-#: root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Обновить"
-#: root/admin/account.tt:7
-#: root/register/index.tt:7
-#: root/register/index.tt:8
+#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr "Пользователь"
@@ -392,38 +423,59 @@ msgstr "Пользователь"
msgid "Username : "
msgstr "Пользователь: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
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
+#: 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 "Значение"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "Поступил запрос на изменение пароля к вашей учетной записи %1. Если запрос инициирован не Вами, или вы передумали менять пароль, проигнорируйте это сообщение."
+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 ""
+"Поступил запрос на изменение пароля к вашей учетной записи %1. Если запрос "
+"инициирован не Вами, или вы передумали менять пароль, проигнорируйте это "
+"сообщение."
#. (c.config.organisation)
#: root/email/activation.tt:2
msgid "Your %1 account has been successfully created, but requires activation."
-msgstr "Ваша учетная запись %1 успешно создана, осталось только активировать её."
+msgstr ""
+"Ваша учетная запись %1 успешно создана, осталось только активировать её."
#. (c.user.username)
#: root/email/admin/password.tt:3
msgid "Your password was reset by %1"
msgstr "Ваш пароль был сброшен %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Время работы Вашего сеанса истекло"
-#: root/admin/account.tt:15
-#: root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "содержит"
@@ -431,22 +483,19 @@ msgstr "содержит"
msgid "delete"
msgstr "удалить"
-#: root/admin/account.tt:17
-#: root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "больше чем или равно"
-#: root/admin/account.tt:16
-#: root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "равно"
-#: root/admin/account.tt:18
-#: root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "меньше чем"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "участник"
@@ -458,6 +507,14 @@ msgstr "сброс пароля"
msgid "with value"
msgstr "со значением"
+#~ msgid "Group Name"
+#~ msgstr "Название группы"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Получение паролей к привилегированным учетным записям таким способом не "
+#~ "предусмотрено"
+
#~ msgid "First Name"
#~ msgstr "Имя"
diff --git a/lib/CatDap/I18N/sk.po b/lib/CatDap/I18N/sk.po
index f597d64..4a8c790 100644
--- a/lib/CatDap/I18N/sk.po
+++ b/lib/CatDap/I18N/sk.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivácia"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Pridať"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "Pridať vlastnosť"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Pridať používateľa %1 do novej skupiny"
@@ -46,20 +46,24 @@ msgstr "Pridať používateľa %1 do novej skupiny"
msgid "Adding objectclass %1 to dn %2"
msgstr "Pridanie triedy objektu %1 ku dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresy sa nezhodujú"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Účet s touto emailovou adresou už existuje"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Účet s týmto používateľským menom už existuje"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -90,13 +94,13 @@ msgstr ""
msgid "Attribute"
msgstr "Vlastnosť"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Nemôžem skontrolovať /etc/passwd, prosím upozornite systémových "
"administrátorov."
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -108,6 +112,10 @@ msgstr "Zmeniť"
msgid "Change password"
msgstr "Zmeniť heslo"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Inštrukcie k aktivácii účtu nájdete vo svojom emaile."
@@ -116,7 +124,7 @@ msgstr "Inštrukcie k aktivácii účtu nájdete vo svojom emaile."
msgid "Check your mail for password reset instructions."
msgstr "Inštrukcie pre obnovenie hesla nájdete vo svojom emaile."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Potvrďte emailovú adresu"
@@ -131,13 +139,13 @@ msgstr "Aktuálne heslo"
msgid "Dear %1,"
msgstr "Vážený %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Zmazať"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Vymazať používateľa %1 z existujúcej skupiny:"
@@ -145,14 +153,19 @@ msgstr "Vymazať používateľa %1 z existujúcej skupiny:"
msgid "Edit"
msgstr "Upraviť"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Emailová adresa"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Toto prihlasovacie meno nie je možné použiť"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Email odoslaný."
@@ -161,7 +174,7 @@ msgstr "Email odoslaný."
msgid "Enter new password."
msgstr "Potvrdiť nové heslo."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Potvrdiť text."
@@ -170,7 +183,7 @@ msgstr "Potvrdiť text."
msgid "Error while searching for account: "
msgstr "Chyba pri vyhľadávaní účtu:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Krstné meno"
@@ -182,7 +195,7 @@ msgstr "Zabudli ste heslo?"
msgid "Forgotten password"
msgstr "Zabudnuté heslo"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Zabudnuté heslo?"
@@ -190,15 +203,11 @@ msgstr "Zabudnuté heslo?"
msgid "Full Name"
msgstr "Celé meno"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Meno skupiny"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Skupina obsahuje nedovolené znaky"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Meno skupiny"
@@ -214,20 +223,20 @@ msgstr "Skupiny vyhovujú kritériám vyhľadávania"
msgid "Groups you manage"
msgstr "Skupiny ktoré spravujete"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Zle zadaný overovací text, prosím skúste znovu"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Neplatná emailová adresa"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Neplatné používateľské meno"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Používateľské meno nie je možné použiť, je už totiž použité "
@@ -235,11 +244,11 @@ msgstr "Používateľské meno nie je možné použiť, je už totiž použité
msgid "List of users promoted :"
msgstr "Zoznam povýšených požívateľov :"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Odhlásenie"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Prihlásenie"
@@ -247,7 +256,7 @@ msgstr "Prihlásenie"
msgid "More than one ID Pool"
msgstr "Viac než jedna skupina ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Viac než jeden záznam sa zhoduje"
@@ -256,7 +265,7 @@ msgstr "Viac než jeden záznam sa zhoduje"
msgid "New Password"
msgstr "Nové heslo"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Nové heslo sa nezhoduje"
@@ -264,11 +273,11 @@ msgstr "Nové heslo sa nezhoduje"
msgid "Operation was successful."
msgstr "Operácia prebehla úspešne."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Heslo:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Neplatné heslo"
@@ -280,7 +289,7 @@ msgstr "Heslo bolo obnovené a email zaslaný"
msgid "Password reset failed: "
msgstr "Obnovenie hesla zlyhalo:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Osobné informácie"
@@ -296,10 +305,6 @@ msgstr "Prosím použite menu hore."
msgid "Primary group"
msgstr "Primárna skupina"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Heslá ku privilegovaným účtom nemôžu byť obnovené týmto spôsobom"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Povýšiť"
@@ -308,10 +313,15 @@ msgstr "Povýšiť"
msgid "Promote user to posixAccount with primary group:"
msgstr "Povýšiť používateľa na posixAccount s primárnou skupinou:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registrovať"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrácia je kompletná"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrácia je kompletná"
@@ -325,35 +335,62 @@ msgstr "Registrácia bola úspešná."
msgid "Repeat New Password"
msgstr "Zopakujte nové heslo"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Obnoviť heslo"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Hľadať"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Hľadať podľa"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Nastaviť nové heslo"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Úspech"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Priezvisko"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Vami zadané krstné meno obsahuje nedovolené znaky"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Vami zadané priezvisko obsahuje nedovolené znaky"
@@ -373,7 +410,7 @@ msgstr "Na obnovenie vášho hesla prosím kliknite na odkaz nižšie."
msgid "Transaction ID mismatch"
msgstr "Nezhoda ID transakcie"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Aktualizácia"
@@ -385,7 +422,7 @@ msgstr "Používateľské meno"
msgid "Username : "
msgstr "Používateľské meno :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Toto prihlasovacie meno nie je možné použiť"
@@ -394,6 +431,24 @@ msgstr "Toto prihlasovacie meno nie je možné použiť"
msgid "Value"
msgstr "Hodnota"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -414,11 +469,11 @@ msgstr "Váš účet %1 bol úspešne vytvorený ale vyžaduje aktiváciu."
msgid "Your password was reset by %1"
msgstr "Vaše heslo bolo obnovené cez %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Vaša relácia bola ukončená z dôvodu nečinnosti"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "obsahuje"
@@ -426,19 +481,19 @@ msgstr "obsahuje"
msgid "delete"
msgstr "zmazať"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "väčší alebo rovný"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "je presne"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "menej ako"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "člen"
@@ -449,3 +504,9 @@ msgstr "obnova hesla"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "s hodnotou"
+
+#~ msgid "Group Name"
+#~ msgstr "Meno skupiny"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "Heslá ku privilegovaným účtom nemôžu byť obnovené týmto spôsobom"
diff --git a/lib/CatDap/I18N/sl.po b/lib/CatDap/I18N/sl.po
index 7e551a0..6ebc950 100644
--- a/lib/CatDap/I18N/sl.po
+++ b/lib/CatDap/I18N/sl.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Filip Komar <filip.komar@gmail.com>, 2013
msgid ""
@@ -12,19 +12,20 @@ msgstr ""
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
"i18n@mageia.org>\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivacija"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Dodaj"
@@ -37,7 +38,7 @@ msgid "Add attribute"
msgstr "Dodaj podatek"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Dodaj uporabnika %1 v novo skupino"
@@ -46,32 +47,42 @@ msgstr "Dodaj uporabnika %1 v novo skupino"
msgid "Adding objectclass %1 to dn %2"
msgstr "Dodaj objectclass %1 v %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Naslova se ne ujemata"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Račun s tem e-poštnim naslovom že obstaja"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Račun s tem uporabniškim imenom že obstaja"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
+"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 "Vaš račun je bil ustvarjen, a je prišlo do napake pri pošiljanju e-pošte. Poskusite postopek za pozabljeno geslo, če ste vnesli pravi elektronski naslov. Napaka %1"
+msgstr ""
+"Vaš račun je bil ustvarjen, a je prišlo do napake pri pošiljanju e-pošte. "
+"Poskusite postopek za pozabljeno geslo, če ste vnesli pravi elektronski "
+"naslov. Napaka %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
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 "Vaš račun je bil ustvarjen, a je prišlo do napake pri pošiljanju e-pošte. Poskusite postopek za pozabljeno geslo, če ste vnesli pravi elektronski naslov: %1"
+"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 ""
+"Vaš račun je bil ustvarjen, a je prišlo do napake pri pošiljanju e-pošte. "
+"Poskusite postopek za pozabljeno geslo, če ste vnesli pravi elektronski "
+"naslov: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
@@ -83,11 +94,13 @@ msgstr "Prišlo do napake pri pošiljanju e-pošte. Poskusite kasneje. Napaka %1
msgid "Attribute"
msgstr "Podatek"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
-msgstr "Preverjanje datoteke /etc/passwd ni možno. Opozorite sistemskega administratorja."
+msgstr ""
+"Preverjanje datoteke /etc/passwd ni možno. Opozorite sistemskega "
+"administratorja."
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -99,6 +112,10 @@ msgstr "Spremeni"
msgid "Change password"
msgstr "Spremeni geslo"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Preverite e-pošto, če so navodila za aktivacijo že prispela."
@@ -107,7 +124,7 @@ msgstr "Preverite e-pošto, če so navodila za aktivacijo že prispela."
msgid "Check your mail for password reset instructions."
msgstr "Preverite e-pošto, če je postopek za pozabljeno geslo že prispel."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Potrdi e-poštni naslov"
@@ -122,13 +139,13 @@ msgstr "Trenutno geslo"
msgid "Dear %1,"
msgstr "Spoštovani %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Izbriši"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Izbriši uporabnika %1 iz naslednje skupine:"
@@ -136,14 +153,19 @@ msgstr "Izbriši uporabnika %1 iz naslednje skupine:"
msgid "Edit"
msgstr "Uredi"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-pošta"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-poštni naslov"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Uporabniško ime ni pooblaščeno za uporabo"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-pošta poslana."
@@ -152,7 +174,7 @@ msgstr "E-pošta poslana."
msgid "Enter new password."
msgstr "Vnesite novo geslo"
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Vstavite tekst"
@@ -161,7 +183,7 @@ msgstr "Vstavite tekst"
msgid "Error while searching for account: "
msgstr "Prišlo je do napake pri iskanju računa:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Ime"
@@ -173,7 +195,7 @@ msgstr "Ste pozabili geslo?"
msgid "Forgotten password"
msgstr "Pozabljeno geslo"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Pozabljeno geslo?"
@@ -181,15 +203,11 @@ msgstr "Pozabljeno geslo?"
msgid "Full Name"
msgstr "Polno ime"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Ime skupine"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Ime skupine vsebuje neveljavne znake"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Ime skupine"
@@ -205,20 +223,20 @@ msgstr "Skupine, ki se ujemajo s kriteriji iskanja"
msgid "Groups you manage"
msgstr "Skupine, katere upravljate"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Tekst preverjanja se ne ujema, poskusite ponovno"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Neveljaven e-poštni naslov"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Neveljavno uporabniško ime"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Neveljavno uporabniško ime, saj je že v sistemski uporabi"
@@ -226,11 +244,11 @@ msgstr "Neveljavno uporabniško ime, saj je že v sistemski uporabi"
msgid "List of users promoted :"
msgstr "Seznam sprejetih uporabnikov:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Odjava"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Prijava"
@@ -238,7 +256,7 @@ msgstr "Prijava"
msgid "More than one ID Pool"
msgstr "Več kot en bazen ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Ujemanje več kot enega vnosa"
@@ -247,7 +265,7 @@ msgstr "Ujemanje več kot enega vnosa"
msgid "New Password"
msgstr "Novo geslo"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Gesli se ne ujemata."
@@ -255,11 +273,11 @@ msgstr "Gesli se ne ujemata."
msgid "Operation was successful."
msgstr "Postopek je uspel."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Geslo:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Nepravilno geslo"
@@ -271,7 +289,7 @@ msgstr "Geslo je ponastavljeno in e-pošta je poslana"
msgid "Password reset failed: "
msgstr "Ponastavitev gesla ni uspela:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Uporabniški podatki"
@@ -287,10 +305,6 @@ msgstr "Uporabite zgornje menije"
msgid "Primary group"
msgstr "Primarna skupina"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Uporabniški računi z dvignjenimi pravicami ne morejo povrniti gesla na ta način"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Sprejmi"
@@ -299,10 +313,15 @@ msgstr "Sprejmi"
msgid "Promote user to posixAccount with primary group:"
msgstr "Sprejmi uporabnika v posixAccount s primarno skupino:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registriraj"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registracija končana"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registracija končana"
@@ -316,35 +335,62 @@ msgstr "Registracija uspešna."
msgid "Repeat New Password"
msgstr "Ponovite novo geslo"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Ponastavi geslo"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Iskanje"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Iskanje s/z"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Vnesite novo geslo"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Uspeh"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Priimek"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Podano ime vsebuje neveljavne znake"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Podan priimek vsebuje neveljavne znake"
@@ -364,7 +410,7 @@ msgstr "Za ponastavitev vašega gesla kliknite spodnjo povezavo."
msgid "Transaction ID mismatch"
msgstr "ID transakcije se ne ujema"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Posodobi"
@@ -376,7 +422,7 @@ msgstr "Uporabniško ime"
msgid "Username : "
msgstr "Uporabniško ime:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Uporabniško ime ni pooblaščeno za uporabo"
@@ -385,17 +431,37 @@ msgstr "Uporabniško ime ni pooblaščeno za uporabo"
msgid "Value"
msgstr "Vrednost"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "Podana je bila zahteva po spremembi gesla na vašem računu %1. Nič vam ni potrebno storiti, če niste sami zahtevali spremembe gesla ali ga ne želite spremeniti."
+"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 ""
+"Podana je bila zahteva po spremembi gesla na vašem računu %1. Nič vam ni "
+"potrebno storiti, če niste sami zahtevali spremembe gesla ali ga ne želite "
+"spremeniti."
#. (c.config.organisation)
#: root/email/activation.tt:2
-msgid ""
-"Your %1 account has been successfully created, but requires activation."
+msgid "Your %1 account has been successfully created, but requires activation."
msgstr "Vaš račun %1 je bil ustvarjen, a potrebuje še aktivacijo."
#. (c.user.username)
@@ -403,11 +469,11 @@ msgstr "Vaš račun %1 je bil ustvarjen, a potrebuje še aktivacijo."
msgid "Your password was reset by %1"
msgstr "Ponastavitev vašega gesla je izvedel %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Vaša seja se je iztekla"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "vsebuje"
@@ -415,19 +481,19 @@ msgstr "vsebuje"
msgid "delete"
msgstr "izbriši"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "večji ali enak"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "je natanko"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "manj kot"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "član"
@@ -438,3 +504,11 @@ msgstr "Ponastavitev gesla"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "Z vrednostjo"
+
+#~ msgid "Group Name"
+#~ msgstr "Ime skupine"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Uporabniški računi z dvignjenimi pravicami ne morejo povrniti gesla na ta "
+#~ "način"
diff --git a/lib/CatDap/I18N/sq.po b/lib/CatDap/I18N/sq.po
index 71d0ec1..a9daeec 100644
--- a/lib/CatDap/I18N/sq.po
+++ b/lib/CatDap/I18N/sq.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivizimi"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Shto"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "Shto atribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Shto përdorues %1 tek një grup"
@@ -46,20 +46,24 @@ msgstr "Shto përdorues %1 tek një grup"
msgid "Adding objectclass %1 to dn %2"
msgstr "Shtimi objectclass %1 në %2 dn"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresat nuk përputhen"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Një llogari e tillë ekziston me këtë adresë e-mail"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Një llogari e tillë ekziston me këtë emër përdoruesi"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -91,13 +95,13 @@ msgstr ""
msgid "Attribute"
msgstr "Atribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Nuk mund të kontrollojë /etc/passwd, ju lutem paralajmëroni administratorët "
"e sistemit"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -109,6 +113,10 @@ msgstr "Ndrysho"
msgid "Change password"
msgstr "Ndrysho fjalëkalimin"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Kontrolloni mail-in tuaj për udhëzimet e aktivizimit."
@@ -117,7 +125,7 @@ msgstr "Kontrolloni mail-in tuaj për udhëzimet e aktivizimit."
msgid "Check your mail for password reset instructions."
msgstr "Kontrolloni mail-in tuaj për udhëzime për rivendosjen e fjalëkalimin."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Konfirmo adresën Email-it"
@@ -132,13 +140,13 @@ msgstr "Fjalëkalimi aktual"
msgid "Dear %1,"
msgstr "I dashur %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Fshi"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Fshi përdoruesin %1 nga grupi ekzistues"
@@ -146,14 +154,19 @@ msgstr "Fshi përdoruesin %1 nga grupi ekzistues"
msgid "Edit"
msgstr "Modifiko"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Adresa Email-it"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Përdoruesi nuk është i autorizuar për tu përdorur"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Email-i u dërgua."
@@ -162,7 +175,7 @@ msgstr "Email-i u dërgua."
msgid "Enter new password."
msgstr "Shkruani fjalëkalimin e ri."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Shkruani tekstin"
@@ -171,7 +184,7 @@ msgstr "Shkruani tekstin"
msgid "Error while searching for account: "
msgstr "Gabim, ndërsa kërkon për llogari:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Emri"
@@ -183,7 +196,7 @@ msgstr "Keni harruar fjalëkalimin tuaj?"
msgid "Forgotten password"
msgstr "Keni harruar fjalëkalimin"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Keni harruar fjalëkalimin?"
@@ -191,15 +204,11 @@ msgstr "Keni harruar fjalëkalimin?"
msgid "Full Name"
msgstr "Emri i Plot"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Emri i Grupit"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Grupi përmban karakter të paligjshëm"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Emri i grupit"
@@ -215,20 +224,20 @@ msgstr "Grupet që përputhen me kriteret e kërkimit"
msgid "Groups you manage"
msgstr "Grupe që menaxhoni ju"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Teksti i pasaktë, ju lutem provoni përsëri"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Adresa Email-it pasaktë"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Përdoruesit pasaktë"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Përdoruesi pasaktë, përdorur tashmë nga sistemi"
@@ -236,11 +245,11 @@ msgstr "Përdoruesi pasaktë, përdorur tashmë nga sistemi"
msgid "List of users promoted :"
msgstr "Lista e përdoruesve promovuar:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Dil"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Hyr"
@@ -248,7 +257,7 @@ msgstr "Hyr"
msgid "More than one ID Pool"
msgstr "Më shumë se një Pool ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Më shumë se një hyrje përputhen"
@@ -257,7 +266,7 @@ msgstr "Më shumë se një hyrje përputhen"
msgid "New Password"
msgstr "Fjalëkalimin i'ri"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Fjalëkalimin i'ri nuk përputhet"
@@ -265,11 +274,11 @@ msgstr "Fjalëkalimin i'ri nuk përputhet"
msgid "Operation was successful."
msgstr "Operacioni ishte i suksesshëm."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Fjalëkalim :"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Fjalëkalim gabim"
@@ -281,7 +290,7 @@ msgstr "Rivendosja fjalëkalimit u dërgua me email "
msgid "Password reset failed: "
msgstr "Rivendosja fjalëkalimit dështoi:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Informacion personal"
@@ -297,12 +306,6 @@ msgstr "Ju lutem përdorni menytë më sipër."
msgid "Primary group"
msgstr "Grupi Primar"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Llogaritë e privilegjuar nuk mund të rimarrin fjalëkalimet përmes këtij "
-"mekanizmi"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Promovo"
@@ -311,10 +314,15 @@ msgstr "Promovo"
msgid "Promote user to posixAccount with primary group:"
msgstr "Nxit përdoruesit në posixAccount me grupim primar:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Regjistro"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Regjistro përfundoi"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Regjistro përfundoi"
@@ -328,35 +336,62 @@ msgstr "Regjistrimi me sukses."
msgid "Repeat New Password"
msgstr "Përsërit fjalëkalimin e ri"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Rivendos fjalëkalimin"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Kërko"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Kërko sipas"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Vendos fjalëkalimin e ri."
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Sukses"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Mbiemri"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Emri i furnizuar përmban karaktere të paligjshme"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Mbiemri i furnizuar përmban karaktere të paligjshme"
@@ -377,7 +412,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr "Transaksion ID mospërputhje"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Përditëso"
@@ -389,7 +424,7 @@ msgstr "Përdoruesi"
msgid "Username : "
msgstr "Përdoruesi :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Përdoruesi nuk është i autorizuar për tu përdorur"
@@ -398,6 +433,24 @@ msgstr "Përdoruesi nuk është i autorizuar për tu përdorur"
msgid "Value"
msgstr "Vlera"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -418,11 +471,11 @@ msgstr "%1 llogaria juaj është krijuar me sukses, por kërkon aktivizimin."
msgid "Your password was reset by %1"
msgstr "Fjalëkalimi juaj ishte rivendosur nga %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Sesioni juaj ka skaduar"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "përmban"
@@ -430,19 +483,19 @@ msgstr "përmban"
msgid "delete"
msgstr "fshi"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "më e madhe se ose e barabartë me"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "është pikërisht"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "më pak se"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "anëtar"
@@ -453,3 +506,11 @@ msgstr "Rivendosja fjalëkalimit"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "me vlerë"
+
+#~ msgid "Group Name"
+#~ msgstr "Emri i Grupit"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Llogaritë e privilegjuar nuk mund të rimarrin fjalëkalimet përmes këtij "
+#~ "mekanizmi"
diff --git a/lib/CatDap/I18N/sr.po b/lib/CatDap/I18N/sr.po
index d9f2263..b5d3c22 100644
--- a/lib/CatDap/I18N/sr.po
+++ b/lib/CatDap/I18N/sr.po
@@ -19,13 +19,13 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Активација"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Додај"
@@ -38,7 +38,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -47,20 +47,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -84,11 +88,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -100,6 +104,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -108,7 +116,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -123,13 +131,13 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Бриши"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -137,14 +145,18 @@ msgstr ""
msgid "Edit"
msgstr "Измени"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -153,7 +165,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -162,7 +174,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -174,7 +186,7 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -182,15 +194,11 @@ msgstr ""
msgid "Full Name"
msgstr "Пуно име"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Име групе"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -206,20 +214,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -227,11 +235,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -239,7 +247,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -248,7 +256,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -256,11 +264,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -272,7 +280,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -288,10 +296,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -300,10 +304,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -317,35 +325,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -365,7 +400,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Надоградња"
@@ -377,7 +412,7 @@ msgstr "Корисничко име"
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -386,6 +421,24 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -403,11 +456,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -415,19 +468,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -438,3 +491,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "Име групе"
diff --git a/lib/CatDap/I18N/sv.po b/lib/CatDap/I18N/sv.po
index b8cfc73..8f0e1e5 100644
--- a/lib/CatDap/I18N/sv.po
+++ b/lib/CatDap/I18N/sv.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Kristoffer Grundströ <kristoffer.grundstrom1983@gmail.com>, 2013
# Kristoffer Grundströ <kristoffer.grundstrom1983@gmail.com>, 2013-2014
@@ -12,20 +12,21 @@ msgstr ""
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2014-05-07 10:40+0000\n"
"Last-Translator: Willard1975 <willard@null.net>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
+"sv/)\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Aktivering"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Lägg till"
@@ -38,7 +39,7 @@ msgid "Add attribute"
msgstr "Lägg till atribut"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Lägg till användare %1 till en ny grupp"
@@ -47,48 +48,59 @@ msgstr "Lägg till användare %1 till en ny grupp"
msgid "Adding objectclass %1 to dn %2"
msgstr "Lägger till objektklass %1 till dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresserna matchar inte"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Det finns redan ett konto med den här emailadressen"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Det finns redan ett konto med det här användarnamnet"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
+"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 "Det uppstod ett fel vid skickande av e-post, men ditt konto blev skapat. Var god prova processen för återställning av lösenordet om du angav korrekta e-postadress. Felen %1"
+msgstr ""
+"Det uppstod ett fel vid skickande av e-post, men ditt konto blev skapat. Var "
+"god prova processen för återställning av lösenordet om du angav korrekta e-"
+"postadress. Felen %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
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 "Ett fel uppstod när e-post skulle skickas, men ditt konto blev skapat. Var god prova proceduren för återställning av lösenordet om du angav korrekt e-postadress: %1"
+"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 ""
+"Ett fel uppstod när e-post skulle skickas, men ditt konto blev skapat. Var "
+"god prova proceduren för återställning av lösenordet om du angav korrekt e-"
+"postadress: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
-msgstr "Ett fel inträffade när e-post skickades, var god försök igen senare. Felen %1"
+msgstr ""
+"Ett fel inträffade när e-post skickades, var god försök igen senare. Felen %1"
#: 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 "Attribut"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "Kan inte kolla /etc/passwd, vänligen varna systemadministratörer"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -100,6 +112,10 @@ msgstr "Ändra"
msgid "Change password"
msgstr "Ändra lösenord"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Kolla din epost för aktiveringsinstruktioner"
@@ -108,7 +124,7 @@ msgstr "Kolla din epost för aktiveringsinstruktioner"
msgid "Check your mail for password reset instructions."
msgstr "Kolla i din mail efter instruktioner för lösenordsåterställning."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Bekräfta epostadressen"
@@ -123,13 +139,13 @@ msgstr "Nuvarande lösenord"
msgid "Dear %1,"
msgstr "Kära %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Ta bort"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Ta bort användare %1 från en existerande grupp:"
@@ -137,14 +153,19 @@ msgstr "Ta bort användare %1 från en existerande grupp:"
msgid "Edit"
msgstr "Redigera"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-post"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-postadress"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Användarnamn är inte tillåtet att använda"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-post skickad."
@@ -153,7 +174,7 @@ msgstr "E-post skickad."
msgid "Enter new password."
msgstr "Ange nytt lösenord."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Ange text"
@@ -162,7 +183,7 @@ msgstr "Ange text"
msgid "Error while searching for account: "
msgstr "Fel vid sökning av konto:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Förnamn"
@@ -174,7 +195,7 @@ msgstr "Har du glömt ditt lösenord?"
msgid "Forgotten password"
msgstr "Glömt lösenordet"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Har du glömt lösenordet?"
@@ -182,15 +203,11 @@ msgstr "Har du glömt lösenordet?"
msgid "Full Name"
msgstr "Fullständigt namn"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Gruppnamn"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Gruppen innehåller otillåtna tecken"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Gruppnamn"
@@ -206,20 +223,20 @@ msgstr "Grupper som matchar sök-kriteriet"
msgid "Groups you manage"
msgstr "Grupper som du hanterar"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Ej korrekt valideringstext, var god försök senare"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Ogiltig e-postadress"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Ogiltigt användarnamn"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Ogiltigt användarnamn, används redan av systemet"
@@ -227,11 +244,11 @@ msgstr "Ogiltigt användarnamn, används redan av systemet"
msgid "List of users promoted :"
msgstr "Lista över befordrade medlemmar :"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Logga ut"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Logga in"
@@ -239,7 +256,7 @@ msgstr "Logga in"
msgid "More than one ID Pool"
msgstr "Mer än en ID-pool"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Fler än en post matchade"
@@ -248,7 +265,7 @@ msgstr "Fler än en post matchade"
msgid "New Password"
msgstr "Nytt lösenord"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "De nya lösenorden matchar inte"
@@ -256,11 +273,11 @@ msgstr "De nya lösenorden matchar inte"
msgid "Operation was successful."
msgstr "Operationen lyckades."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Lösenord :"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Ej korrekt lösenord"
@@ -272,7 +289,7 @@ msgstr "Lösenordet återställt och e-post skickad"
msgid "Password reset failed: "
msgstr "Återställning av lösenordet misslyckades:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Personlig information"
@@ -288,10 +305,6 @@ msgstr "Vänligen använd menyerna ovanför."
msgid "Primary group"
msgstr "Primär grupp"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Privilegierade konton kan ej återställa lösenord via denna mekanism"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Befordra"
@@ -300,10 +313,15 @@ msgstr "Befordra"
msgid "Promote user to posixAccount with primary group:"
msgstr "Befordra användare till posixAccount med primär grupp:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Registrera"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Registrering slutförd"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Registrering slutförd"
@@ -317,35 +335,62 @@ msgstr "Registrering lyckades."
msgid "Repeat New Password"
msgstr "Repetera nytt lösenord"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Återställ lösenord"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Sök"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Sök med"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Ställ in nytt lösenord"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Succé"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Efternamn"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Det första angivna namnet innehåller otillåtna tecken"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Efternamnet som angavs innehåller otillåtna tecken"
@@ -365,7 +410,7 @@ msgstr "För att återställa ditt lösenord, vänligen följ nedanstående län
msgid "Transaction ID mismatch"
msgstr "Transaktions-ID matchar inte."
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Uppdatera"
@@ -377,7 +422,7 @@ msgstr "Användarnamn"
msgid "Username : "
msgstr "Användarnamn :"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Användarnamn är inte tillåtet att använda"
@@ -386,17 +431,37 @@ msgstr "Användarnamn är inte tillåtet att använda"
msgid "Value"
msgstr "Värde"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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 "Ditt %1-konto har tillfrågats för att ändra lösenordet. Om du inte gjorde detta eller om du inte ville ändra ditt lösenord så behöverdu inte vidta några åtgärder."
+"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 ""
+"Ditt %1-konto har tillfrågats för att ändra lösenordet. Om du inte gjorde "
+"detta eller om du inte ville ändra ditt lösenord så behöverdu inte vidta "
+"några åtgärder."
#. (c.config.organisation)
#: root/email/activation.tt:2
-msgid ""
-"Your %1 account has been successfully created, but requires activation."
+msgid "Your %1 account has been successfully created, but requires activation."
msgstr "Ditt %1-konto har skapats utan problem, men kräver aktivering."
#. (c.user.username)
@@ -404,11 +469,11 @@ msgstr "Ditt %1-konto har skapats utan problem, men kräver aktivering."
msgid "Your password was reset by %1"
msgstr "Ditt lösenord återställdes av %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Din session har upphört"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "innehåller"
@@ -416,19 +481,19 @@ msgstr "innehåller"
msgid "delete"
msgstr "ta bort"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "större än eller lika med"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "är exakt"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "mindre än"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "medlem"
@@ -439,3 +504,9 @@ msgstr "återställ lösenordet"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "med värde"
+
+#~ msgid "Group Name"
+#~ msgstr "Gruppnamn"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "Privilegierade konton kan ej återställa lösenord via denna mekanism"
diff --git a/lib/CatDap/I18N/tg.po b/lib/CatDap/I18N/tg.po
index d58ead2..98cf160 100644
--- a/lib/CatDap/I18N/tg.po
+++ b/lib/CatDap/I18N/tg.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Фаъолсозӣ"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Илова"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr ""
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr ""
@@ -46,20 +46,24 @@ msgstr ""
msgid "Adding objectclass %1 to dn %2"
msgstr ""
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr ""
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -83,11 +87,11 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -99,6 +103,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -107,7 +115,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -122,13 +130,13 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Нест кардан"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Корбари %1-ро аз гурӯҳи мавҷудбуда нест кунед:"
@@ -136,14 +144,18 @@ msgstr "Корбари %1-ро аз гурӯҳи мавҷудбуда нест
msgid "Edit"
msgstr "Таҳрир"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -152,7 +164,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -161,7 +173,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -173,7 +185,7 @@ msgstr ""
msgid "Forgotten password"
msgstr "Паролро фаромӯш кардам"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -181,15 +193,11 @@ msgstr ""
msgid "Full Name"
msgstr "Номи Пурра"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Номи гурӯҳ"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -205,20 +213,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -226,11 +234,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -238,7 +246,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -247,7 +255,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -255,11 +263,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -271,7 +279,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -287,10 +295,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -299,10 +303,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -316,35 +324,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -364,7 +399,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Нав кардан"
@@ -376,7 +411,7 @@ msgstr "Номи корванд"
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -385,6 +420,24 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -402,11 +455,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -414,19 +467,19 @@ msgstr ""
msgid "delete"
msgstr "нест кардан"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -437,3 +490,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "Номи гурӯҳ"
diff --git a/lib/CatDap/I18N/th.po b/lib/CatDap/I18N/th.po
index adad6a6..f5255fd 100644
--- a/lib/CatDap/I18N/th.po
+++ b/lib/CatDap/I18N/th.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Rockers <sumorock@hotmail.com>, 2016
msgid ""
@@ -10,20 +10,21 @@ msgstr ""
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2016-04-26 08:31+0000\n"
"Last-Translator: Rockers <sumorock@hotmail.com>\n"
-"Language-Team: Thai (http://www.transifex.com/MageiaLinux/mageia/language/th/)\n"
+"Language-Team: Thai (http://www.transifex.com/MageiaLinux/mageia/language/"
+"th/)\n"
+"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "การเปิดใช้งาน"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "เพิ่ม"
@@ -36,7 +37,7 @@ msgid "Add attribute"
msgstr "เพิ่มแอตทริบิวต์"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "เพิ่มผู้ใช้ %1 ไปยังกลุ่มใหม่"
@@ -45,32 +46,40 @@ msgstr "เพิ่มผู้ใช้ %1 ไปยังกลุ่มใ
msgid "Adding objectclass %1 to dn %2"
msgstr "กำลังเพิ่ม objectclass %1 ไปยัง dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "ที่อยู่ไม่ตรงกัน"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "บัญชีถูกใช้กับที่อยู่อีเมลนี้แล้ว"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "บัญชีถูกใช้กับชื่อผู้ใช้นี้แล้ว"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
+"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 "เกิดข้อผิดพลาดในการส่งอีเมล แต่บัญชีของคุณได้ถูกสร้างขึ้นแล้ว กรุณาลองเรียกใช้กระบวนการกู้คืนรหัสผ่าน ถ้าคุณป้อนที่อยู่อีเมลที่ถูกต้อง ข้อผิดพลาด %1"
+msgstr ""
+"เกิดข้อผิดพลาดในการส่งอีเมล แต่บัญชีของคุณได้ถูกสร้างขึ้นแล้ว "
+"กรุณาลองเรียกใช้กระบวนการกู้คืนรหัสผ่าน ถ้าคุณป้อนที่อยู่อีเมลที่ถูกต้อง ข้อผิดพลาด %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
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 "เกิดข้อผิดพลาดในการส่งอีเมล แต่บัญชีของคุณได้ถูกสร้างขึ้นแล้ว กรุณาลองเรียกใช้กระบวนการกู้คืนรหัสผ่าน ถ้าคุณป้อนที่อยู่อีเมลที่ถูกต้อง: %1"
+"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 ""
+"เกิดข้อผิดพลาดในการส่งอีเมล แต่บัญชีของคุณได้ถูกสร้างขึ้นแล้ว "
+"กรุณาลองเรียกใช้กระบวนการกู้คืนรหัสผ่าน ถ้าคุณป้อนที่อยู่อีเมลที่ถูกต้อง: %1"
#. ($errors)
#: lib/CatDap/Controller/forgot_password.pm:110
@@ -82,11 +91,11 @@ msgstr "เกิดข้อผิดพลาดในการส่งอี
msgid "Attribute"
msgstr ""
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr ""
@@ -98,6 +107,10 @@ msgstr ""
msgid "Change password"
msgstr ""
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr ""
@@ -106,7 +119,7 @@ msgstr ""
msgid "Check your mail for password reset instructions."
msgstr ""
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr ""
@@ -121,13 +134,13 @@ msgstr ""
msgid "Dear %1,"
msgstr ""
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "ลบ"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr ""
@@ -135,14 +148,18 @@ msgstr ""
msgid "Edit"
msgstr "แก้ไข"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr ""
+#: lib/CatDap/Controller/register.pm:74
+msgid "Email domain is not authorized to be used"
+msgstr ""
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr ""
@@ -151,7 +168,7 @@ msgstr ""
msgid "Enter new password."
msgstr ""
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr ""
@@ -160,7 +177,7 @@ msgstr ""
msgid "Error while searching for account: "
msgstr ""
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr ""
@@ -172,7 +189,7 @@ msgstr ""
msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr ""
@@ -180,15 +197,11 @@ msgstr ""
msgid "Full Name"
msgstr "ชื่อเต็ม"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "ชื่อกลุ่ม"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr ""
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr ""
@@ -204,20 +217,20 @@ msgstr ""
msgid "Groups you manage"
msgstr ""
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr ""
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr ""
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr ""
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr ""
@@ -225,11 +238,11 @@ msgstr ""
msgid "List of users promoted :"
msgstr ""
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr ""
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr ""
@@ -237,7 +250,7 @@ msgstr ""
msgid "More than one ID Pool"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr ""
@@ -246,7 +259,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr ""
@@ -254,11 +267,11 @@ msgstr ""
msgid "Operation was successful."
msgstr ""
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr ""
@@ -270,7 +283,7 @@ msgstr ""
msgid "Password reset failed: "
msgstr ""
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr ""
@@ -286,10 +299,6 @@ msgstr ""
msgid "Primary group"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -298,10 +307,14 @@ msgstr ""
msgid "Promote user to posixAccount with primary group:"
msgstr ""
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr ""
+#: root/index.tt:18
+msgid "Register an account"
+msgstr ""
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr ""
@@ -315,35 +328,62 @@ msgstr ""
msgid "Repeat New Password"
msgstr ""
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr ""
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr ""
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr ""
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr ""
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr ""
@@ -363,7 +403,7 @@ msgstr ""
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "อัพเดท"
@@ -375,7 +415,7 @@ msgstr "ชื่อผู้ใช้"
msgid "Username : "
msgstr ""
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr ""
@@ -384,17 +424,34 @@ msgstr ""
msgid "Value"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+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."
+"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."
+msgid "Your %1 account has been successfully created, but requires activation."
msgstr ""
#. (c.user.username)
@@ -402,11 +459,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr ""
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr ""
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr ""
@@ -414,19 +471,19 @@ msgstr ""
msgid "delete"
msgstr ""
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr ""
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr ""
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr ""
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr ""
@@ -437,3 +494,6 @@ msgstr ""
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr ""
+
+#~ msgid "Group Name"
+#~ msgstr "ชื่อกลุ่ม"
diff --git a/lib/CatDap/I18N/tr.po b/lib/CatDap/I18N/tr.po
index d97015e..cec8c62 100644
--- a/lib/CatDap/I18N/tr.po
+++ b/lib/CatDap/I18N/tr.po
@@ -16,11 +16,13 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n>1);\n"
"X-Generator: Virtaal 0.7.1\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Etkinleştirme"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11 root/admin/account_modify.tt:24 root/admin/group_modify.tt:21 root/user/index.tt:19 root/user/index.tt:48
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
+#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Ekle"
@@ -33,7 +35,7 @@ msgid "Add attribute"
msgstr "Öznitelik Ekle"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "%1 kullanıcısını yeni bir gruba ekleyin"
@@ -42,27 +44,31 @@ msgstr "%1 kullanıcısını yeni bir gruba ekleyin"
msgid "Adding objectclass %1 to dn %2"
msgstr "Objectclass %1, dn %2 üzerine ekleniyor"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Adresler eşleşmiyor"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Bu e-posta adresi ile bir hesap zaten var"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Bu kullanıcı adı ile bir hesap zaten var"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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 ""
-"E-posta gönderirken bir hata oluştu, ancak hesabınız oluşturuldu. Doğru "
-"e-posta adresini girdiyseniz parola kurtarma sürecini deneyin. Hata %1"
+"E-posta gönderirken bir hata oluştu, ancak hesabınız oluşturuldu. Doğru e-"
+"posta adresini girdiyseniz parola kurtarma sürecini deneyin. Hata %1"
#. ($errors)
#: lib/CatDap/Controller/admin.pm:562
@@ -80,15 +86,16 @@ msgstr ""
"E-posta gönderirken bir hata oluştu, lütfen daha sonra yeniden deneyin. Hata "
"%1"
-#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
+#: 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 "Öznitelik"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "/etc/passwd denetlenemedi. Lütfen sistem yöneticilerini uyarın"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Doğrulama kodu"
@@ -100,6 +107,10 @@ msgstr "Değiştir"
msgid "Change password"
msgstr "Parola değiştir"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Etkinleştirme yönergeleri için e-posta kutunuzu denetleyin."
@@ -108,7 +119,7 @@ msgstr "Etkinleştirme yönergeleri için e-posta kutunuzu denetleyin."
msgid "Check your mail for password reset instructions."
msgstr "Parola sıfırlama yönergeleri için e-posta kutunuzu denetleyin."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "E-posta adresinizi onaylayın"
@@ -118,16 +129,18 @@ msgstr "Şu anki parola"
#. (cn)
#. (entry.cn)
-#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_password.tt:1
+#: root/email/activation.tt:1 root/email/admin/password.tt:1
+#: root/email/forgot_password.tt:1
msgid "Dear %1,"
msgstr "Sayın %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27 root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Sil"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "%1 kullanıcısını var olan bir gruptan silin:"
@@ -135,14 +148,19 @@ msgstr "%1 kullanıcısını var olan bir gruptan silin:"
msgid "Edit"
msgstr "Düzenle"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "E-posta"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "E-posta adresi"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Kullanıcı adı kullanılmaya müsait değil"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "E-posta gönderildi."
@@ -151,15 +169,16 @@ msgstr "E-posta gönderildi."
msgid "Enter new password."
msgstr "Yeni parolayı girin."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Metin girin"
-#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76
+#: lib/CatDap/Controller/forgot_password.pm:62
+#: lib/CatDap/Controller/forgot_password.pm:76
msgid "Error while searching for account: "
msgstr "Hesap için arama yapılırken hata oluştu: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Adınız"
@@ -171,7 +190,7 @@ msgstr "Parolanızı mı unuttunuz?"
msgid "Forgotten password"
msgstr "Unutulan parola"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Parolanızı mı unuttunuz?"
@@ -179,15 +198,11 @@ msgstr "Parolanızı mı unuttunuz?"
msgid "Full Name"
msgstr "Tam İsim"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Grup Adı"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Grup geçersiz karakterler içeriyor"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Grup adı"
@@ -203,19 +218,20 @@ msgstr "Arama ölçütleriyle eşleşen gruplar"
msgid "Groups you manage"
msgstr "Yönettiğiniz gruplar"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "Yanlış doğrulama metni, lütfen yeniden deneyin"
-#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/forgot_password.pm:45
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Geçersiz e-posta adresi"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Geçersiz kullanıcı adı"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Geçersiz kullanıcı adı, zaten sistem tarafından kullanılıyor"
@@ -223,11 +239,11 @@ msgstr "Geçersiz kullanıcı adı, zaten sistem tarafından kullanılıyor"
msgid "List of users promoted :"
msgstr "Yükseltilmiş kullanıcı listesi :"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Çıkış"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Giriş"
@@ -235,15 +251,16 @@ msgstr "Giriş"
msgid "More than one ID Pool"
msgstr "Birden fazla kimlik havuzu"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Eşleşen birden fazla girdi"
-#: root/forgot_password/confirm.tt:8 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:9
msgid "New Password"
msgstr "Yeni Parola"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Yeni parolalar eşleşmiyor"
@@ -251,11 +268,11 @@ msgstr "Yeni parolalar eşleşmiyor"
msgid "Operation was successful."
msgstr "İşlem başarılı oldu."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Parola : "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Geçersiz parola"
@@ -267,7 +284,7 @@ msgstr "Parola sıfırlandı ve e-posta gönderildi"
msgid "Password reset failed: "
msgstr "Parola sıfırlama başarısız oldu: "
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Kişisel Bilgi"
@@ -283,10 +300,6 @@ msgstr "Lütfen yukarıdaki menüleri kullanın."
msgid "Primary group"
msgstr "Birincil grup"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "Ayrıcalıklı hesaplar bu mekanizma ile parolalarını kurtaramayabilirler"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Yükselt"
@@ -295,10 +308,15 @@ msgstr "Yükselt"
msgid "Promote user to posixAccount with primary group:"
msgstr "Kullanıcıyı birincil grupla posixAccount üzerine yükselt:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Kayıt"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Kayıt tamamlandı"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Kayıt tamamlandı"
@@ -307,39 +325,67 @@ msgstr "Kayıt tamamlandı"
msgid "Registration was successful."
msgstr "Kayıt başarılı."
-#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10
+#: root/user/password.tt:12
msgid "Repeat New Password"
msgstr "Yeni Parolayı Yeniden Yazın"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Ara"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Arama ölçütü"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Yeni parola girin"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Başarılı"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Soyadı"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "Sağlanan isim geçersiz karakterler içeriyor"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "Sağlanan soyadı geçersiz karakterler içeriyor"
@@ -359,7 +405,7 @@ msgstr "Şifrenizi sıfırlamak için lütfen aşağıdaki bağlantıyı izleyin
msgid "Transaction ID mismatch"
msgstr "İşlem kimlik eşleşme hatası bulundu"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Güncelle"
@@ -371,14 +417,33 @@ msgstr "Kullanıcı adı"
msgid "Username : "
msgstr "Kullanıcı adı : "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Kullanıcı adı kullanılmaya müsait değil"
-#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9 root/admin/group_modify.tt:6 root/user/index.tt:4
+#: 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 "Değer"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -398,11 +463,11 @@ msgstr "%1 hesabınız başarıyla oluşturuldu; ancak etkinleştirme gerektiriy
msgid "Your password was reset by %1"
msgstr "Parolanız %1 ile değiştirildi"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Oturumunuzun süresi doldu"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "içerir"
@@ -410,19 +475,19 @@ msgstr "içerir"
msgid "delete"
msgstr "sil"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "büyük veya eşit"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "tam olarak"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "küçüktür"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "üye"
@@ -433,3 +498,10 @@ msgstr "parola sıfırlama"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "değeri ile"
+
+#~ msgid "Group Name"
+#~ msgstr "Grup Adı"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Ayrıcalıklı hesaplar bu mekanizma ile parolalarını kurtaramayabilirler"
diff --git a/lib/CatDap/I18N/uk.po b/lib/CatDap/I18N/uk.po
index 7eaef17..94a19a9 100644
--- a/lib/CatDap/I18N/uk.po
+++ b/lib/CatDap/I18N/uk.po
@@ -17,13 +17,13 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Generator: Lokalize 1.5\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "Активація"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "Додати"
@@ -36,7 +36,7 @@ msgid "Add attribute"
msgstr "Додати атрибут"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "Додати користувача %1 до нової групи"
@@ -45,20 +45,24 @@ msgstr "Додати користувача %1 до нової групи"
msgid "Adding objectclass %1 to dn %2"
msgstr "Додавання objectclass %1 до dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "Адреси не збігаються"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "Обліковий запис з такою адресою електронної пошти вже існує"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "Обліковий запис з таким іменем користувача вже існує"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -90,13 +94,13 @@ msgstr ""
msgid "Attribute"
msgstr "Атрибут"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr ""
"Не вдалося перевірити /etc/passwd, повідомте про це адміністраторів цієї "
"системи"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "CAPTCHA"
@@ -108,6 +112,10 @@ msgstr "Змінити"
msgid "Change password"
msgstr "Змінити пароль"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "Настанови щодо активації надіслано до вашої поштової скриньки."
@@ -116,7 +124,7 @@ msgstr "Настанови щодо активації надіслано до
msgid "Check your mail for password reset instructions."
msgstr "Настанови щодо скидання пароля надіслано до вашої поштової скриньки."
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "Підтвердження адреси ел. пошти"
@@ -131,13 +139,13 @@ msgstr "Поточний пароль"
msgid "Dear %1,"
msgstr "Шановний (Шановна) %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "Вилучити"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "Вилучити користувача %1 з наявної групи:"
@@ -145,14 +153,19 @@ msgstr "Вилучити користувача %1 з наявної групи:
msgid "Edit"
msgstr "Змінити"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Ел. пошта"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "Адреса ел. пошти"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "Не можна використовувати вказане ім’я користувача"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "Надіслано ел. повідомлення."
@@ -161,7 +174,7 @@ msgstr "Надіслано ел. повідомлення."
msgid "Enter new password."
msgstr "Вкажіть новий пароль."
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "Введіть текст"
@@ -170,7 +183,7 @@ msgstr "Введіть текст"
msgid "Error while searching for account: "
msgstr "Помилка під час пошуку облікового запису: "
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "Ім'я"
@@ -182,7 +195,7 @@ msgstr "Забули ваш пароль?"
msgid "Forgotten password"
msgstr "Забутий пароль"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "Забули пароль?"
@@ -190,15 +203,11 @@ msgstr "Забули пароль?"
msgid "Full Name"
msgstr "Повне ім'я"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "Назва групи"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "Назва групи містить некоректні символи"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "Назва групи"
@@ -214,20 +223,20 @@ msgstr "Групи, що відповідають критерію пошуку"
msgid "Groups you manage"
msgstr "Групи, якими ви керуєте"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "контрольний текст введено з помилками, повторіть спробу"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "Некоректна адреса електронної пошти"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "Некоректне ім’я користувача"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "Некоректне ім’я користувача, таке вже використано у системі"
@@ -235,11 +244,11 @@ msgstr "Некоректне ім’я користувача, таке вже
msgid "List of users promoted :"
msgstr "Список користувачів з розширеними повноваженнями:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "Вийти"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "Увійти"
@@ -247,7 +256,7 @@ msgstr "Увійти"
msgid "More than one ID Pool"
msgstr "Декілька спроб отримання ідентифікаторів"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "Встановлено відповідність декількох записів"
@@ -256,7 +265,7 @@ msgstr "Встановлено відповідність декількох з
msgid "New Password"
msgstr "Новий пароль"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "Нові паролі не збігаються"
@@ -264,11 +273,11 @@ msgstr "Нові паролі не збігаються"
msgid "Operation was successful."
msgstr "Дію успішно виконано."
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "Пароль: "
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "Помилковий пароль"
@@ -280,7 +289,7 @@ msgstr "Пароль скинуто, надіслано відповідне е
msgid "Password reset failed: "
msgstr "Спроба скидання пароля зазнала невдачі:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "Особиста інформація"
@@ -296,12 +305,6 @@ msgstr "Скористайтеся наведеними вище меню."
msgid "Primary group"
msgstr "Основна група"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr ""
-"Отримання паролів до привілейованих облікових записів у такий спосіб не "
-"передбачено"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "Підвищити"
@@ -310,10 +313,15 @@ msgstr "Підвищити"
msgid "Promote user to posixAccount with primary group:"
msgstr "Підвищити користувача до рівня posixAccount з основною групою:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "Зареєструватись"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "Реєстрацію завершено"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "Реєстрацію завершено"
@@ -327,35 +335,62 @@ msgstr "Реєстрацію успішно виконано."
msgid "Repeat New Password"
msgstr "Повторіть новий пароль"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "Скинути пароль"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "Пошук"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "Знайти за"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "Встановити новий пароль"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "Успіх"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "Прізвище"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "У вказаному імені містяться некоректні символи"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "У вказаному прізвищі містяться некоректні символи"
@@ -376,7 +411,7 @@ msgstr "Щоб скинути ваш пароль, перейдіть за на
msgid "Transaction ID mismatch"
msgstr "Невідповідність ідентифікаторів операції"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "Оновити"
@@ -388,7 +423,7 @@ msgstr "Користувач"
msgid "Username : "
msgstr "Користувач: "
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "Не можна використовувати вказане ім’я користувача"
@@ -397,6 +432,24 @@ msgstr "Не можна використовувати вказане ім’я
msgid "Value"
msgstr "Значення"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -418,11 +471,11 @@ msgstr ""
msgid "Your password was reset by %1"
msgstr "Ваш пароль було скинуто %1"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "Строк роботи у вашому сеансі вичерпано"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "містить"
@@ -430,19 +483,19 @@ msgstr "містить"
msgid "delete"
msgstr "вилучити"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "більше ніж або дорівнює"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "дорівнює"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "менше ніж"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "учасник"
@@ -454,6 +507,14 @@ msgstr "скидання паролю"
msgid "with value"
msgstr "зі значенням"
+#~ msgid "Group Name"
+#~ msgstr "Назва групи"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr ""
+#~ "Отримання паролів до привілейованих облікових записів у такий спосіб не "
+#~ "передбачено"
+
#~ msgid "First Name"
#~ msgstr "Ім'я"
diff --git a/lib/CatDap/I18N/zh_CN.po b/lib/CatDap/I18N/zh_CN.po
index 0d42da6..63f5e74 100644
--- a/lib/CatDap/I18N/zh_CN.po
+++ b/lib/CatDap/I18N/zh_CN.po
@@ -18,13 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "激活"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "添加"
@@ -37,7 +37,7 @@ msgid "Add attribute"
msgstr "添加属性"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "添加用户 %1 至新组"
@@ -46,20 +46,24 @@ msgstr "添加用户 %1 至新组"
msgid "Adding objectclass %1 to dn %2"
msgstr "添加 ObjectClass %1 至 dn %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "地址不匹配"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "该邮箱所对应的账户已经存在"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "该用户名所对应的账户已经存在"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -84,11 +88,11 @@ msgstr "发送邮件失败,请稍后重试。错误 %1"
msgid "Attribute"
msgstr "属性"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "无法检查 /etc/passwd,请向系统管理员报告此错误"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha 验证"
@@ -100,6 +104,10 @@ msgstr "改变"
msgid "Change password"
msgstr "更换密码"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "请查看邮箱中的激活邮件。"
@@ -108,7 +116,7 @@ msgstr "请查看邮箱中的激活邮件。"
msgid "Check your mail for password reset instructions."
msgstr "请查看邮箱中的密码重置邮件。"
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "确认Email 地址"
@@ -123,13 +131,13 @@ msgstr "当前密码"
msgid "Dear %1,"
msgstr "尊敬的 %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "删除"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "将用户 %1 从现存组中移除:"
@@ -137,14 +145,19 @@ msgstr "将用户 %1 从现存组中移除:"
msgid "Edit"
msgstr "编辑"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "Email"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "电子邮件地址"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "此用户名未被授权使用"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "邮件已发送。"
@@ -153,7 +166,7 @@ msgstr "邮件已发送。"
msgid "Enter new password."
msgstr "输入新密码"
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "输入文本"
@@ -162,7 +175,7 @@ msgstr "输入文本"
msgid "Error while searching for account: "
msgstr "搜索账户时出错:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "名"
@@ -174,7 +187,7 @@ msgstr "忘记密码?"
msgid "Forgotten password"
msgstr "忘记密码"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "已忘记密码?"
@@ -182,15 +195,11 @@ msgstr "已忘记密码?"
msgid "Full Name"
msgstr "全名"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "组名"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "组含有非法字符"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "组名称"
@@ -206,20 +215,20 @@ msgstr "符号搜索条件的组"
msgid "Groups you manage"
msgstr "您管理的组"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "验证文本错误,请重试"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "email 地址无效"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "用户名无效"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "该用户名无效(已被系统使用)"
@@ -227,11 +236,11 @@ msgstr "该用户名无效(已被系统使用)"
msgid "List of users promoted :"
msgstr "用于提示的用户列表:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "注销"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "登录"
@@ -239,7 +248,7 @@ msgstr "登录"
msgid "More than one ID Pool"
msgstr "ID 池的数量不能大于一"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "匹配项超过一个"
@@ -248,7 +257,7 @@ msgstr "匹配项超过一个"
msgid "New Password"
msgstr "新密码"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "新密码不相同"
@@ -256,11 +265,11 @@ msgstr "新密码不相同"
msgid "Operation was successful."
msgstr "操作成功。"
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "密码:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "密码不正确"
@@ -272,7 +281,7 @@ msgstr "密码已重置,请查收密码重置邮件"
msgid "Password reset failed: "
msgstr "密码重置失败:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "个人信息"
@@ -288,10 +297,6 @@ msgstr "请使用上方的菜单"
msgid "Primary group"
msgstr "主组"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "私有账户无法通过此功能找回密码"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "提示"
@@ -300,10 +305,15 @@ msgstr "提示"
msgid "Promote user to posixAccount with primary group:"
msgstr "提示用户输入 posix 账户及相应的主组:"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "注册"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "注册完成"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "注册完成"
@@ -317,35 +327,62 @@ msgstr "注册成功。"
msgid "Repeat New Password"
msgstr "重复新密码"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "重设密码"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "搜索"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "搜索由"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "设置新密码"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "成功"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "姓"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "名中包含无效字符"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "姓中包含无效字符"
@@ -365,7 +402,7 @@ msgstr "要重置账户密码,请点击以下链接。"
msgid "Transaction ID mismatch"
msgstr "事务 ID 不匹配"
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "更新"
@@ -377,7 +414,7 @@ msgstr "用户名"
msgid "Username : "
msgstr "用户名:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "此用户名未被授权使用"
@@ -386,6 +423,24 @@ msgstr "此用户名未被授权使用"
msgid "Value"
msgstr "值"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -405,11 +460,11 @@ msgstr "您的 %1 账户已成功创建,但需要进行验证才能使用。"
msgid "Your password was reset by %1"
msgstr "您的密码被 %1 重置"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "您的会话已过期"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "包含"
@@ -417,19 +472,19 @@ msgstr "包含"
msgid "delete"
msgstr "删除"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "大于等于"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "为"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "少于"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "成员"
@@ -440,3 +495,9 @@ msgstr "密码重置"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "为"
+
+#~ msgid "Group Name"
+#~ msgstr "组名"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "私有账户无法通过此功能找回密码"
diff --git a/lib/CatDap/I18N/zh_TW.po b/lib/CatDap/I18N/zh_TW.po
index bf48f0c..7b6d507 100644
--- a/lib/CatDap/I18N/zh_TW.po
+++ b/lib/CatDap/I18N/zh_TW.po
@@ -20,13 +20,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
msgid "Activation"
msgstr "啟動"
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
#: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
msgid "Add"
msgstr "新增"
@@ -39,7 +39,7 @@ msgid "Add attribute"
msgstr "新增屬性"
#. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
msgid "Add user %1 to a new group"
msgstr "加入使用者 %1 到新群組"
@@ -48,20 +48,24 @@ msgstr "加入使用者 %1 到新群組"
msgid "Adding objectclass %1 to dn %2"
msgstr "新增物件類別 %1 到 DN %2"
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
msgid "Addresses do not match"
msgstr "位址不符"
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
msgid "An account already exists with this email address"
msgstr "已經有一個帳號使用此電子郵件地址"
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
msgid "An account already exists with this username"
msgstr "已經有一個帳號使用此使用者名稱"
#. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
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. "
@@ -88,11 +92,11 @@ msgstr "傳送電子郵件地址時發生錯誤,請稍候再試。錯誤:%1"
msgid "Attribute"
msgstr "屬性"
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
msgid "Cannot check /etc/passwd, please warn system administrators"
msgstr "無法檢查 /etc/passwd。請提醒系統管理員"
-#: root/register/index.tt:29
+#: root/register/index.tt:30
msgid "Captcha"
msgstr "Captcha"
@@ -104,6 +108,10 @@ msgstr "變更"
msgid "Change password"
msgstr "變更密碼"
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
#: root/register/complete.tt:5
msgid "Check your mail for activation instructions."
msgstr "已送出啟動說明。請檢查您的郵件。"
@@ -112,7 +120,7 @@ msgstr "已送出啟動說明。請檢查您的郵件。"
msgid "Check your mail for password reset instructions."
msgstr "已送出密碼重設說明。請檢查您的郵件。"
-#: root/register/index.tt:24
+#: root/register/index.tt:25
msgid "Confirm Email address"
msgstr "確認電子郵件地址"
@@ -127,13 +135,13 @@ msgstr "目前的密碼"
msgid "Dear %1,"
msgstr "親愛的 %1,"
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
msgid "Delete"
msgstr "刪除"
#. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
msgid "Delete user %1 from an existing group:"
msgstr "從現有的群組刪除使用者 %1:"
@@ -141,14 +149,19 @@ msgstr "從現有的群組刪除使用者 %1:"
msgid "Edit"
msgstr "編輯"
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
msgid "Email"
msgstr "電子郵件"
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
msgid "Email address"
msgstr "電子郵件地址"
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "未授權使用此使用者名稱"
+
#: root/forgot_password/complete.tt:1
msgid "Email sent."
msgstr "電子郵件已傳送。"
@@ -157,7 +170,7 @@ msgstr "電子郵件已傳送。"
msgid "Enter new password."
msgstr "請輸入新密碼。"
-#: root/register/index.tt:32
+#: root/register/index.tt:37
msgid "Enter text"
msgstr "輸入文字"
@@ -166,7 +179,7 @@ msgstr "輸入文字"
msgid "Error while searching for account: "
msgstr "搜尋帳號時發生錯誤:"
-#: root/register/index.tt:13
+#: root/register/index.tt:14
msgid "First name"
msgstr "名"
@@ -178,7 +191,7 @@ msgstr "忘了您的密碼嗎?"
msgid "Forgotten password"
msgstr "忘了密碼"
-#: root/index.tt:17
+#: root/index.tt:11
msgid "Forgotten password?"
msgstr "忘了密碼嗎?"
@@ -186,15 +199,11 @@ msgstr "忘了密碼嗎?"
msgid "Full Name"
msgstr "全名"
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "群組名稱"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
msgid "Group contains illegal characters"
msgstr "群組包含不合法的字元"
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
msgid "Group name"
msgstr "群組名稱"
@@ -210,20 +219,20 @@ msgstr "組符合搜索條件"
msgid "Groups you manage"
msgstr "您管理的群組"
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
msgid "Incorrect validation text, please try again"
msgstr "不正確的確認文字。請稍候再試"
#: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
msgid "Invalid email address"
msgstr "不正確的電子郵件地址"
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
msgid "Invalid username"
msgstr "不正確的使用者名稱"
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
msgid "Invalid username, already used by system"
msgstr "不正確的使用者名稱。此名稱已被系統使用"
@@ -231,11 +240,11 @@ msgstr "不正確的使用者名稱。此名稱已被系統使用"
msgid "List of users promoted :"
msgstr "用戶列表推廣:"
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
msgid "Log out"
msgstr "登出"
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
msgid "Login"
msgstr "登入"
@@ -243,7 +252,7 @@ msgstr "登入"
msgid "More than one ID Pool"
msgstr "多個ID"
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
msgid "More than one entry matched"
msgstr "多個條目匹配"
@@ -252,7 +261,7 @@ msgstr "多個條目匹配"
msgid "New Password"
msgstr "新密碼"
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
msgid "New passwords dont match"
msgstr "輸入密碼不符"
@@ -260,11 +269,11 @@ msgstr "輸入密碼不符"
msgid "Operation was successful."
msgstr "操作成功。"
-#: root/index.tt:10
+#: root/index.tt:9
msgid "Password : "
msgstr "密碼:"
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
msgid "Password incorrect"
msgstr "密碼不正確"
@@ -276,7 +285,7 @@ msgstr "密碼已重設,並已送出電子郵件"
msgid "Password reset failed: "
msgstr "密碼重設失敗:"
-#: root/register/index.tt:12
+#: root/register/index.tt:13
msgid "Personal Information"
msgstr "個人資訊"
@@ -292,10 +301,6 @@ msgstr "請使用上方的選單。"
msgid "Primary group"
msgstr "主要群組"
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "私密帳號不能用這種機制來回復密碼"
-
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr "提升"
@@ -304,10 +309,15 @@ msgstr "提升"
msgid "Promote user to posixAccount with primary group:"
msgstr "提升使用者到主要群組的 posixAccount"
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
msgid "Register"
msgstr "註冊"
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "註冊已完成"
+
#: root/register/complete.tt:1
msgid "Registration completed"
msgstr "註冊已完成"
@@ -321,35 +331,62 @@ msgstr "註冊成功。"
msgid "Repeat New Password"
msgstr "重覆新密碼"
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr "重設密碼"
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
msgid "Search"
msgstr "搜尋"
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
msgid "Search by"
msgstr "搜尋依據"
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr "設定新密碼"
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
#: root/register/check.tt:1
msgid "Success"
msgstr "成功"
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
msgid "Surname"
msgstr "姓"
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
msgid "The first name supplied contains illegal characters"
msgstr "您的名字中有不合法的字元"
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
msgid "The surname supplied contains illegal characters"
msgstr "您的姓裡有不合法的字元"
@@ -369,7 +406,7 @@ msgstr "要重設您的密碼,請點擊以下的連結。"
msgid "Transaction ID mismatch"
msgstr ""
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
msgid "Update"
msgstr "更新"
@@ -381,7 +418,7 @@ msgstr "使用者名稱"
msgid "Username : "
msgstr "使用者名稱:"
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
msgid "Username is not authorized to be used"
msgstr "未授權使用此使用者名稱"
@@ -390,6 +427,24 @@ msgstr "未授權使用此使用者名稱"
msgid "Value"
msgstr "值"
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+" through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+" <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+" <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+" our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+" <a href=\"http://gitweb.mageia.org/\">repositories</a>, \n"
+" <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
#. (c.config.organisation)
#: root/email/forgot_password.tt:2
msgid ""
@@ -407,11 +462,11 @@ msgstr "您的帳號 %1 已成功建立,但是需要啟動。"
msgid "Your password was reset by %1"
msgstr "您的密碼已被 %1 重設"
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
msgid "Your session has expired"
msgstr "您的工作階段已逾時"
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
msgid "contains"
msgstr "包含"
@@ -419,19 +474,19 @@ msgstr "包含"
msgid "delete"
msgstr "刪除"
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
msgid "greater than or equal to"
msgstr "大於等於"
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
msgid "is exactly"
msgstr "等於"
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
msgid "less than"
msgstr "小於"
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
msgid "member"
msgstr "成員"
@@ -442,3 +497,9 @@ msgstr "密碼重設"
#: root/admin/account_modify.tt:53
msgid "with value"
msgstr "新值"
+
+#~ msgid "Group Name"
+#~ msgstr "群組名稱"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "私密帳號不能用這種機制來回復密碼"