summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael McGrath <mmcgrath@desktop.mmcgrath.net>2008-03-13 15:13:32 (GMT)
committerMichael McGrath <mmcgrath@desktop.mmcgrath.net>2008-03-13 15:13:32 (GMT)
commit24595cc78c61942f377b40327f288a5ecd4782af (patch)
tree6b75fcd7e120693b618b7a455854f567baa334cd
parentb24d7d8f6749154070787869564b545bccedc5f4 (diff)
parentfebe55b73f602e5e7198feda5f1533cc3c2419df (diff)
downloadfedora-infrastructure-24595cc78c61942f377b40327f288a5ecd4782af.zip
fedora-infrastructure-24595cc78c61942f377b40327f288a5ecd4782af.tar.gz
fedora-infrastructure-24595cc78c61942f377b40327f288a5ecd4782af.tar.xz
Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure0.6
-rw-r--r--fas/fas/templates/user/list.html2
-rw-r--r--fas/po/fas.pot507
2 files changed, 269 insertions, 240 deletions
diff --git a/fas/fas/templates/user/list.html b/fas/fas/templates/user/list.html
index 8a0ba7c..d2679b7 100644
--- a/fas/fas/templates/user/list.html
+++ b/fas/fas/templates/user/list.html
@@ -33,7 +33,7 @@
<td><a href="${tg.url('/user/view/%s' % person.username)}">${person.username}</a></td>
<td>
<?python
- cla = auth.CLADone(person):
+ cla = auth.CLADone(person)
?>
<span py:if="cla" class="approved">${_('CLA Done')}</span>
<span py:if="not cla" class="unapproved">${_('Not Done')}</span>
diff --git a/fas/po/fas.pot b/fas/po/fas.pot
index b2a4ee5..a99f8f8 100644
--- a/fas/po/fas.pot
+++ b/fas/po/fas.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-03-11 19:47-0400\n"
+"POT-Creation-Date: 2008-03-13 11:06-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,103 +17,82 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.1\n"
-#: fas/auth.py:158 fas/auth.py:166
+#: fas/auth.py:149 fas/auth.py:157
#, python-format
msgid "%s membership required before application to this group is allowed"
msgstr ""
-#: fas/cla.py:53
+#: fas/cla.py:52
msgid ""
"To sign the CLA we must have your telephone number, postal address and "
-"gpg key id. Please ensure they have been filled out"
+"GPG key ID. Please ensure they have been filled out."
msgstr ""
-#: fas/cla.py:70 fas/cla.py:96
+#: fas/cla.py:56 fas/cla.py:82
msgid "You have already signed the CLA."
msgstr ""
-#: fas/cla.py:109 fas/user.py:448
+#: fas/cla.py:95 fas/user.py:520
msgid "Your key could not be retrieved from subkeys.pgp.net"
msgstr ""
-#: fas/cla.py:122
+#: fas/cla.py:108
#, python-format
msgid "Your signature could not be verified: '%s'."
msgstr ""
-#: fas/cla.py:132
+#: fas/cla.py:118
msgid ""
"Your signature's fingerprint did not match the fingerprint registered in "
"FAS."
msgstr ""
-#: fas/cla.py:141
+#: fas/cla.py:127
msgid "Your key did not match your email."
msgstr ""
-#: fas/cla.py:146
+#: fas/cla.py:132
msgid "len(sigs) == 0"
msgstr ""
-#: fas/cla.py:152
+#: fas/cla.py:138
msgid "The GPG-signed part of the message did not contain a signed CLA."
msgstr ""
-#: fas/cla.py:157
+#: fas/cla.py:143
msgid "The text \"I agree\" was not found in the CLA."
msgstr ""
-#: fas/cla.py:171 fas/cla.py:218
+#: fas/cla.py:155
#, python-format
msgid "You could not be added to the '%s' group."
msgstr ""
-#: fas/cla.py:188
+#: fas/cla.py:167
#, python-format
msgid "You have successfully signed the CLA. You are now in the '%s' group."
msgstr ""
-#: fas/cla.py:202
-msgid ""
-"You have already signed the CLA, so it is unnecessary to complete the "
-"Click-through CLA."
-msgstr ""
-
-#: fas/cla.py:206
-msgid "You have already completed the Click-through CLA."
-msgstr ""
-
-#: fas/cla.py:222
-#, python-format
-msgid ""
-"You have successfully agreed to the click-through CLA. You are now in "
-"the '%s' group."
-msgstr ""
-
-#: fas/cla.py:226
-msgid "You have not agreed to the click-through CLA."
-msgstr ""
-
-#: fas/controllers.py:104
+#: fas/controllers.py:99
#, python-format
msgid "Welcome, %s"
msgstr ""
-#: fas/controllers.py:119
+#: fas/controllers.py:114
msgid ""
"The credentials you supplied were not correct or did not grant access to "
"this resource."
msgstr ""
-#: fas/controllers.py:122
+#: fas/controllers.py:117
msgid "You must provide your credentials before accessing this resource."
msgstr ""
-#: fas/controllers.py:125
+#: fas/controllers.py:120
msgid "Please log in."
msgstr ""
-#: fas/controllers.py:136
+#: fas/controllers.py:131
msgid "You have successfully logged out."
msgstr ""
@@ -127,56 +106,61 @@ msgstr ""
msgid "The group '%s' already exists."
msgstr ""
-#: fas/group.py:134 fas/group.py:479
+#: fas/group.py:131 fas/group.py:478
#, python-format
msgid "You cannot view '%s'"
msgstr ""
-#: fas/group.py:148 fas/group.py:164
+#: fas/group.py:145 fas/group.py:161
msgid "Only FAS adminstrators can create groups."
msgstr ""
-#: fas/group.py:182
+#: fas/group.py:179
#, python-format
msgid "The group: '%s' could not be created."
msgstr ""
-#: fas/group.py:192
+#: fas/group.py:189
#, python-format
msgid ""
"The group: '%(group)s' has been created, but '%(user)s' could not be "
"added as a group administrator."
msgstr ""
-#: fas/group.py:194
+#: fas/group.py:191
#, python-format
msgid "The group: '%s' has been created."
msgstr ""
-#: fas/group.py:209 fas/group.py:224
+#: fas/group.py:206 fas/group.py:221
#, python-format
msgid "You cannot edit '%s'."
msgstr ""
-#: fas/group.py:241
+#: fas/group.py:238
msgid "The group details could not be saved."
msgstr ""
-#: fas/group.py:243
+#: fas/group.py:240
msgid "The group details have been saved."
msgstr ""
-#: fas/group.py:269
+#: fas/group.py:266
#, python-format
msgid "No Groups found matching '%s'"
msgstr ""
-#: fas/group.py:295
+#: fas/group.py:284
+#, python-format
+msgid "%(user)s can not apply to %(group)s."
+msgstr ""
+
+#: fas/group.py:292
#, python-format
msgid "%(user)s could not apply to %(group)s: %(error)s"
msgstr ""
-#: fas/group.py:306
+#: fas/group.py:303
#, python-format
msgid ""
"\n"
@@ -187,22 +171,22 @@ msgid ""
"Please go to %(url)s to take action. \n"
msgstr ""
-#: fas/group.py:313
+#: fas/group.py:310
#, python-format
msgid "%(user)s has applied to %(group)s!"
msgstr ""
-#: fas/group.py:330
+#: fas/group.py:327
#, python-format
msgid "You cannot sponsor '%s'"
msgstr ""
-#: fas/group.py:337
+#: fas/group.py:335
#, python-format
msgid "%(user)s could not be sponsored in %(group)s: %(error)s"
msgstr ""
-#: fas/group.py:343
+#: fas/group.py:341
#, python-format
msgid ""
"\n"
@@ -213,22 +197,22 @@ msgid ""
"%(joinmsg)s\n"
msgstr ""
-#: fas/group.py:351
+#: fas/group.py:349
#, python-format
msgid "'%s' has been sponsored!"
msgstr ""
-#: fas/group.py:368
+#: fas/group.py:366
#, python-format
msgid "You cannot remove '%(user)s' from '%(group)s'."
msgstr ""
-#: fas/group.py:375
+#: fas/group.py:373
#, python-format
msgid "%(user)s could not be removed from %(group)s: %(error)s"
msgstr ""
-#: fas/group.py:380
+#: fas/group.py:378
#, python-format
msgid ""
"\n"
@@ -238,22 +222,22 @@ msgid ""
"aliases within an hour.\n"
msgstr ""
-#: fas/group.py:387
+#: fas/group.py:385
#, python-format
msgid "%(name)s has been removed from %(group)s"
msgstr ""
-#: fas/group.py:404
+#: fas/group.py:402
#, python-format
msgid "You cannot upgrade '%s'"
msgstr ""
-#: fas/group.py:411
+#: fas/group.py:409
#, python-format
msgid "%(name)s could not be upgraded in %(group)s: %(error)s"
msgstr ""
-#: fas/group.py:420
+#: fas/group.py:418
#, python-format
msgid ""
"\n"
@@ -263,22 +247,22 @@ msgid ""
"into the e-mail aliases within an hour.\n"
msgstr ""
-#: fas/group.py:427
+#: fas/group.py:425
#, python-format
msgid "%s has been upgraded!"
msgstr ""
-#: fas/group.py:443
+#: fas/group.py:441
#, python-format
msgid "You cannot downgrade '%s'"
msgstr ""
-#: fas/group.py:450
+#: fas/group.py:448
#, python-format
msgid "%(name)s could not be downgraded in %(group)s: %(error)s"
msgstr ""
-#: fas/group.py:458
+#: fas/group.py:456
#, python-format
msgid ""
"\n"
@@ -288,16 +272,16 @@ msgid ""
"into the e-mail aliases within an hour.\n"
msgstr ""
-#: fas/group.py:465
+#: fas/group.py:463
#, python-format
msgid "%s has been downgraded!"
msgstr ""
-#: fas/group.py:507
+#: fas/group.py:506
msgid "Come join The Fedora Project!"
msgstr ""
-#: fas/group.py:508
+#: fas/group.py:507
#, python-format
msgid ""
"\n"
@@ -318,36 +302,36 @@ msgid ""
"Fedora and FOSS are changing the world -- come be a part of it!"
msgstr ""
-#: fas/group.py:525
+#: fas/group.py:524
#, python-format
msgid "Message sent to: %s"
msgstr ""
-#: fas/group.py:528
+#: fas/group.py:527
#, python-format
msgid "You are not in the '%s' group."
msgstr ""
-#: fas/model.py:131
+#: fas/model.py:133
msgid "user is already in this group"
msgstr ""
-#: fas/model.py:144 fas/model.py:182
-msgid "user is not an unapproved member"
-msgstr ""
-
-#: fas/model.py:154 fas/model.py:169 fas/model.py:190
+#: fas/model.py:146 fas/model.py:161 fas/model.py:215
msgid "user is not a member"
msgstr ""
-#: fas/model.py:158
+#: fas/model.py:150
msgid "administrators cannot be upgraded any further"
msgstr ""
-#: fas/model.py:173
+#: fas/model.py:165
msgid "users cannot be downgraded any further"
msgstr ""
+#: fas/model.py:174
+msgid "user is not an unapproved member"
+msgstr ""
+
#: fas/openid_fas.py:55
msgid "The OpenID request could not be decoded."
msgstr ""
@@ -386,46 +370,88 @@ msgstr ""
msgid "'%s' is an illegal username."
msgstr ""
-#: fas/user.py:231
+#: fas/user.py:241
#, python-format
msgid "You cannot edit %s"
msgstr ""
-#: fas/user.py:247
+#: fas/user.py:258
#, python-format
msgid "You do not have permission to edit '%s'"
msgstr ""
#: fas/user.py:267
#, python-format
-msgid "Your account details could not be saved: %s"
+msgid "Email Change Requested for %s"
msgstr ""
#: fas/user.py:269
+#, python-format
+msgid ""
+"\n"
+"You have recently requested to change your Fedora Account System email\n"
+"to this address. To complete the email change, you must confirm your\n"
+"ownership of this email by visiting the following URL (you will need to\n"
+"login with your Fedora account first):\n"
+"\n"
+"https://admin.fedoraproject.org/accounts/user/verifyemail/%s\n"
+msgstr ""
+
+#: fas/user.py:277
+msgid ""
+" Before your new email takes effect, you must confirm it. You should "
+"receive an email with instructions shortly."
+msgstr ""
+
+#: fas/user.py:289
+#, python-format
+msgid "Your account details could not be saved: %s"
+msgstr ""
+
+#: fas/user.py:291
msgid "Your account details have been saved."
msgstr ""
-#: fas/user.py:294
+#: fas/user.py:316
#, python-format
msgid "No users found matching '%s'"
msgstr ""
-#: fas/user.py:310
+#: fas/user.py:336
+msgid ""
+"Your pending email change has been canceled. The email change token has "
+"been invalidated."
+msgstr ""
+
+#: fas/user.py:340 fas/user.py:355
+msgid "You do not have any pending email changes."
+msgstr ""
+
+#: fas/user.py:344 fas/user.py:359
+msgid "Invalid email change token."
+msgstr ""
+
+#: fas/user.py:368
+#, python-format
+msgid "You have successfully changed your email to '%s'"
+msgstr ""
+
+#: fas/user.py:375
msgid "No need to sign up, you have an account!"
msgstr ""
-#: fas/user.py:332
+#: fas/user.py:397
msgid "Welcome to the Fedora Project!"
msgstr ""
-#: fas/user.py:333
+#: fas/user.py:398
#, python-format
msgid ""
"\n"
"You have created a new Fedora account!\n"
"Your new password is: %s\n"
"\n"
-"Please go to https://admin.fedoraproject.org/fas/ to change it.\n"
+"Please go to https://admin.fedoraproject.org/accounts/ to change it.\n"
"\n"
"Welcome to the Fedora Project. Now that you've signed up for an\n"
"account you're probably desperate to start contributing, and with that\n"
@@ -460,70 +486,90 @@ msgid ""
"forward to working with you!\n"
msgstr ""
-#: fas/user.py:373
+#: fas/user.py:438
msgid ""
"Your password has been emailed to you. Please log in with it and change "
"your password"
msgstr ""
-#: fas/user.py:376
-#, python-format
-msgid "The username '%s' already Exists. Please choose a different username."
+#: fas/user.py:441
+msgid "An account has already been registered with that email address."
msgstr ""
-#: fas/user.py:402
+#: fas/user.py:471
msgid "Your password has been changed."
msgstr ""
-#: fas/user.py:405
+#: fas/user.py:475
msgid "Your password could not be changed."
msgstr ""
-#: fas/user.py:411
+#: fas/user.py:481
msgid "You are already logged in!"
msgstr ""
-#: fas/user.py:421
+#: fas/user.py:491
msgid "You are already logged in."
msgstr ""
-#: fas/user.py:427
+#: fas/user.py:497
msgid "Username email combo does not exist!"
msgstr ""
-#: fas/user.py:430
+#: fas/user.py:500
msgid "username + email combo unknown."
msgstr ""
-#: fas/user.py:433
+#: fas/user.py:503
msgid "Fedora Project Password Reset"
msgstr ""
-#: fas/user.py:434
+#: fas/user.py:504
#, python-format
msgid ""
"\n"
-"You have requested a password reset!\n"
-"Your new password is: %s\n"
+"Somebody (hopefully you) has requested a password reset for your account!"
+"\n"
+"To change your password (or to cancel the request), please visit\n"
+"https://admin.fedoraproject.org/accounts/user/verifypass/%(user)s/%(token)s"
"\n"
-"Please go to https://admin.fedoraproject.org/fas/ to change it.\n"
msgstr ""
-#: fas/user.py:469
+#: fas/user.py:516
msgid ""
-"Your password reset email could not be encrypted. Your password has not "
-"been changed."
+"This user does not have a GPG Key ID set, so an encrypted email cannot be"
+" sent."
msgstr ""
-#: fas/user.py:476
-msgid "Your new password has been emailed to you."
+#: fas/user.py:542
+msgid "Your password reset email could not be encrypted."
msgstr ""
-#: fas/user.py:480
-msgid "Your password could not be reset."
+#: fas/user.py:548
+msgid "A password reset URL has been emailed to you."
msgstr ""
-#: fas/user.py:516
+#: fas/user.py:557 fas/user.py:572 fas/user.py:591
+msgid "You do not have any pending password changes."
+msgstr ""
+
+#: fas/user.py:562 fas/user.py:576 fas/user.py:596
+msgid "Invalid password change token."
+msgstr ""
+
+#: fas/user.py:581
+msgid ""
+"Your password reset has been canceled. The password change token has "
+"been invalidated."
+msgstr ""
+
+#: fas/user.py:605
+msgid ""
+"You have successfully reset your password. You should now be able to "
+"login below."
+msgstr ""
+
+#: fas/user.py:641
msgid "Before generating a certificate, you must first sign the CLA."
msgstr ""
@@ -582,9 +628,9 @@ msgid ""
msgstr ""
#: fas/templates/error.html:7 fas/templates/home.html:7
-#: fas/templates/cla/click.html:7 fas/templates/cla/index.html:7
-#: fas/templates/cla/view.html:7 fas/templates/openid/about.html:7
-#: fas/templates/openid/id.html:7 fas/templates/openid/trusted.html:7
+#: fas/templates/cla/index.html:7 fas/templates/cla/view.html:7
+#: fas/templates/openid/about.html:7 fas/templates/openid/id.html:7
+#: fas/templates/openid/trusted.html:7
msgid "Fedora Accounts System"
msgstr ""
@@ -603,20 +649,11 @@ msgid ""
"href=\"group/view/%(group)s\">%(group)s</a>."
msgstr ""
-#: fas/templates/home.html:24 fas/templates/user/list.html:43
-#: fas/templates/user/view.html:42
-msgid "Click-through CLA"
-msgstr ""
-
-#: fas/templates/home.html:24 fas/templates/user/view.html:42
-msgid "GPG Sign it!"
-msgstr ""
-
-#: fas/templates/home.html:25
+#: fas/templates/home.html:24
msgid "CLA Not Signed. To become a full Fedora Contributor please "
msgstr ""
-#: fas/templates/home.html:25
+#: fas/templates/home.html:24
msgid "Sign the CLA"
msgstr ""
@@ -632,7 +669,7 @@ msgstr ""
msgid "User Name:"
msgstr ""
-#: fas/templates/login.html:21 fas/templates/user/view.html:33
+#: fas/templates/login.html:21 fas/templates/user/view.html:37
msgid "Password:"
msgstr ""
@@ -644,102 +681,94 @@ msgstr ""
msgid "Sign Up"
msgstr ""
-#: fas/templates/master.html:22
+#: fas/templates/master.html:21
msgid "Fedora"
msgstr ""
-#: fas/templates/master.html:25
-msgid "Search:"
-msgstr ""
-
-#: fas/templates/master.html:27 fas/templates/group/list.html:25
-msgid "Search"
-msgstr ""
-
-#: fas/templates/master.html:33
+#: fas/templates/master.html:34
msgid "Learn about Fedora"
msgstr ""
-#: fas/templates/master.html:34
+#: fas/templates/master.html:35
msgid "Download Fedora"
msgstr ""
-#: fas/templates/master.html:35
+#: fas/templates/master.html:36
msgid "Projects"
msgstr ""
-#: fas/templates/master.html:36
+#: fas/templates/master.html:37
msgid "Join Fedora"
msgstr ""
-#: fas/templates/master.html:37
+#: fas/templates/master.html:38
msgid "Communicate"
msgstr ""
-#: fas/templates/master.html:38
+#: fas/templates/master.html:39
msgid "Help/Documentation"
msgstr ""
-#: fas/templates/master.html:44
+#: fas/templates/master.html:45
msgid "Logged in:"
msgstr ""
-#: fas/templates/master.html:50
+#: fas/templates/master.html:51
msgid "My Account"
msgstr ""
-#: fas/templates/master.html:51 fas/templates/master.html:91
+#: fas/templates/master.html:52 fas/templates/master.html:92
msgid "Log Out"
msgstr ""
-#: fas/templates/master.html:52 fas/templates/welcome.html:21
+#: fas/templates/master.html:53 fas/templates/welcome.html:21
msgid "Log In"
msgstr ""
-#: fas/templates/master.html:59
+#: fas/templates/master.html:60
msgid "Home"
msgstr ""
-#: fas/templates/master.html:62
+#: fas/templates/master.html:63
msgid "New Group"
msgstr ""
-#: fas/templates/master.html:63
+#: fas/templates/master.html:64
msgid "User List"
msgstr ""
-#: fas/templates/master.html:65
+#: fas/templates/master.html:66
msgid "Group List"
msgstr ""
-#: fas/templates/master.html:66
+#: fas/templates/master.html:67
msgid "Apply For a new Group"
msgstr ""
-#: fas/templates/master.html:67
+#: fas/templates/master.html:68
msgid "News"
msgstr ""
-#: fas/templates/master.html:87
+#: fas/templates/master.html:88
msgid "About"
msgstr ""
-#: fas/templates/master.html:88
+#: fas/templates/master.html:89
msgid "Contact Us"
msgstr ""
-#: fas/templates/master.html:89
+#: fas/templates/master.html:90
msgid "Legal & Privacy"
msgstr ""
-#: fas/templates/master.html:94
+#: fas/templates/master.html:95
msgid ""
"Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. Please "
"send any comments or corrections to the <a "
"href=\"mailto:webmaster@fedoraproject.org\">websites team</a>."
msgstr ""
-#: fas/templates/master.html:97
+#: fas/templates/master.html:98
msgid ""
"The Fedora Project is maintained and driven by the community and "
"sponsored by Red Hat. This is a community maintained site. Red Hat is "
@@ -752,8 +781,10 @@ msgstr ""
#: fas/templates/welcome.html:18
msgid ""
-"Welcome to the Fedora Accounts System 2. This system is not yet live so "
-"feel free to play around. Just don't expect it to work."
+"Welcome to the Fedora Accounts System 2. Please submit bugs to <a "
+"href=\"https://fedorahosted.org/fedora-"
+"infrastructure/\">https://fedorahosted.org/fedora-infrastructure/<a> or "
+"stop by #fedora-admin on irc.freenode.net"
msgstr ""
#: fas/templates/welcome.html:22
@@ -764,57 +795,28 @@ msgstr ""
msgid "Why Join?"
msgstr ""
-#: fas/templates/cla/click.html:11 fas/templates/cla/view.html:11
-msgid "Contributor License Agreement"
-msgstr ""
-
-#: fas/templates/cla/click.html:15 fas/templates/cla/view.html:20
-#, python-format
-msgid "If you agree to these terms and conditions, type \"%s\" here:"
-msgstr ""
-
-#: fas/templates/cla/click.html:16 fas/templates/cla/view.html:21
-#: fas/templates/user/new.html:17
-msgid "Full Name:"
-msgstr ""
-
-#: fas/templates/cla/click.html:17 fas/templates/cla/view.html:22
-msgid "E-mail:"
-msgstr ""
-
-#: fas/templates/cla/click.html:18 fas/templates/cla/view.html:23
-msgid "Date:"
-msgstr ""
-
-#: fas/templates/cla/click.html:19 fas/templates/cla/view.html:24
-#: fas/templates/cla/view.html:38
-msgid "Submit CLA"
-msgstr ""
-
#: fas/templates/cla/index.html:10
msgid "Fedora Contributor License Agreement"
msgstr ""
#: fas/templates/cla/index.html:13
-msgid ""
-"There are two ways to sign the CLA. Most users will want to do a signed "
-"CLA as it will promote them to a full contributor in Fedora. The click-"
-"through CLA only grants partial access but may be preferred for those "
-"with special legal considerations. See: <a "
-"href=\"http://fedoraproject.org/wiki/Legal/CLAAcceptanceHierarchies\">CLA"
-" Acceptance Hierarchies</a> for more information."
+msgid "In order to become a full Fedora contributor, you must sign the CLA."
msgstr ""
#: fas/templates/cla/index.html:18
msgid "Sign Contributor License Agreement (CLA)"
msgstr ""
-#: fas/templates/cla/index.html:23
+#: fas/templates/cla/index.html:22
#, python-format
msgid "You have already sucessfully signed the <a href=\"%s\">CLA</a>."
msgstr ""
-#: fas/templates/cla/view.html:30
+#: fas/templates/cla/view.html:10
+msgid "Contributor License Agreement"
+msgstr ""
+
+#: fas/templates/cla/view.html:17
#, python-format
msgid ""
"Use the below link to download/save the CLA as fedora-"
@@ -823,14 +825,18 @@ msgid ""
"icla-%(username)s.txt.asc in the form below."
msgstr ""
-#: fas/templates/cla/view.html:33
+#: fas/templates/cla/view.html:20
msgid "Download the CLA text file here!"
msgstr ""
-#: fas/templates/cla/view.html:37
+#: fas/templates/cla/view.html:24
msgid "Signed CLA:"
msgstr ""
+#: fas/templates/cla/view.html:25
+msgid "Submit CLA"
+msgstr ""
+
#: fas/templates/group/edit.html:7
msgid "Edit Group"
msgstr ""
@@ -870,7 +876,7 @@ msgstr ""
msgid "Group Join Message:"
msgstr ""
-#: fas/templates/group/edit.html:51 fas/templates/user/edit.html:80
+#: fas/templates/group/edit.html:51 fas/templates/user/edit.html:83
msgid "Save!"
msgstr ""
@@ -915,6 +921,10 @@ msgstr ""
msgid "\"*\" is a wildcard (Ex: \"cvs*\")"
msgstr ""
+#: fas/templates/group/list.html:25
+msgid "Search"
+msgstr ""
+
#: fas/templates/group/list.html:28 fas/templates/user/list.html:19
msgid "Results"
msgstr ""
@@ -936,7 +946,7 @@ msgid "Status"
msgstr ""
#: fas/templates/group/list.html:44 fas/templates/group/view.html:22
-#: fas/templates/user/view.html:67
+#: fas/templates/user/view.html:70
msgid "Approved"
msgstr ""
@@ -968,7 +978,7 @@ msgstr ""
msgid "Create!"
msgstr ""
-#: fas/templates/group/view.html:7 fas/templates/user/view.html:74
+#: fas/templates/group/view.html:7 fas/templates/user/view.html:77
msgid "View Group"
msgstr ""
@@ -1057,7 +1067,7 @@ msgid "Action"
msgstr ""
#: fas/templates/group/view.html:87 fas/templates/group/view.html:90
-#: fas/templates/user/view.html:68
+#: fas/templates/user/view.html:71
msgid "None"
msgstr ""
@@ -1101,7 +1111,7 @@ msgid "Submit"
msgstr ""
#: fas/templates/user/changepass.html:7 fas/templates/user/changepass.html:10
-#: fas/templates/user/changepass.html:16
+#: fas/templates/user/changepass.html:16 fas/templates/user/verifypass.html:16
msgid "Change Password"
msgstr ""
@@ -1109,11 +1119,11 @@ msgstr ""
msgid "Current Password:"
msgstr ""
-#: fas/templates/user/changepass.html:14
+#: fas/templates/user/changepass.html:14 fas/templates/user/verifypass.html:13
msgid "New Password:"
msgstr ""
-#: fas/templates/user/changepass.html:15
+#: fas/templates/user/changepass.html:15 fas/templates/user/verifypass.html:14
msgid "Confirm Password:"
msgstr ""
@@ -1134,39 +1144,45 @@ msgstr ""
msgid "Email"
msgstr ""
-#: fas/templates/user/edit.html:28
+#: fas/templates/user/edit.html:22 fas/templates/user/view.html:24
+#, python-format
+msgid "(pending change to %(email)s - <a href=\"%(url)s\">cancel</a>)"
+msgstr ""
+
+#: fas/templates/user/edit.html:31
msgid "IRC Nick"
msgstr ""
-#: fas/templates/user/edit.html:33
+#: fas/templates/user/edit.html:36
msgid "PGP Key"
msgstr ""
-#: fas/templates/user/edit.html:38
+#: fas/templates/user/edit.html:41
msgid "Telephone Number"
msgstr ""
-#: fas/templates/user/edit.html:43
+#: fas/templates/user/edit.html:46
msgid "Public SSH Key"
msgstr ""
-#: fas/templates/user/edit.html:49
+#: fas/templates/user/edit.html:52
msgid "Postal Address"
msgstr ""
-#: fas/templates/user/edit.html:54
+#: fas/templates/user/edit.html:57
msgid "Time Zone"
msgstr ""
-#: fas/templates/user/edit.html:64
+#: fas/templates/user/edit.html:67
msgid "Locale"
msgstr ""
-#: fas/templates/user/edit.html:75
+#: fas/templates/user/edit.html:78
msgid "Comments"
msgstr ""
-#: fas/templates/user/edit.html:81
+#: fas/templates/user/edit.html:84 fas/templates/user/verifyemail.html:17
+#: fas/templates/user/verifypass.html:17
msgid "Cancel"
msgstr ""
@@ -1182,11 +1198,11 @@ msgstr ""
msgid "Account Status"
msgstr ""
-#: fas/templates/user/list.html:42 fas/templates/user/view.html:41
-msgid "Signed CLA"
+#: fas/templates/user/list.html:38 fas/templates/user/view.html:45
+msgid "CLA Done"
msgstr ""
-#: fas/templates/user/list.html:44 fas/templates/user/view.html:43
+#: fas/templates/user/list.html:39 fas/templates/user/view.html:46
msgid "Not Done"
msgstr ""
@@ -1194,6 +1210,10 @@ msgstr ""
msgid "Sign up for a Fedora account"
msgstr ""
+#: fas/templates/user/new.html:17
+msgid "Full Name:"
+msgstr ""
+
#: fas/templates/user/new.html:21 fas/templates/user/resetpass.html:14
#: fas/templates/user/view.html:22
msgid "Email:"
@@ -1204,7 +1224,8 @@ msgid "Sign up!"
msgstr ""
#: fas/templates/user/resetpass.html:7 fas/templates/user/resetpass.html:10
-#: fas/templates/user/resetpass.html:16
+#: fas/templates/user/resetpass.html:16 fas/templates/user/verifypass.html:7
+#: fas/templates/user/verifypass.html:10
msgid "Reset Password"
msgstr ""
@@ -1212,6 +1233,14 @@ msgstr ""
msgid "Encrypt/Sign password reset email"
msgstr ""
+#: fas/templates/user/verifyemail.html:7 fas/templates/user/verifyemail.html:10
+msgid "Confirm Email Change Request"
+msgstr ""
+
+#: fas/templates/user/verifyemail.html:16
+msgid "Confirm"
+msgstr ""
+
#: fas/templates/user/view.html:7
msgid "View Account"
msgstr ""
@@ -1237,96 +1266,96 @@ msgstr ""
msgid "Real Name:"
msgstr ""
-#: fas/templates/user/view.html:24
+#: fas/templates/user/view.html:28
msgid "IRC Nick:"
msgstr ""
-#: fas/templates/user/view.html:25
+#: fas/templates/user/view.html:29
msgid "PGP Key:"
msgstr ""
-#: fas/templates/user/view.html:26
+#: fas/templates/user/view.html:30
msgid "Telephone Number:"
msgstr ""
-#: fas/templates/user/view.html:27
+#: fas/templates/user/view.html:31
msgid "Postal Address:"
msgstr ""
-#: fas/templates/user/view.html:28
+#: fas/templates/user/view.html:32
msgid "Public SSH Key:"
msgstr ""
-#: fas/templates/user/view.html:32
+#: fas/templates/user/view.html:36
msgid "Comments:"
msgstr ""
-#: fas/templates/user/view.html:33
+#: fas/templates/user/view.html:37
msgid "Valid"
msgstr ""
-#: fas/templates/user/view.html:34
+#: fas/templates/user/view.html:38
msgid "Account Status:"
msgstr ""
-#: fas/templates/user/view.html:35
+#: fas/templates/user/view.html:39
msgid "Active"
msgstr ""
-#: fas/templates/user/view.html:36
+#: fas/templates/user/view.html:40
msgid "Vacation"
msgstr ""
-#: fas/templates/user/view.html:37
+#: fas/templates/user/view.html:41
msgid "Inactive"
msgstr ""
-#: fas/templates/user/view.html:38
+#: fas/templates/user/view.html:42
msgid "Pinged"
msgstr ""
-#: fas/templates/user/view.html:40
+#: fas/templates/user/view.html:44
msgid "CLA:"
msgstr ""
-#: fas/templates/user/view.html:43
+#: fas/templates/user/view.html:46
msgid "Sign it!"
msgstr ""
-#: fas/templates/user/view.html:47
+#: fas/templates/user/view.html:50
msgid "Your Roles"
msgstr ""
-#: fas/templates/user/view.html:48
+#: fas/templates/user/view.html:51
#, python-format
msgid "%s's Roles"
msgstr ""
-#: fas/templates/user/view.html:65
+#: fas/templates/user/view.html:68
msgid "Status:"
msgstr ""
-#: fas/templates/user/view.html:71
+#: fas/templates/user/view.html:74
msgid "Tools:"
msgstr ""
-#: fas/templates/user/view.html:75
+#: fas/templates/user/view.html:78
msgid "Invite a New Member..."
msgstr ""
-#: fas/templates/user/view.html:76
+#: fas/templates/user/view.html:79
msgid "Manage Group Membership..."
msgstr ""
-#: fas/templates/user/view.html:77
+#: fas/templates/user/view.html:80
msgid "Manage Group Details..."
msgstr ""
-#: fas/templates/user/view.html:81
+#: fas/templates/user/view.html:84
msgid "Queue:"
msgstr ""
-#: fas/templates/user/view.html:85
+#: fas/templates/user/view.html:88
#, python-format
msgid ""
"<strong>%(user)s</strong> requests approval to join "