diff --git a/messages.po b/messages.po
index c066044..bbd6095 100644
--- a/messages.po
+++ b/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-27 12:04+1100\n"
+"POT-Creation-Date: 2007-04-04 13:28+0200\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"
@@ -45,22 +45,22 @@ msgstr ""
 msgid "%s's Domains"
 msgstr ""
 
-#: includes/account.php:1676
+#: includes/account.php:1742
 #, php-format
 msgid "'%s' has just been successfully added as an organisation to the database."
 msgstr ""
 
-#: includes/account.php:1732
+#: includes/account.php:1798
 #, php-format
 msgid "'%s' has just been successfully added to the database."
 msgstr ""
 
-#: includes/account.php:1791
+#: includes/account.php:1854
 #, php-format
 msgid "'%s' has just been successfully deleted from the database."
 msgstr ""
 
-#: includes/account.php:1704 includes/account.php:1779
+#: includes/account.php:1770 includes/account.php:1842
 #, php-format
 msgid "'%s' has just been successfully updated in the database."
 msgstr ""
@@ -93,7 +93,7 @@ msgstr ""
 msgid "ANY amount will be appreciated - the more funding CAcert receives, the sooner it can achieve the goals of the community."
 msgstr ""
 
-#: includes/account_stuff.php:198
+#: includes/account_stuff.php:217
 msgid "About"
 msgstr ""
 
@@ -101,12 +101,12 @@ msgstr ""
 msgid "About CAcert.org"
 msgstr ""
 
-#: includes/account_stuff.php:244 includes/general_stuff.php:118
+#: includes/account_stuff.php:263 includes/general_stuff.php:127
 #: includes/tverify_stuff.php:75
 msgid "About Us"
 msgstr ""
 
-#: includes/account_stuff.php:227 pages/disputes/0.php:19
+#: includes/account_stuff.php:240 pages/disputes/0.php:19
 msgid "Abuses"
 msgstr ""
 
@@ -118,10 +118,14 @@ msgstr ""
 msgid "Account Locking"
 msgstr ""
 
-#: includes/account_stuff.php:166 includes/account_stuff.php:174
-#: pages/account/1.php:26 pages/account/16.php:23 pages/account/26.php:21
-#: pages/account/28.php:29 pages/account/3.php:32 pages/account/32.php:21
-#: pages/account/33.php:48 pages/account/41.php:77 pages/account/54.php:32
+#: pages/account/43.php:170
+msgid "Ad Admin"
+msgstr ""
+
+#: includes/account_stuff.php:179 includes/account_stuff.php:193
+#: pages/account/16.php:23 pages/account/1.php:26 pages/account/26.php:21
+#: pages/account/28.php:29 pages/account/32.php:21 pages/account/33.php:48
+#: pages/account/3.php:32 pages/account/41.php:77 pages/account/54.php:32
 #: pages/account/54.php:80 pages/account/54.php:130 pages/account/7.php:28
 msgid "Add"
 msgstr ""
@@ -142,6 +146,10 @@ msgstr ""
 msgid "Add Region"
 msgstr ""
 
+#: pages/account/3.php:81
+msgid "Add Single Sign On ID Information"
+msgstr ""
+
 #: pages/account/41.php:56 pages/wot/9.php:58
 msgid "Additional Language"
 msgstr ""
@@ -155,7 +163,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: pages/account/43.php:162
+#: pages/account/43.php:166
 msgid "Admin"
 msgstr ""
 
@@ -172,6 +180,10 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
+#: includes/account_stuff.php:244 includes/general_stuff.php:92
+msgid "Advertising"
+msgstr ""
+
 #: pages/wot/3.php:27
 msgid "After the meeting, visit the CAcert Web site's make an Assurance page and:"
 msgstr ""
@@ -188,11 +200,11 @@ msgstr ""
 msgid "Alert me if"
 msgstr ""
 
-#: www/index.php:453
+#: www/index.php:566
 msgid "All fields are mandatory."
 msgstr ""
 
-#: pages/account/43.php:254
+#: pages/account/43.php:262
 msgid "Alternate Verified Email Addresses"
 msgstr ""
 
@@ -205,11 +217,11 @@ msgstr ""
 msgid "Alternatively visit our %sinformation page%s on this subject for more details."
 msgstr ""
 
-#: pages/account/40.php:63 pages/index/11.php:63
+#: pages/account/40.php:64 pages/index/11.php:64
 msgid "Alternatively you can get in contact with us via the following methods:"
 msgstr ""
 
-#: www/analyse.php:25
+#: www/analyse.php:27
 msgid "Analyse"
 msgstr ""
 
@@ -225,7 +237,7 @@ msgstr ""
 msgid "Another Email"
 msgstr ""
 
-#: includes/account.php:494
+#: includes/account.php:509
 msgid "Any valid certificates will be revoked as well"
 msgstr ""
 
@@ -237,11 +249,11 @@ msgstr ""
 msgid "Applicant Information"
 msgstr ""
 
-#: www/cap.php:67
+#: www/cap.php:73
 msgid "Applicant's Statement"
 msgstr ""
 
-#: www/cap.php:123
+#: www/cap.php:129
 msgid "Applicant's signature"
 msgstr ""
 
@@ -260,7 +272,7 @@ msgstr ""
 msgid "Are you really sure you want to remove %s from administering this organisation?"
 msgstr ""
 
-#: pages/account/43.php:312 pages/account/43.php:349
+#: pages/account/43.php:320 pages/account/43.php:357
 msgid "Are you sure you want to revoke this assurance?"
 msgstr ""
 
@@ -278,23 +290,28 @@ msgstr ""
 msgid "As anyone who has received an email containing a virus from a strange address knows, emails can be easily spoofed. The identity of the sender is very easy to forge via email. Thus a great advantage is that digital signing provides a means of ensuring that an email is really from the person you think it is. If everyone digitally signed their emails, it would be much easier to know whether an email is legitimate and unchanged and to the great relief of many, spamming would be much easier to control, and viruses that forge the sender's address would be obvious and therefore easier to control."
 msgstr ""
 
-#: www/cap.php:58
+#: www/cap.php:62
 msgid "As the assurer, you are required to keep the signed document on file for 7 years. Should Cacert Inc. have any concerns about a meeting taking place, Cacert Inc. can request proof, in the form of this signed document, to ensure the process is being followed correctly. After 7 years if you wish to dispose of this form it's preferred that you shred and burn it. You do not need to retain copies of ID at all."
 msgstr ""
 
+#: includes/account_stuff.php:263 includes/general_stuff.php:127
+#: includes/tverify_stuff.php:75
+msgid "Association Membership"
+msgstr ""
+
 #: pages/wot/6.php:48
 msgid "Assurance Confirmation"
 msgstr ""
 
-#: includes/account_stuff.php:211
+#: includes/account_stuff.php:230
 msgid "Assurance Form"
 msgstr ""
 
-#: pages/account/43.php:243 pages/wot/3.php:43
+#: pages/account/43.php:251 pages/wot/3.php:43
 msgid "Assurance Points"
 msgstr ""
 
-#: pages/account/43.php:324 pages/wot/10.php:75
+#: pages/account/43.php:332 pages/wot/10.php:75
 msgid "Assurance Points You Issued"
 msgstr ""
 
@@ -302,7 +319,7 @@ msgstr ""
 msgid "Assurances Made"
 msgstr ""
 
-#: includes/account_stuff.php:198 www/wot.php:374 pages/wot/5.php:41
+#: includes/account_stuff.php:217 www/wot.php:374 pages/wot/5.php:41
 msgid "Assure Someone"
 msgstr ""
 
@@ -318,11 +335,11 @@ msgstr ""
 msgid "Assurer Ranking"
 msgstr ""
 
-#: www/cap.php:150 www/cap.php:156
+#: www/cap.php:156 www/cap.php:162
 msgid "Assurer's Name"
 msgstr ""
 
-#: www/cap.php:162
+#: www/cap.php:168
 msgid "Assurer's signature"
 msgstr ""
 
@@ -346,11 +363,11 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr ""
 
-#: includes/account_stuff.php:198
+#: includes/account_stuff.php:217
 msgid "Becoming an Assurer"
 msgstr ""
 
-#: pages/account/40.php:22 pages/index/11.php:22
+#: pages/account/40.php:23 pages/index/11.php:23
 msgid "Before contacting us, be sure to read over the inforation on our official and unofficial HowTo and FAQ pages."
 msgstr ""
 
@@ -358,7 +375,7 @@ msgstr ""
 msgid "Before you can start issuing certificates for your website, irc server, smtp server, pop3, imap etc you will need to add domains to your account under the domain menu. You can also remove domains from here as well. Once you've added a domain you are free then to go into the Server Certificate section and start pasting CSR into the website and have the website return you a valid certificate for up to 2 years if you have 50 trust points, or 6 months for no trust points."
 msgstr ""
 
-#: includes/account.php:70 includes/account.php:477
+#: includes/account.php:70 includes/account.php:490
 msgid "Below is the link you need to open to verify your email address. Once your address is verified you will be able to start issuing certificates to your heart's content!"
 msgstr ""
 
@@ -376,19 +393,19 @@ msgstr ""
 msgid "Benefits"
 msgstr ""
 
-#: includes/account.php:72 includes/account.php:100 includes/account.php:479
-#: includes/account.php:1078 includes/account.php:2453
-#: includes/account.php:2474 www/disputes.php:282 www/disputes.php:417
-#: www/index.php:417 www/wot.php:57 www/wot.php:341 www/wot.php:357
+#: includes/account.php:72 includes/account.php:100 includes/account.php:492
+#: includes/account.php:1124 includes/account.php:2534
+#: includes/account.php:2555 www/disputes.php:282 www/disputes.php:417
+#: www/index.php:530 www/wot.php:57 www/wot.php:341 www/wot.php:357
 #: pages/account/13.php:25 scripts/removedead.php:75
 msgid "Best regards"
 msgstr ""
 
-#: includes/account_stuff.php:211
+#: includes/account_stuff.php:230
 msgid "Blank CAP Form"
 msgstr ""
 
-#: includes/account_stuff.php:211
+#: includes/account_stuff.php:230
 msgid "Blank TTP Form"
 msgstr ""
 
@@ -416,7 +433,11 @@ msgstr ""
 msgid "But, with all this money, and all this responsibility, they must be taking a lot of care to ensure the Certificate Authorities do their jobs well, and keep doing their jobs well, right? Well right?!"
 msgstr ""
 
-#: includes/account_stuff.php:201
+#: pages/account/3.php:82
+msgid "By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication only. Please see a more detailed description on our WIKI about it."
+msgstr ""
+
+#: includes/account_stuff.php:220
 msgid "CAP/TTP Forms"
 msgstr ""
 
@@ -424,7 +445,7 @@ msgstr ""
 msgid "CAcert Assurance Programme"
 msgstr ""
 
-#: www/cap.php:143
+#: www/cap.php:149
 msgid "CAcert Assurer"
 msgstr ""
 
@@ -472,12 +493,12 @@ msgstr ""
 msgid "CAcert Statistics"
 msgstr ""
 
-#: includes/account.php:2454 includes/account.php:2475 www/wot.php:58
+#: includes/account.php:2535 includes/account.php:2556 www/wot.php:58
 #: www/wot.php:342 www/wot.php:358 scripts/removedead.php:76
 msgid "CAcert Support Team"
 msgstr ""
 
-#: includes/account_stuff.php:197 pages/account/0.php:27 pages/wot/0.php:15
+#: includes/account_stuff.php:216 pages/account/0.php:27 pages/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr ""
 
@@ -501,11 +522,11 @@ msgstr ""
 msgid "CAcert then sends you an email with a signed copy of your certificate. Hopefully the rest should be pretty straight forward."
 msgstr ""
 
-#: pages/index/16.php:31 pages/index/3.php:31
+#: pages/index/16.php:38 pages/index/3.php:38
 msgid "CAcert's GPG Key"
 msgstr ""
 
-#: www/cap.php:43 www/ttp.php:48
+#: www/cap.php:40 www/ttp.php:48
 msgid "CAcert's Root Certificate fingerprints"
 msgstr ""
 
@@ -518,13 +539,17 @@ msgstr ""
 msgid "CAcert.org"
 msgstr ""
 
+#: www/advertising.php:81
+msgid "CAcert.org Advertising Section"
+msgstr ""
+
 #: pages/index/51.php:15
 msgid "CAcert.org Mission Statement"
 msgstr ""
 
-#: includes/account.php:72 includes/account.php:100 includes/account.php:479
-#: includes/account.php:1078 www/disputes.php:282 www/disputes.php:417
-#: www/index.php:417 pages/account/13.php:25
+#: includes/account.php:72 includes/account.php:100 includes/account.php:492
+#: includes/account.php:1124 www/disputes.php:282 www/disputes.php:417
+#: www/index.php:530 pages/account/13.php:25
 msgid "CAcert.org Support!"
 msgstr ""
 
@@ -544,7 +569,7 @@ msgstr ""
 msgid "Can't start the CEnroll control:"
 msgstr ""
 
-#: includes/account.php:1752 includes/account.php:1803 pages/account/30.php:34
+#: includes/account.php:1818 includes/account.php:1866 pages/account/30.php:34
 #: pages/account/31.php:30 pages/account/34.php:35 pages/wot/6.php:140
 msgid "Cancel"
 msgstr ""
@@ -573,13 +598,13 @@ msgstr ""
 msgid "Certificate Subject"
 msgstr ""
 
-#: includes/account.php:835 includes/account.php:1310
+#: includes/account.php:864 includes/account.php:1356
 #, php-format
 msgid "Certificate for '%s' has been renewed."
 msgstr ""
 
-#: includes/account.php:758 includes/account.php:871 includes/account.php:1347
-#: includes/account.php:1607
+#: includes/account.php:783 includes/account.php:904 includes/account.php:1396
+#: includes/account.php:1669
 #, php-format
 msgid "Certificate for '%s' has been revoked."
 msgstr ""
@@ -616,8 +641,8 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr ""
 
-#: includes/account_stuff.php:159 pages/account/43.php:186
-#: pages/account/43.php:187 pages/account/44.php:19 pages/account/50.php:19
+#: includes/account_stuff.php:172 pages/account/43.php:194
+#: pages/account/43.php:195 pages/account/44.php:19 pages/account/50.php:19
 msgid "Change Password"
 msgstr ""
 
@@ -625,9 +650,9 @@ msgstr ""
 msgid "Choose a filename to save the request to"
 msgstr ""
 
-#: includes/account.php:837 includes/account.php:1312
-#: includes/account.php:1733 includes/account.php:1780
-#: includes/account.php:1792 pages/account/19.php:45 pages/account/6.php:43
+#: includes/account.php:866 includes/account.php:1358
+#: includes/account.php:1799 includes/account.php:1843
+#: includes/account.php:1855 pages/account/19.php:45 pages/account/6.php:43
 msgid "Click here"
 msgstr ""
 
@@ -635,15 +660,15 @@ msgstr ""
 msgid "Click here if you want to import the root certificate into Microsoft Internet Explorer"
 msgstr ""
 
-#: pages/account/40.php:24 pages/index/11.php:24
+#: pages/account/40.php:25 pages/index/11.php:25
 msgid "Click here to go to the Support List"
 msgstr ""
 
-#: pages/account/40.php:46 pages/index/11.php:46
+#: pages/account/40.php:47 pages/index/11.php:47
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:169 pages/account/18.php:18
+#: includes/account_stuff.php:182 pages/account/18.php:18
 #: pages/account/5.php:18 pages/gpg/2.php:17
 msgid "Client Certificates"
 msgstr ""
@@ -668,6 +693,10 @@ msgstr ""
 msgid "Collection 1 created by Christoph Probst (November 2004)"
 msgstr ""
 
+#: www/logos.php:19
+msgid "Collection 2 created by Junio Jose (Februrary 2007)"
+msgstr ""
+
 #: pages/account/52.php:48
 msgid "Comment"
 msgstr ""
@@ -686,9 +715,9 @@ msgstr ""
 msgid "CommonName"
 msgstr ""
 
-#: includes/account.php:539 includes/account.php:559 includes/account.php:681
-#: includes/account.php:1421 includes/account.php:1438
-#: includes/account.php:2180 includes/account.php:2205
+#: includes/account.php:560 includes/account.php:580 includes/account.php:703
+#: includes/account.php:1474 includes/account.php:1491
+#: includes/account.php:2241 includes/account.php:2266
 msgid "CommonName field was blank. This is usually caused by entering your own name when openssl prompt's you for 'YOUR NAME', or if you try to issue certificates for domains you haven't already verified, as such this process can't continue."
 msgstr ""
 
@@ -712,7 +741,7 @@ msgstr ""
 msgid "Contact Assurer"
 msgstr ""
 
-#: pages/wot/1-old.php:126 pages/wot/12.php:100
+#: pages/wot/12.php:100 pages/wot/1.php:126
 msgid "Contact Details"
 msgstr ""
 
@@ -720,7 +749,7 @@ msgstr ""
 msgid "Contact Email"
 msgstr ""
 
-#: includes/account_stuff.php:245 includes/general_stuff.php:120
+#: includes/account_stuff.php:264 includes/general_stuff.php:129
 #: includes/tverify_stuff.php:77 pages/account/40.php:17 pages/index/11.php:17
 msgid "Contact Us"
 msgstr ""
@@ -745,8 +774,8 @@ msgstr ""
 msgid "Core members of CAcert generally have a strong information technology and security background, and a stronger desire to give back to the community."
 msgstr ""
 
-#: includes/account.php:781 includes/account.php:892 includes/account.php:1369
-#: includes/account.php:1631
+#: includes/account.php:810 includes/account.php:929 includes/account.php:1422
+#: includes/account.php:1697
 #, php-format
 msgid "Couldn't remove the request for `%s`, request had already been processed."
 msgstr ""
@@ -756,7 +785,7 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#: pages/account/36.php:23 pages/account/43.php:174 pages/index/1.php:118
+#: pages/account/36.php:23 pages/account/43.php:182 pages/index/1.php:118
 msgid "Country Announcements"
 msgstr ""
 
@@ -768,7 +797,7 @@ msgstr ""
 msgid "Create Certificate Request"
 msgstr ""
 
-#: www/logos.php:30
+#: www/logos.php:39
 msgid "Create more badges"
 msgstr ""
 
@@ -799,16 +828,16 @@ msgid "Currently we only issue certificates for Punycode domains if the person r
 msgstr ""
 
 #: www/stats.php:79 www/stats.php:115 www/ttp.php:118 www/ttp.php:175
-#: pages/account/43.php:290 pages/account/43.php:327 pages/wot/10.php:44
+#: pages/account/43.php:298 pages/account/43.php:335 pages/wot/10.php:44
 #: pages/wot/10.php:79 pages/wot/6.php:97
 msgid "Date"
 msgstr ""
 
-#: www/cap.php:125 www/cap.php:164
+#: www/cap.php:131 www/cap.php:170
 msgid "Date (YYYY-MM-DD)"
 msgstr ""
 
-#: www/cap.php:89 www/ttp.php:155 pages/account/13.php:55
+#: www/cap.php:95 www/ttp.php:155 pages/account/13.php:55
 #: pages/account/13.php:103 pages/account/43.php:114 pages/account/52.php:44
 #: pages/index/1.php:47 pages/index/5.php:25 pages/wot/6.php:71
 msgid "Date of Birth"
@@ -822,19 +851,19 @@ msgstr ""
 msgid "Default Account Changed"
 msgstr ""
 
-#: includes/account_stuff.php:159
+#: includes/account_stuff.php:172
 msgid "Default Language"
 msgstr ""
 
-#: pages/account/2.php:23 pages/account/2.php:50 pages/account/25.php:24
-#: pages/account/25.php:41 pages/account/26.php:26 pages/account/26.php:36
+#: pages/account/25.php:24 pages/account/25.php:41 pages/account/26.php:26
+#: pages/account/26.php:36 pages/account/2.php:23 pages/account/2.php:50
 #: pages/account/30.php:35 pages/account/31.php:31 pages/account/32.php:28
 #: pages/account/32.php:43 pages/account/34.php:36 pages/account/41.php:58
 #: pages/account/54.php:148 pages/account/9.php:21 pages/account/9.php:49
 msgid "Delete"
 msgstr ""
 
-#: pages/account/43.php:190 pages/account/43.php:191
+#: pages/account/43.php:198 pages/account/43.php:199
 msgid "Delete Account"
 msgstr ""
 
@@ -897,7 +926,7 @@ msgstr ""
 msgid "Disputes and Abuse Reporting"
 msgstr ""
 
-#: includes/account_stuff.php:226
+#: includes/account_stuff.php:239
 msgid "Disputes/Abuses"
 msgstr ""
 
@@ -914,7 +943,7 @@ msgid "Do not verify this email"
 msgstr ""
 
 #: pages/account/26.php:24 pages/account/28.php:25 pages/account/29.php:31
-#: pages/account/43.php:278 pages/account/48.php:22 pages/account/49.php:39
+#: pages/account/43.php:286 pages/account/48.php:22 pages/account/49.php:39
 #: pages/account/49.php:70 pages/account/7.php:23 pages/disputes/2.php:23
 msgid "Domain"
 msgstr ""
@@ -923,7 +952,7 @@ msgstr ""
 msgid "Domain Certificates"
 msgstr ""
 
-#: includes/account_stuff.php:227 www/disputes.php:138 www/disputes.php:147
+#: includes/account_stuff.php:240 www/disputes.php:138 www/disputes.php:147
 #: www/disputes.php:154 www/disputes.php:181 www/disputes.php:195
 #: www/disputes.php:205 www/disputes.php:215 www/disputes.php:297
 #: www/disputes.php:307 www/disputes.php:318 www/disputes.php:327
@@ -944,7 +973,7 @@ msgstr ""
 msgid "Domain available"
 msgstr ""
 
-#: includes/account_stuff.php:173 pages/account/25.php:21
+#: includes/account_stuff.php:192 pages/account/25.php:21
 #: pages/account/25.php:38 pages/account/9.php:18
 msgid "Domains"
 msgstr ""
@@ -953,7 +982,7 @@ msgstr ""
 msgid "Domains and Server Certificates."
 msgstr ""
 
-#: includes/account_stuff.php:244 includes/general_stuff.php:118
+#: includes/account_stuff.php:263 includes/general_stuff.php:127
 #: includes/tverify_stuff.php:75 pages/account/38.php:15 pages/index/13.php:15
 msgid "Donations"
 msgstr ""
@@ -966,7 +995,7 @@ msgstr ""
 msgid "Due to the increasing number of people that haven't been able to recover their passwords via the lost password form there is now 2 other options available to you. If you don't care about your account you can signup under a new account file dispute forms to recover your email accounts and domains. If you would like to recover your password via help from support staff this requires a small payment to cover time from a real person to verify your claims to ownership on an account, click the payment button below to continue."
 msgstr ""
 
-#: includes/account.php:34 includes/account.php:363
+#: includes/account.php:34 includes/account.php:376
 msgid "Due to the possibility for punycode domain exploits we currently do not allow any certificates to sign punycode domains or email addresses."
 msgstr ""
 
@@ -978,7 +1007,7 @@ msgstr ""
 msgid "Easy. Ish. Go to CAcert.org, install their root certificate and then follow their joining instructions. Once you have joined, request a certificate from the menu. You will receive an email with a link to the certificate. Click on the link from your email software, and hopefully it will be seamlessly installed. Next find the security section of the settings in your email software and configure digital signatures using the certificate you just downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:159 pages/account/25.php:23
+#: includes/account_stuff.php:172 pages/account/25.php:23
 #: pages/account/25.php:40 pages/account/26.php:25 pages/account/26.php:35
 msgid "Edit"
 msgstr ""
@@ -1006,7 +1035,7 @@ msgstr ""
 msgid "Email (if applicable)"
 msgstr ""
 
-#: includes/account_stuff.php:165 pages/account/2.php:18
+#: includes/account_stuff.php:178 pages/account/2.php:18
 msgid "Email Accounts"
 msgstr ""
 
@@ -1014,26 +1043,26 @@ msgstr ""
 msgid "Email Accounts and Client Certificates"
 msgstr ""
 
-#: www/cap.php:108 pages/account/1.php:22 pages/account/11.php:34
-#: pages/account/5.php:23 pages/index/1.php:75 pages/index/4.php:27
+#: www/cap.php:114 pages/account/11.php:34 pages/account/1.php:22
+#: pages/account/5.php:23 pages/index/1.php:75 pages/index/4.php:34
 #: pages/index/5.php:21 pages/gpg/2.php:21 pages/disputes/1.php:23
 #: pages/help/4.php:29
 msgid "Email Address"
 msgstr ""
 
-#: includes/account.php:60 includes/account.php:465 www/index.php:374
+#: includes/account.php:60 includes/account.php:478 www/index.php:487
 msgid "Email Address given was invalid, or a test connection couldn't be made to your server, or the server rejected the email address as invalid"
 msgstr ""
 
-#: www/index.php:324
+#: www/index.php:437
 msgid "Email Address was blank"
 msgstr ""
 
-#: pages/wot/1-old.php:127 pages/wot/12.php:101
+#: pages/wot/12.php:101 pages/wot/1.php:127
 msgid "Email Assurer"
 msgstr ""
 
-#: includes/account_stuff.php:227 www/disputes.php:28 www/disputes.php:39
+#: includes/account_stuff.php:240 www/disputes.php:28 www/disputes.php:39
 #: www/disputes.php:46 www/disputes.php:90 www/disputes.php:104
 #: www/disputes.php:114 www/disputes.php:124 www/disputes.php:226
 #: www/disputes.php:235 www/disputes.php:246 www/disputes.php:256
@@ -1042,7 +1071,7 @@ msgstr ""
 msgid "Email Dispute"
 msgstr ""
 
-#: pages/wot/1-old.php:134 pages/wot/12.php:114
+#: pages/wot/12.php:114 pages/wot/1.php:134
 msgid "Email Me"
 msgstr ""
 
@@ -1050,7 +1079,7 @@ msgstr ""
 msgid "Email Notification"
 msgstr ""
 
-#: includes/account.php:74 includes/account.php:481
+#: includes/account.php:74 includes/account.php:494
 msgid "Email Probe"
 msgstr ""
 
@@ -1146,11 +1175,11 @@ msgstr ""
 msgid "Finally you will be asked information about 'extra' attribute, you simply hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:222
+#: includes/account_stuff.php:235
 msgid "Find Domain"
 msgstr ""
 
-#: includes/account_stuff.php:222 pages/account/42.php:19
+#: includes/account_stuff.php:235 pages/account/42.php:19
 msgid "Find User"
 msgstr ""
 
@@ -1158,10 +1187,16 @@ msgstr ""
 msgid "Find User by Domain"
 msgstr ""
 
-#: includes/account_stuff.php:198
+#: includes/account_stuff.php:217
 msgid "Find an Assurer"
 msgstr ""
 
+#: pages/index/16.php:22 pages/index/16.php:23 pages/index/16.php:32
+#: pages/index/16.php:33 pages/index/3.php:22 pages/index/3.php:23
+#: pages/index/3.php:32 pages/index/3.php:33
+msgid "Fingerprint"
+msgstr ""
+
 #: pages/help/3.php:55
 msgid "Finish up and exit IIS Certificate Wizard"
 msgstr ""
@@ -1175,11 +1210,11 @@ msgstr ""
 msgid "First Name"
 msgstr ""
 
-#: includes/account.php:988
+#: includes/account.php:1027
 msgid "First and Last name fields can not be blank."
 msgstr ""
 
-#: www/index.php:313
+#: www/index.php:426
 msgid "First and/or last names were blank."
 msgstr ""
 
@@ -1203,6 +1238,11 @@ msgstr ""
 msgid "For administrators looking to protect the services they offer, we provide host and wild card certificates which you can issue almost immediately. Not only can you use these to protect websites, but also POP3, SMTP and IMAP connections, to list but a few. Unlike other certificate authorities, we don't limit the strength of the certificates, or the use of wild card certificates. Everyone should have the right to security and to protect their privacy, not just those looking to run ecommerce sites."
 msgstr ""
 
+#: pages/index/0.php:26
+#, php-format
+msgid "For general documentation and help please see our %s site, powered by %s"
+msgstr ""
+
 #: pages/help/3.php:85
 msgid "For more information, refer to your server documentation or visit"
 msgstr ""
@@ -1219,21 +1259,21 @@ msgstr ""
 msgid "For years we've all been charged high amounts of money to pay for security that doesn't and shouldn't cost the earth."
 msgstr ""
 
-#: includes/account.php:963 www/index.php:300
+#: includes/account.php:1002 www/index.php:413
 msgid "For your own security you must enter 5 different password questions and answers. You aren't allowed to duplicate questions, set questions as answers or use the question as the answer."
 msgstr ""
 
-#: includes/account.php:972 www/index.php:214 www/index.php:308
+#: includes/account.php:1011 www/index.php:327 www/index.php:421
 msgid "For your own security you must enter 5 lost password questions and answers."
 msgstr ""
 
-#: includes/account_stuff.php:150 includes/general_stuff.php:68
+#: includes/account_stuff.php:163 includes/general_stuff.php:68
 #: includes/tverify_stuff.php:34
 msgid "Free digital certificates!"
 msgstr ""
 
 #: pages/account/12.php:85 pages/account/18.php:89 pages/account/22.php:85
-#: pages/account/5.php:92 pages/gpg/2.php:66
+#: pages/account/5.php:92
 msgid "From here you can delete pending requests, or revoke valid certificates."
 msgstr ""
 
@@ -1241,7 +1281,7 @@ msgstr ""
 msgid "Full Name (as shown on ID)"
 msgstr ""
 
-#: www/news.php:38 pages/index/0.php:78
+#: www/news.php:38 pages/index/0.php:79
 msgid "Full Story"
 msgstr ""
 
@@ -1249,15 +1289,15 @@ msgstr ""
 msgid "Further Information"
 msgstr ""
 
-#: pages/index/16.php:30 pages/index/3.php:30
+#: pages/index/16.php:37 pages/index/3.php:37
 msgid "GPG Key"
 msgstr ""
 
-#: includes/account_stuff.php:215
+#: includes/account_stuff.php:187
 msgid "GPG/PGP Keys"
 msgstr ""
 
-#: pages/account/36.php:22 pages/account/43.php:170 pages/index/1.php:117
+#: pages/account/36.php:22 pages/account/43.php:178 pages/index/1.php:117
 msgid "General Announcements"
 msgstr ""
 
@@ -1265,7 +1305,7 @@ msgstr ""
 msgid "General Questions"
 msgstr ""
 
-#: pages/account/40.php:23 pages/index/11.php:23
+#: pages/account/40.php:24 pages/index/11.php:24
 msgid "General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question."
 msgstr ""
 
@@ -1285,11 +1325,11 @@ msgstr ""
 msgid "Go Back"
 msgstr ""
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:168
 msgid "Go Home"
 msgstr ""
 
-#: pages/account/40.php:22 pages/index/11.php:22
+#: pages/account/40.php:23 pages/index/11.php:23
 msgid "Go here for more details."
 msgstr ""
 
@@ -1333,7 +1373,7 @@ msgstr ""
 msgid "Here"
 msgstr ""
 
-#: includes/account.php:96 includes/account.php:1074 pages/account/13.php:21
+#: includes/account.php:96 includes/account.php:1120 pages/account/13.php:21
 #, php-format
 msgid "Hi %s,"
 msgstr ""
@@ -1350,7 +1390,7 @@ msgstr ""
 msgid "Hitting update will also revoke all existing certificates issued under this domain"
 msgstr ""
 
-#: pages/account/53.php:23 pages/wot/1-old.php:24 pages/wot/7-old.php:27
+#: pages/account/53.php:23 pages/wot/1.php:24 pages/wot/7-old.php:27
 msgid "Home"
 msgstr ""
 
@@ -1358,7 +1398,7 @@ msgstr ""
 msgid "How can I do a single sign on similar to CAcert using client certificates?"
 msgstr ""
 
-#: www/logos.php:19
+#: www/logos.php:28
 msgid "How can I put a logo on to my website?"
 msgstr ""
 
@@ -1419,12 +1459,12 @@ msgstr ""
 msgid "I certify that %s %s %s has appeared in person"
 msgstr ""
 
-#: includes/account.php:1120
+#: includes/account.php:1166
 msgid "I couldn't match any emails against your organisational account."
 msgstr ""
 
-#: includes/account.php:160 includes/account.php:208 includes/account.php:318
-#: includes/account.php:1144 includes/account.php:1232
+#: includes/account.php:166 includes/account.php:216 includes/account.php:331
+#: includes/account.php:1190 includes/account.php:1278
 msgid "I didn't receive a valid Certificate Request, hit the back button and try again."
 msgstr ""
 
@@ -1440,7 +1480,7 @@ msgstr ""
 msgid "I have read and understood the Rules For Assurers and am making this assurance subject to and in compliance with these rules."
 msgstr ""
 
-#: www/cap.php:121
+#: www/cap.php:127
 msgid "I hereby confirm that the information stated above is both true and correct, and request the CAcert Assurer (identified below) to witness my identity in the CAcert Assurance Programme."
 msgstr ""
 
@@ -1500,7 +1540,7 @@ msgstr ""
 msgid "If the root store doesn't receive a 'ping' reply over the serial link within a determined amount of time it assumes the webserver is compromised or the root store itself has been stolen and shuts itself down."
 msgstr ""
 
-#: www/gpg.php:167
+#: www/gpg.php:274
 msgid "If this is a re-occuring problem, please send a copy of the key you are trying to signed to support@cacert.org. Thank you."
 msgstr ""
 
@@ -1508,11 +1548,15 @@ msgstr ""
 msgid "If we change our Privacy Policy, we will post those changes on www.CAcert.org. If we decide to use personally identifiable information in a manner different from that stated at the time it was collected, we will notify users via email. Users will be able to opt out of any new use of their personal information."
 msgstr ""
 
+#: pages/account/40.php:21 pages/index/11.php:21
+msgid "If you are contacting us about advertising, please use the form at the bottom of the website, the first contact form is not the correct place."
+msgstr ""
+
 #: pages/wot/7-old.php:141
 msgid "If you are happy with this location, click 'Make my location here' to update your location details."
 msgstr ""
 
-#: pages/account/40.php:21 pages/index/11.php:21 pages/index/4.php:41
+#: pages/account/40.php:22 pages/index/11.php:22 pages/index/4.php:40
 #, php-format
 msgid "If you are having trouble with your username or password, please visit our %swiki page%s for more information"
 msgstr ""
@@ -1522,7 +1566,7 @@ msgstr ""
 msgid "If you have ANY doubts or concerns about the identity of the Applicant then please DO NOT COMPLETE AND SIGN this form. For more information about the Web of Trust, including detailed guides for Trusted Third Parties, please see: %s"
 msgstr ""
 
-#: pages/account/40.php:49 pages/index/11.php:49
+#: pages/account/40.php:50 pages/index/11.php:50
 msgid "If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help."
 msgstr ""
 
@@ -1591,7 +1635,7 @@ msgstr ""
 msgid "Inclusion into mainstream browsers!"
 msgstr ""
 
-#: www/index.php:229
+#: www/index.php:342
 msgid "Incorrect email address and/or Pass Phrase."
 msgstr ""
 
@@ -1620,20 +1664,32 @@ msgstr ""
 msgid "Installing your certificate"
 msgstr ""
 
+#: pages/index/16.php:29 pages/index/3.php:29
+msgid "Intermediate Certificate (DER Format)"
+msgstr ""
+
+#: pages/index/16.php:28 pages/index/3.php:28
+msgid "Intermediate Certificate (PEM Format)"
+msgstr ""
+
+#: pages/index/16.php:30 pages/index/3.php:30
+msgid "Intermediate Certificate (Text Format)"
+msgstr ""
+
 #: pages/index/0.php:15
 msgid "Introduction"
 msgstr ""
 
-#: includes/account.php:655 includes/account.php:747 includes/account.php:775
-#: includes/account.php:808 includes/account.php:860 includes/account.php:886
-#: includes/account.php:1284 includes/account.php:1336
-#: includes/account.php:1363 includes/account.php:1540
-#: includes/account.php:1596 includes/account.php:1625
+#: includes/account.php:677 includes/account.php:773 includes/account.php:804
+#: includes/account.php:837 includes/account.php:894 includes/account.php:923
+#: includes/account.php:1330 includes/account.php:1386
+#: includes/account.php:1416 includes/account.php:1599
+#: includes/account.php:1659 includes/account.php:1691
 #, php-format
 msgid "Invalid ID '%s' presented, can't do anything with it."
 msgstr ""
 
-#: includes/account.php:995 www/index.php:319
+#: includes/account.php:1034 www/index.php:432
 msgid "Invalid date of birth"
 msgstr ""
 
@@ -1650,7 +1706,7 @@ msgstr ""
 msgid "It is essential that CAcert Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system."
 msgstr ""
 
-#: www/logos.php:21
+#: www/logos.php:30
 msgid "It is extremly easy! Just pick an image from the collections above and use it for example with the following html code fragment:"
 msgstr ""
 
@@ -1662,9 +1718,9 @@ msgstr ""
 msgid "It looks like you were trying to contact multiple people, this isn't allowed due to data security reasons."
 msgstr ""
 
-#: includes/account.php:753 includes/account.php:866 includes/account.php:1291
-#: includes/account.php:1342 includes/account.php:1547
-#: includes/account.php:1602
+#: includes/account.php:779 includes/account.php:900 includes/account.php:1337
+#: includes/account.php:1392 includes/account.php:1606
+#: includes/account.php:1665
 #, php-format
 msgid "It would seem '%s' has already been revoked. I'll skip this for now."
 msgstr ""
@@ -1673,6 +1729,10 @@ msgstr ""
 msgid "It's been a long time coming, but the wait was worthwhile, finally you are able to get security at the right price... Free!"
 msgstr ""
 
+#: www/cap.php:64
+msgid "It's encouraged that you tear the top of this form off and give it to the person you are assuring as a reminder to sign up, and as a side benefit the tear off section also contains a method of offline verification of our fingerprints."
+msgstr ""
+
 #: pages/index/1.php:113
 msgid "It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in."
 msgstr ""
@@ -1711,7 +1771,7 @@ msgstr ""
 msgid "Last Name"
 msgstr ""
 
-#: pages/index/0.php:44
+#: pages/index/0.php:45
 msgid "Latest News"
 msgstr ""
 
@@ -1733,10 +1793,18 @@ msgstr ""
 msgid "Limitations"
 msgstr ""
 
-#: pages/wot/1-old.php:24 pages/wot/1-old.php:31 pages/wot/1-old.php:44
-#: pages/wot/1-old.php:57 pages/wot/1-old.php:76 pages/wot/1-old.php:92
-#: pages/wot/1-old.php:107 pages/wot/7-old.php:27 pages/wot/7-old.php:36
-#: pages/wot/7-old.php:47 pages/wot/7-old.php:59
+#: www/advertising.php:63
+msgid "Link URI was too short.<br />"
+msgstr ""
+
+#: www/advertising.php:55
+msgid "Link title was too short.<br />"
+msgstr ""
+
+#: pages/wot/1.php:24 pages/wot/1.php:31 pages/wot/1.php:44 pages/wot/1.php:57
+#: pages/wot/1.php:76 pages/wot/1.php:92 pages/wot/1.php:107
+#: pages/wot/7-old.php:27 pages/wot/7-old.php:36 pages/wot/7-old.php:47
+#: pages/wot/7-old.php:59
 msgid "Listed"
 msgstr ""
 
@@ -1744,14 +1812,14 @@ msgstr ""
 msgid "Locality Name (eg, city) [Sydney]:"
 msgstr ""
 
-#: pages/account/11.php:31 pages/account/21.php:35 pages/account/43.php:293
-#: pages/account/43.php:330 pages/account/54.php:68 pages/account/54.php:104
+#: pages/account/11.php:31 pages/account/21.php:35 pages/account/43.php:301
+#: pages/account/43.php:338 pages/account/54.php:68 pages/account/54.php:104
 #: pages/account/54.php:178 pages/wot/10.php:47 pages/wot/10.php:82
 #: pages/wot/6.php:93
 msgid "Location"
 msgstr ""
 
-#: pages/account/43.php:158
+#: pages/account/43.php:162
 msgid "Location Admin"
 msgstr ""
 
@@ -1763,7 +1831,7 @@ msgstr ""
 msgid "Location Aliases"
 msgstr ""
 
-#: includes/account_stuff.php:222
+#: includes/account_stuff.php:235
 msgid "Location DB"
 msgstr ""
 
@@ -1771,15 +1839,15 @@ msgstr ""
 msgid "Location Name"
 msgstr ""
 
-#: www/cap.php:208
+#: www/cap.php:214
 msgid "Location of Face-to-face Meeting"
 msgstr ""
 
-#: pages/index/4.php:24 pages/index/4.php:35
+#: pages/index/4.php:32 pages/index/4.php:36
 msgid "Login"
 msgstr ""
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:168
 msgid "Logout"
 msgstr ""
 
@@ -1795,7 +1863,7 @@ msgstr ""
 msgid "Lost Pass Phrase - Step 2"
 msgstr ""
 
-#: pages/account/13.php:109
+#: pages/account/13.php:119
 msgid "Lost Pass Phrase Questions"
 msgstr ""
 
@@ -1804,14 +1872,14 @@ msgid "Lost Pass Phrase Questions - Please enter five questions and your reponse
 msgstr ""
 
 #: includes/general_stuff.php:79 includes/tverify_stuff.php:46
-#: pages/account/43.php:202 pages/account/43.php:206 pages/account/43.php:210
-#: pages/account/43.php:214 pages/account/43.php:218 pages/account/43.php:222
-#: pages/account/43.php:226 pages/account/43.php:230 pages/account/43.php:234
-#: pages/account/43.php:238
+#: pages/account/43.php:210 pages/account/43.php:214 pages/account/43.php:218
+#: pages/account/43.php:222 pages/account/43.php:226 pages/account/43.php:230
+#: pages/account/43.php:234 pages/account/43.php:238 pages/account/43.php:242
+#: pages/account/43.php:246
 msgid "Lost Password"
 msgstr ""
 
-#: www/index.php:419
+#: www/index.php:532
 msgid "Mail Probe"
 msgstr ""
 
@@ -1835,6 +1903,10 @@ msgstr ""
 msgid "Make my location here"
 msgstr ""
 
+#: pages/index/5.php:61 pages/index/5.php:65
+msgid "Make payments with PayPal - it's fast, free and secure!"
+msgstr ""
+
 #: pages/index/51.php:21
 msgid "Many are just the users of the system who by just making use of the project contribute to the wider community by word-of-mouth."
 msgstr ""
@@ -1851,11 +1923,11 @@ msgstr ""
 msgid "Master Account"
 msgstr ""
 
-#: pages/wot/1-old.php:125 pages/wot/12.php:99
+#: pages/wot/12.php:99 pages/wot/1.php:125
 msgid "Max Points"
 msgstr ""
 
-#: www/cap.php:226
+#: www/cap.php:232
 msgid "Maximum Points"
 msgstr ""
 
@@ -1863,7 +1935,7 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: pages/account/43.php:294 pages/account/43.php:331 pages/wot/10.php:48
+#: pages/account/43.php:302 pages/account/43.php:339 pages/wot/10.php:48
 #: pages/wot/10.php:83 pages/wot/6.php:76
 msgid "Method"
 msgstr ""
@@ -1888,15 +1960,15 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: includes/general_stuff.php:120 includes/tverify_stuff.php:77
+#: includes/general_stuff.php:129 includes/tverify_stuff.php:77
 msgid "Mission Statement"
 msgstr ""
 
-#: includes/account_stuff.php:227
+#: includes/account_stuff.php:240
 msgid "More Information"
 msgstr ""
 
-#: pages/index/0.php:44
+#: pages/index/0.php:45
 msgid "More News Items"
 msgstr ""
 
@@ -1913,46 +1985,47 @@ msgstr ""
 msgid "My Account"
 msgstr ""
 
-#: includes/account_stuff.php:159 pages/account/36.php:18
+#: includes/account_stuff.php:172 pages/account/36.php:18
 msgid "My Alert Settings"
 msgstr ""
 
 #: includes/account.php:33 includes/account.php:40 includes/account.php:51
 #: includes/account.php:59 includes/account.php:76 includes/account.php:108
-#: includes/account.php:117 includes/account.php:159 includes/account.php:207
-#: includes/account.php:232 includes/account.php:317 includes/account.php:345
-#: includes/account.php:362 includes/account.php:378 includes/account.php:438
-#: includes/account.php:446 includes/account.php:456 includes/account.php:464
-#: includes/account.php:483 includes/account.php:492 includes/account.php:538
-#: includes/account.php:558 includes/account.php:616 includes/account.php:628
-#: includes/account.php:641 includes/account.php:680 includes/account.php:733
-#: includes/account.php:796 includes/account.php:848 includes/account.php:1032
-#: includes/account.php:1045 includes/account.php:1119
-#: includes/account.php:1143 includes/account.php:1231
-#: includes/account.php:1258 includes/account.php:1270
-#: includes/account.php:1323 includes/account.php:1420
-#: includes/account.php:1437 includes/account.php:1513
-#: includes/account.php:1525 includes/account.php:1581
-#: includes/account.php:1649 includes/account.php:1675
-#: includes/account.php:1703 includes/account.php:1731
-#: includes/account.php:1778 includes/account.php:1790
-#: includes/account.php:1853 includes/account.php:1956
-#: includes/account.php:1963 includes/account.php:1973
-#: includes/account.php:1983 includes/account.php:1993
-#: includes/account.php:2002 includes/account.php:2147
-#: includes/account.php:2179 includes/account.php:2204
-#: includes/account.php:2232 includes/account.php:2374
-#: includes/account.php:2387 includes/account.php:2400
-#: includes/account.php:2479 www/account.php:64 www/disputes.php:389
-#: www/error404.php:17 www/wot.php:33 www/wot.php:211 www/wot.php:219
-#: www/wot.php:232 www/wot.php:369 www/wot.php:414 www/wot.php:438
-#: www/wot.php:444 www/wot.php:456 pages/account/19.php:23
-#: pages/account/19.php:42 pages/account/19.php:50 pages/account/6.php:21
-#: pages/account/6.php:40 pages/account/6.php:48
+#: includes/account.php:117 includes/account.php:165 includes/account.php:215
+#: includes/account.php:240 includes/account.php:330 includes/account.php:358
+#: includes/account.php:375 includes/account.php:391 includes/account.php:451
+#: includes/account.php:459 includes/account.php:469 includes/account.php:477
+#: includes/account.php:496 includes/account.php:505 includes/account.php:559
+#: includes/account.php:579 includes/account.php:637 includes/account.php:650
+#: includes/account.php:663 includes/account.php:702 includes/account.php:759
+#: includes/account.php:825 includes/account.php:882 includes/account.php:1078
+#: includes/account.php:1091 includes/account.php:1165
+#: includes/account.php:1189 includes/account.php:1277
+#: includes/account.php:1304 includes/account.php:1316
+#: includes/account.php:1373 includes/account.php:1473
+#: includes/account.php:1490 includes/account.php:1572
+#: includes/account.php:1584 includes/account.php:1644
+#: includes/account.php:1715 includes/account.php:1741
+#: includes/account.php:1769 includes/account.php:1797
+#: includes/account.php:1841 includes/account.php:1853
+#: includes/account.php:1914 includes/account.php:2017
+#: includes/account.php:2024 includes/account.php:2034
+#: includes/account.php:2044 includes/account.php:2054
+#: includes/account.php:2063 includes/account.php:2208
+#: includes/account.php:2240 includes/account.php:2265
+#: includes/account.php:2293 includes/account.php:2455
+#: includes/account.php:2468 includes/account.php:2481
+#: includes/account.php:2560 includes/general.php:685 www/account.php:64
+#: www/advertising.php:18 www/disputes.php:389 www/error404.php:17
+#: www/wot.php:33 www/wot.php:211 www/wot.php:219 www/wot.php:232
+#: www/wot.php:369 www/wot.php:414 www/wot.php:438 www/wot.php:444
+#: www/wot.php:456 pages/account/19.php:23 pages/account/19.php:42
+#: pages/account/19.php:50 pages/account/6.php:21 pages/account/6.php:40
+#: pages/account/6.php:48
 msgid "My CAcert.org Account!"
 msgstr ""
 
-#: includes/account_stuff.php:158 pages/account/0.php:19
+#: includes/account_stuff.php:171 pages/account/0.php:19
 #: pages/account/13.php:32 pages/index/1.php:25
 msgid "My Details"
 msgstr ""
@@ -1961,15 +2034,15 @@ msgstr ""
 msgid "My Language Settings"
 msgstr ""
 
-#: includes/account_stuff.php:159 pages/wot/8.php:19
+#: includes/account_stuff.php:172 pages/wot/8.php:19
 msgid "My Listing"
 msgstr ""
 
-#: includes/account_stuff.php:159
+#: includes/account_stuff.php:172
 msgid "My Location"
 msgstr ""
 
-#: includes/account_stuff.php:159
+#: includes/account_stuff.php:172
 msgid "My Points"
 msgstr ""
 
@@ -1981,7 +2054,7 @@ msgstr ""
 msgid "N/A"
 msgstr ""
 
-#: pages/account/16.php:37 pages/wot/1-old.php:124 pages/wot/12.php:97
+#: pages/account/16.php:37 pages/wot/12.php:97 pages/wot/1.php:124
 #: pages/wot/6.php:67
 msgid "Name"
 msgstr ""
@@ -1990,7 +2063,7 @@ msgstr ""
 msgid "Name on file"
 msgstr ""
 
-#: www/cap.php:74 www/ttp.php:94
+#: www/cap.php:80 www/ttp.php:94
 msgid "Names"
 msgstr ""
 
@@ -1998,12 +2071,16 @@ msgstr ""
 msgid "Net Cafe Login"
 msgstr ""
 
-#: includes/account_stuff.php:170 includes/account_stuff.php:178
-#: includes/account_stuff.php:183 includes/account_stuff.php:187
-#: includes/account_stuff.php:216
+#: includes/account_stuff.php:183 includes/account_stuff.php:188
+#: includes/account_stuff.php:197 includes/account_stuff.php:202
+#: includes/account_stuff.php:206
 msgid "New"
 msgstr ""
 
+#: includes/account_stuff.php:245
+msgid "New Ad"
+msgstr ""
+
 #: pages/account/33.php:24
 #, php-format
 msgid "New Admin for %s"
@@ -2026,7 +2103,7 @@ msgstr ""
 msgid "New Domain for %s"
 msgstr ""
 
-#: includes/account_stuff.php:193 pages/account/24.php:18
+#: includes/account_stuff.php:212 pages/account/24.php:18
 msgid "New Organisation"
 msgstr ""
 
@@ -2034,7 +2111,7 @@ msgstr ""
 msgid "New Pass Phrase"
 msgstr ""
 
-#: includes/account.php:1048 www/index.php:103
+#: includes/account.php:1094 www/index.php:103
 msgid "New Pass Phrases specified don't match or were blank."
 msgstr ""
 
@@ -2047,7 +2124,7 @@ msgid "New Users"
 msgstr ""
 
 #: www/wot.php:381 pages/account/16.php:53 pages/account/24.php:45
-#: pages/account/3.php:85 pages/account/42.php:26 pages/account/44.php:30
+#: pages/account/3.php:93 pages/account/42.php:26 pages/account/44.php:30
 #: pages/account/48.php:26 pages/index/1.php:123 pages/index/5.php:53
 #: pages/index/6.php:86 pages/wot/5.php:52
 msgid "Next"
@@ -2069,6 +2146,10 @@ msgstr ""
 msgid "No PGP/GPG certificates are currently listed."
 msgstr ""
 
+#: pages/account/3.php:80
+msgid "No Single Sign On ID"
+msgstr ""
+
 #: pages/account/11.php:36
 msgid "No additional information will be included on certificates because it can not be automatically checked by the system."
 msgstr ""
@@ -2082,7 +2163,7 @@ msgstr ""
 msgid "No domains found matching %s"
 msgstr ""
 
-#: www/gpg.php:135
+#: www/gpg.php:137
 msgid "No emails found on your key"
 msgstr ""
 
@@ -2095,7 +2176,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr ""
 
-#: includes/account.php:2150
+#: includes/account.php:2211
 msgid "No such user found."
 msgstr ""
 
@@ -2130,6 +2211,10 @@ msgstr ""
 msgid "Not a valid email address. Can't continue."
 msgstr ""
 
+#: pages/account/13.php:110 pages/account/13.php:115
+msgid "Not displayed"
+msgstr ""
+
 #: pages/account/52.php:40
 msgid "Notary URL"
 msgstr ""
@@ -2150,18 +2235,18 @@ msgstr ""
 msgid "Now 'Create a new certificate'."
 msgstr ""
 
-#: includes/account.php:764 includes/account.php:877 includes/account.php:1353
-#: includes/account.php:1613
+#: includes/account.php:793 includes/account.php:914 includes/account.php:1406
+#: includes/account.php:1679
 msgid "Now deleting the following pending requests:"
 msgstr ""
 
-#: includes/account.php:644 includes/account.php:799 includes/account.php:1274
-#: includes/account.php:1528
+#: includes/account.php:666 includes/account.php:828 includes/account.php:1320
+#: includes/account.php:1587
 msgid "Now renewing the following certificates:"
 msgstr ""
 
-#: includes/account.php:736 includes/account.php:851 includes/account.php:1326
-#: includes/account.php:1584
+#: includes/account.php:762 includes/account.php:885 includes/account.php:1376
+#: includes/account.php:1647
 msgid "Now revoking the following certificates:"
 msgstr ""
 
@@ -2173,6 +2258,14 @@ msgstr ""
 msgid "OCSP Details"
 msgstr ""
 
+#: pages/account/13.php:109
+msgid "OTP Hash"
+msgstr ""
+
+#: pages/account/13.php:114
+msgid "OTP PIN"
+msgstr ""
+
 #: pages/help/2.php:44
 msgid "Of the biggest reasons why most people haven't started doing this, apart from being slightly technical, the reason is financial. You need your own certificate to digitally sign your emails. And the Certificate Authorities charge money to provide you with your own certificate. Need I say more. Dosh = no thanks I'd rather walk home. But organisations are emerging to provide the common fool in the street with a free alternative. However, given the obvious lack of funding and the emphasis on money to get enrolled, these organisations do not yet have the money to get themselves established as trusted Certificate Authorities. Thus it is currently down to trust. The decision of the individual to trust an unknown Certificate Authority. However once you have put your trust in a Certificate Authority you can implicitly trust the digital signatures generated using their certificates. In other words, if you trust (and accept the certificate of) the Certificate Authority that I use, you can automatically trust my digital signature. Trust me!"
 msgstr ""
@@ -2229,15 +2322,15 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: pages/account/3.php:79
+#: pages/account/3.php:87
 msgid "Optional Client CSR, no information on the certificate will be used"
 msgstr ""
 
-#: includes/account_stuff.php:192
+#: includes/account_stuff.php:211 pages/account/43.php:154
 msgid "Org Admin"
 msgstr ""
 
-#: includes/account_stuff.php:182
+#: includes/account_stuff.php:201
 msgid "Org Client Certs"
 msgstr ""
 
@@ -2245,7 +2338,7 @@ msgstr ""
 msgid "Org Client and Server Certificates"
 msgstr ""
 
-#: includes/account_stuff.php:186
+#: includes/account_stuff.php:205
 msgid "Org Server Certs"
 msgstr ""
 
@@ -2258,7 +2351,7 @@ msgstr ""
 msgid "Organisation"
 msgstr ""
 
-#: includes/account_stuff.php:198
+#: includes/account_stuff.php:217
 msgid "Organisation Assurance"
 msgstr ""
 
@@ -2266,7 +2359,7 @@ msgstr ""
 msgid "Organisation Name"
 msgstr ""
 
-#: includes/account.php:1667 includes/account.php:1694
+#: includes/account.php:1733 includes/account.php:1760
 msgid "Organisation Name and Contact Email are required fields."
 msgstr ""
 
@@ -2290,16 +2383,16 @@ msgstr ""
 msgid "Organizational Unit Name (eg, section) [Server Administration]:."
 msgstr ""
 
-#: pages/account/40.php:44 pages/index/11.php:44
+#: pages/account/40.php:45 pages/index/11.php:45
 msgid "Other Mailing Lists"
 msgstr ""
 
-#: pages/index/16.php:16 pages/index/16.php:24 pages/index/3.php:16
-#: pages/index/3.php:24
+#: pages/index/16.php:16 pages/index/16.php:27 pages/index/3.php:16
+#: pages/index/3.php:27
 msgid "PKI Key"
 msgstr ""
 
-#: pages/index/16.php:35 pages/index/3.php:35
+#: pages/index/16.php:42 pages/index/3.php:42
 msgid "PKI finger/thumb print signed by the CAcert GPG Key"
 msgstr ""
 
@@ -2315,7 +2408,7 @@ msgstr ""
 msgid "PLEASE NOTE: You must get 2 fully completed TTP forms before sending anything to CAcert. Failure to do so will only cause your application to be delayed until all forms have been received by CAcert!"
 msgstr ""
 
-#: pages/index/1.php:79 pages/index/4.php:31
+#: pages/index/1.php:79 pages/index/4.php:35
 msgid "Pass Phrase"
 msgstr ""
 
@@ -2323,11 +2416,11 @@ msgstr ""
 msgid "Pass Phrase Again"
 msgstr ""
 
-#: www/index.php:334
+#: www/index.php:447
 msgid "Pass Phrases don't match"
 msgstr ""
 
-#: www/index.php:329
+#: www/index.php:442
 msgid "Pass Phrases were blank"
 msgstr ""
 
@@ -2335,7 +2428,7 @@ msgstr ""
 msgid "Password Login"
 msgstr ""
 
-#: includes/account.php:1080
+#: includes/account.php:1126
 msgid "Password Update Notification"
 msgstr ""
 
@@ -2366,7 +2459,7 @@ msgstr ""
 msgid "Personal information"
 msgstr ""
 
-#: www/cap.php:178
+#: www/cap.php:184
 msgid "Photo ID Shown: (ID types, not numbers. eg Drivers license, Passport)"
 msgstr ""
 
@@ -2457,12 +2550,12 @@ msgstr ""
 msgid "Point System"
 msgstr ""
 
-#: pages/account/43.php:292 pages/account/43.php:329 pages/wot/10.php:46
+#: pages/account/43.php:300 pages/account/43.php:337 pages/wot/10.php:46
 #: pages/wot/10.php:81 pages/wot/6.php:132
 msgid "Points"
 msgstr ""
 
-#: www/cap.php:222
+#: www/cap.php:228
 msgid "Points Allocated"
 msgstr ""
 
@@ -2470,7 +2563,7 @@ msgstr ""
 msgid "Points Issued"
 msgstr ""
 
-#: pages/account/40.php:65 pages/index/11.php:65
+#: pages/account/40.php:66 pages/index/11.php:66
 msgid "Postal Address:"
 msgstr ""
 
@@ -2494,7 +2587,7 @@ msgstr ""
 msgid "Privacy"
 msgstr ""
 
-#: includes/account_stuff.php:245 includes/general_stuff.php:119
+#: includes/account_stuff.php:264 includes/general_stuff.php:128
 #: includes/tverify_stuff.php:76 pages/account/39.php:15 pages/index/10.php:15
 msgid "Privacy Policy"
 msgstr ""
@@ -2547,7 +2640,7 @@ msgstr ""
 msgid "Region"
 msgstr ""
 
-#: pages/account/36.php:24 pages/account/43.php:178 pages/index/1.php:119
+#: pages/account/36.php:24 pages/account/43.php:186 pages/index/1.php:119
 msgid "Regional Announcements"
 msgstr ""
 
@@ -2563,8 +2656,8 @@ msgstr ""
 msgid "Reminder Notice"
 msgstr ""
 
-#: includes/account.php:787 includes/account.php:898 includes/account.php:1375
-#: includes/account.php:1637
+#: includes/account.php:816 includes/account.php:935 includes/account.php:1428
+#: includes/account.php:1703
 #, php-format
 msgid "Removed a pending request for '%s'"
 msgstr ""
@@ -2579,7 +2672,7 @@ msgstr ""
 msgid "Renew/Revoke/Delete"
 msgstr ""
 
-#: includes/account.php:712 includes/account.php:1558
+#: includes/account.php:734 includes/account.php:1617
 msgid "Renewing"
 msgstr ""
 
@@ -2599,8 +2692,8 @@ msgstr ""
 msgid "Return to the 'Internet Information Services' screen in 'Administrative Tools' under 'Control Panel'. Right click on 'Default Web Site' and select 'Properties'."
 msgstr ""
 
-#: pages/account/43.php:295 pages/account/43.php:312 pages/account/43.php:332
-#: pages/account/43.php:349
+#: pages/account/43.php:303 pages/account/43.php:320 pages/account/43.php:340
+#: pages/account/43.php:357
 msgid "Revoke"
 msgstr ""
 
@@ -2624,17 +2717,19 @@ msgstr ""
 msgid "Root Certificate"
 msgstr ""
 
-#: pages/index/16.php:19 pages/index/16.php:26 pages/index/3.php:19
-#: pages/index/3.php:26
+#: pages/index/16.php:19 pages/index/3.php:19
 msgid "Root Certificate (DER Format)"
 msgstr ""
 
-#: pages/index/16.php:18 pages/index/16.php:25 pages/index/3.php:18
-#: pages/index/3.php:25
+#: pages/index/16.php:18 pages/index/3.php:18
 msgid "Root Certificate (PEM Format)"
 msgstr ""
 
-#: includes/account_stuff.php:198
+#: pages/index/16.php:20 pages/index/3.php:20
+msgid "Root Certificate (Text Format)"
+msgstr ""
+
+#: includes/account_stuff.php:217
 msgid "Rules"
 msgstr ""
 
@@ -2687,7 +2782,7 @@ msgstr ""
 msgid "Second ID Number (driver's license, passport etc)"
 msgstr ""
 
-#: pages/account/43.php:260
+#: pages/account/43.php:268
 msgid "Secondary Emails"
 msgstr ""
 
@@ -2731,8 +2826,8 @@ msgstr ""
 msgid "Select the Directory Security tab"
 msgstr ""
 
-#: pages/account/40.php:35 pages/account/40.php:58 pages/index/11.php:35
-#: pages/index/11.php:58 pages/wot/9.php:71
+#: pages/account/40.php:36 pages/account/40.php:59 pages/index/11.php:36
+#: pages/index/11.php:59 pages/wot/9.php:71
 msgid "Send"
 msgstr ""
 
@@ -2740,11 +2835,11 @@ msgstr ""
 msgid "Send reminder notice"
 msgstr ""
 
-#: pages/account/40.php:48 pages/index/11.php:48
+#: pages/account/40.php:49 pages/index/11.php:49
 msgid "Sensitive Information"
 msgstr ""
 
-#: includes/account_stuff.php:177
+#: includes/account_stuff.php:196
 msgid "Server Certificates"
 msgstr ""
 
@@ -2760,7 +2855,7 @@ msgstr ""
 msgid "Shortly you and the person you were assuring will receive an email confirmation. There is no action on your behalf required to complete this."
 msgstr ""
 
-#: pages/account/43.php:198
+#: pages/account/43.php:206
 msgid "Show Lost Password Details"
 msgstr ""
 
@@ -2778,7 +2873,7 @@ msgstr ""
 msgid "Signature"
 msgstr ""
 
-#: pages/account/40.php:62 pages/index/11.php:62
+#: pages/account/40.php:63 pages/index/11.php:63
 msgid "Snail Mail"
 msgstr ""
 
@@ -2823,19 +2918,19 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: pages/account/12.php:22 pages/account/18.php:22 pages/account/2.php:22
-#: pages/account/22.php:22 pages/account/5.php:22 pages/account/9.php:22
+#: pages/account/12.php:22 pages/account/18.php:22 pages/account/22.php:22
+#: pages/account/2.php:22 pages/account/5.php:22 pages/account/9.php:22
 #: pages/gpg/2.php:20
 msgid "Status"
 msgstr ""
 
-#: pages/account/40.php:33 pages/account/40.php:56 pages/index/11.php:33
-#: pages/index/11.php:56 pages/wot/9.php:63
+#: pages/account/40.php:34 pages/account/40.php:57 pages/index/11.php:34
+#: pages/index/11.php:57 pages/wot/9.php:63
 msgid "Subject"
 msgstr ""
 
 #: www/gpg.php:31 pages/account/10.php:36 pages/account/11.php:44
-#: pages/account/20.php:32 pages/account/21.php:40 pages/account/45.php:18
+#: pages/account/20.php:32 pages/account/21.php:41 pages/account/45.php:18
 #: pages/gpg/0.php:20
 msgid "Submit"
 msgstr ""
@@ -2845,7 +2940,7 @@ msgstr ""
 msgid "Suffix"
 msgstr ""
 
-#: includes/account_stuff.php:221
+#: includes/account_stuff.php:234
 msgid "System Admin"
 msgstr ""
 
@@ -2853,11 +2948,11 @@ msgstr ""
 msgid "System will send you an email with a link in it, you just open the link in a webbrowser."
 msgstr ""
 
-#: pages/account/43.php:154
+#: pages/account/43.php:158
 msgid "TTP Admin"
 msgstr ""
 
-#: includes/account_stuff.php:211
+#: includes/account_stuff.php:230
 msgid "TTP Form"
 msgstr ""
 
@@ -2877,7 +2972,7 @@ msgstr ""
 msgid "Thank you very much for your support, your donations help CAcert to continue to operate."
 msgstr ""
 
-#: www/index.php:415
+#: www/index.php:528
 msgid "Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!"
 msgstr ""
 
@@ -2921,12 +3016,12 @@ msgstr ""
 msgid "The Organisational Unit field is the 'free' field. It is often the department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:1066 www/index.php:111
+#: includes/account.php:1112 www/index.php:111
 #, php-format
 msgid "The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. Only scored %s points out of 6."
 msgstr ""
 
-#: includes/account.php:1064
+#: includes/account.php:1110
 msgid "The Pass Phrase you submitted was too short."
 msgstr ""
 
@@ -2946,7 +3041,7 @@ msgstr ""
 msgid "The ability to assure other new CAcert users; contribute to the strengthening and broadening of the CAcert Web of Trust."
 msgstr ""
 
-#: includes/account.php:439 includes/account.php:447 www/disputes.php:390
+#: includes/account.php:452 includes/account.php:460 www/disputes.php:390
 msgid "The address you submitted isn't a valid authority address for the domain."
 msgstr ""
 
@@ -2965,7 +3060,7 @@ msgstr ""
 msgid "The domain '%s' doesn't exist in the system. Can't continue."
 msgstr ""
 
-#: includes/account.php:484
+#: includes/account.php:497
 #, php-format
 msgid "The domain '%s' has been added to the system, however before any certificates for this can be issued you need to open the link in a browser that has been sent to your email address."
 msgstr ""
@@ -2975,8 +3070,8 @@ msgstr ""
 msgid "The domain '%s' has been entered into the dispute system, the email address you choose will now be sent an email which will give the recipent the option of accepting or rejecting the request, if after 2 days we haven't received a valid response for or against we will discard the request."
 msgstr ""
 
-#: includes/account.php:379 includes/account.php:457 includes/account.php:1716
-#: includes/account.php:1746
+#: includes/account.php:392 includes/account.php:470 includes/account.php:1782
+#: includes/account.php:1812
 #, php-format
 msgid "The domain '%s' is already in the system and is listed as valid. Can't continue."
 msgstr ""
@@ -3015,15 +3110,15 @@ msgstr ""
 msgid "The email address '%s' is already in the system. Can't continue."
 msgstr ""
 
-#: includes/account.php:146 www/disputes.php:48 www/disputes.php:156
+#: includes/account.php:152 www/disputes.php:48 www/disputes.php:156
 msgid "The following accounts have been removed:"
 msgstr ""
 
-#: includes/account.php:2447
+#: includes/account.php:2528
 msgid "The following comments were made by reviewers"
 msgstr ""
 
-#: includes/account.php:493
+#: includes/account.php:508
 msgid "The following domains have been removed:"
 msgstr ""
 
@@ -3048,7 +3143,7 @@ msgstr ""
 msgid "The page has been reproduced on %s with explicit permission from %sthe author%s with the information being copyrighted to the author (name with held by request)"
 msgstr ""
 
-#: includes/account.php:2154
+#: includes/account.php:2215
 #, php-format
 msgid "The password for %s has been updated successfully in the system."
 msgstr ""
@@ -3073,7 +3168,7 @@ msgstr ""
 msgid "The requests sent to the root store, are stored in a file for another process triggered by cron to parse and sign them, then stored in a reply file to be sent back to the webserver. Causing things to be separated into different users, basic privilege separation stuff. So being actually able to hack the serial daemons will only at the VERY worst cause fraudulent certificates, not the root to be revealed."
 msgstr ""
 
-#: www/logos.php:26
+#: www/logos.php:35
 msgid "The result should get you something like:"
 msgstr ""
 
@@ -3093,7 +3188,7 @@ msgstr ""
 msgid "Then you need to submit the contents from the CSR file to CAcert, you need to go:"
 msgstr ""
 
-#: pages/account/40.php:45 pages/index/11.php:45
+#: pages/account/40.php:46 pages/index/11.php:46
 msgid "There are a number of other mailing lists CAcert runs, some are general discussion, others are technical (such as the development list) or platform specific help (such as the list for Apple Mac users)"
 msgstr ""
 
@@ -3117,7 +3212,7 @@ msgstr ""
 msgid "This dispute no longer seems to be in the database, can't continue."
 msgstr ""
 
-#: www/index.php:354
+#: www/index.php:467
 msgid "This email address is currently valid in the system."
 msgstr ""
 
@@ -3148,7 +3243,7 @@ msgstr ""
 msgid "This policy discloses what information we gather about you when you visit any of our Web site, and when you issue or use our certificates. It describes how we use that information and how you can control it."
 msgstr ""
 
-#: www/index.php:439
+#: www/index.php:552
 msgid "This seems like potential spam, or you have cookies disabled, cannot continue."
 msgstr ""
 
@@ -3197,7 +3292,7 @@ msgid "To get from computer Internet User A to Internet User B an email may pass
 msgstr ""
 
 #: www/wot.php:332
-msgid "To make it easier for others in your area to find you, it's helpful to list yourself as an assurer (this is voluntry), as well as a physical location where you live or work the most. You can flag your account to be listed, and add a comment to the display by going to:"
+msgid "To make it easier for others in your area to find you, it's helpful to list yourself as an assurer (this is voluntary), as well as a physical location where you live or work the most. You can flag your account to be listed, and add a comment to the display by going to:"
 msgstr ""
 
 #: pages/account/39.php:70 pages/index/10.php:70
@@ -3208,12 +3303,12 @@ msgstr ""
 msgid "To provide a trust mechanism to go with the security aspects of encryption."
 msgstr ""
 
-#: www/cap.php:56
+#: www/cap.php:60
 #, php-format
 msgid "To the Assurer: The CAcert Assurance Programme (CAP) aims to verify the identities of Internet users through face-to-face witnessing of government issued identity documents. The Applicant asks you to verify to CAcert.org that you have met them and verified their identity against one or more original, trusted, government photo identity documents. If you have ANY doubts or concerns about the Applicant's identity, DO NOT COMPLETE OR SIGN this form. For more information about the CAcert Assurance Programme, including detailed guides for CAcert Assurers, please visit: %s"
 msgstr ""
 
-#: pages/account/43.php:316 pages/account/43.php:353 pages/wot/10.php:67
+#: pages/account/43.php:324 pages/account/43.php:361 pages/wot/10.php:67
 msgid "Total Points"
 msgstr ""
 
@@ -3233,7 +3328,7 @@ msgstr ""
 msgid "Treasurer"
 msgstr ""
 
-#: includes/account_stuff.php:198 includes/general.php:25 pages/wot/4.php:15
+#: includes/account_stuff.php:217 includes/general.php:25 pages/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr ""
 
@@ -3241,7 +3336,7 @@ msgstr ""
 msgid "Trusted Third Party"
 msgstr ""
 
-#: pages/account/43.php:166
+#: pages/account/43.php:174
 msgid "Tverify Account"
 msgstr ""
 
@@ -3257,7 +3352,7 @@ msgstr ""
 msgid "Unable to continue as no valid commonNames or subjectAltNames were present on your certificate request."
 msgstr ""
 
-#: includes/account.php:2388
+#: includes/account.php:2469
 msgid "Unable to find a valid tverify request for this ID."
 msgstr ""
 
@@ -3273,7 +3368,7 @@ msgstr ""
 msgid "Under 'Administrative Tools', open the 'Internet Services Manager'. Then open up the properties window for the website you wish to request the certificate for. Right-clicking on the particular website will open up its properties."
 msgstr ""
 
-#: includes/account.php:2466
+#: includes/account.php:2547
 msgid "Unfortunately your request for a points increase has been denied, below is the comments from people that reviewed your request as to why they rejected your application."
 msgstr ""
 
@@ -3289,7 +3384,7 @@ msgstr ""
 msgid "Unverified"
 msgstr ""
 
-#: pages/account/13.php:132 pages/account/27.php:48 pages/account/29.php:35
+#: pages/account/13.php:142 pages/account/27.php:48 pages/account/29.php:35
 #: pages/account/41.php:37 pages/account/54.php:54 pages/account/54.php:116
 #: pages/account/54.php:198 pages/wot/8.php:35
 msgid "Update"
@@ -3352,7 +3447,7 @@ msgstr ""
 msgid "Verified"
 msgstr ""
 
-#: www/stats.php:26 pages/account/43.php:272
+#: www/stats.php:26 pages/account/43.php:280
 msgid "Verified Domains"
 msgstr ""
 
@@ -3368,14 +3463,18 @@ msgstr ""
 msgid "Vice President"
 msgstr ""
 
-#: includes/account_stuff.php:166 includes/account_stuff.php:170
-#: includes/account_stuff.php:174 includes/account_stuff.php:178
-#: includes/account_stuff.php:183 includes/account_stuff.php:187
-#: includes/account_stuff.php:193 includes/account_stuff.php:216
+#: includes/account_stuff.php:179 includes/account_stuff.php:183
+#: includes/account_stuff.php:188 includes/account_stuff.php:193
+#: includes/account_stuff.php:197 includes/account_stuff.php:202
+#: includes/account_stuff.php:206 includes/account_stuff.php:212
 msgid "View"
 msgstr ""
 
-#: includes/account_stuff.php:193
+#: includes/account_stuff.php:245
+msgid "View Ads"
+msgstr ""
+
+#: includes/account_stuff.php:212
 msgid "View Organisations"
 msgstr ""
 
@@ -3388,7 +3487,7 @@ msgstr ""
 msgid "Warning!"
 msgstr ""
 
-#: pages/index/1.php:15 pages/index/4.php:19
+#: pages/index/1.php:15 pages/index/4.php:33
 msgid "Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result."
 msgstr ""
 
@@ -3396,7 +3495,7 @@ msgstr ""
 msgid "Warning! You've attempted to log into the system with a client certificate, but the login failed due to the certificate being expired, revoked or simply not valid for this site. You can login using your Email/Pass Phrase to get a new certificate, by clicking on 'Normal Login' to the right of your screen."
 msgstr ""
 
-#: includes/account.php:1885
+#: includes/account.php:1946
 #, php-format
 msgid "Wasn't able to match '%s' against any user in the system"
 msgstr ""
@@ -3409,7 +3508,7 @@ msgstr ""
 msgid "We collect two kinds of information about website users: 1) data that users volunteer by signing up to our website or when you send us an email via our contact form; and 2) aggregated tracking data we collect when users interact with our site."
 msgstr ""
 
-#: www/index.php:364
+#: www/index.php:477
 #, php-format
 msgid "We don't allow signups from people using email addresses from %s"
 msgstr ""
@@ -3431,8 +3530,8 @@ msgid "Website information"
 msgstr ""
 
 #: www/account.php:34 www/account.php:48 www/analyse.php:18 www/cps.php:3
-#: www/gpg.php:161 www/gpg.php:181 www/help.php:20 www/index.php:116
-#: www/index.php:463 www/index.php:474 www/index.php:483 www/logos.php:3
+#: www/gpg.php:268 www/gpg.php:288 www/help.php:20 www/index.php:116
+#: www/index.php:576 www/index.php:587 www/index.php:596 www/logos.php:3
 #: www/news.php:20 www/stats.php:3
 msgid "Welcome to CAcert.org"
 msgstr ""
@@ -3465,7 +3564,7 @@ msgstr ""
 msgid "Which Email?"
 msgstr ""
 
-#: pages/account/43.php:291 pages/account/43.php:328 pages/wot/10.php:45
+#: pages/account/43.php:299 pages/account/43.php:336 pages/wot/10.php:45
 #: pages/wot/10.php:80
 msgid "Who"
 msgstr ""
@@ -3494,7 +3593,7 @@ msgstr ""
 msgid "Why?"
 msgstr ""
 
-#: includes/general_stuff.php:85
+#: includes/general_stuff.php:85 pages/index/0.php:26
 msgid "Wiki Documentation"
 msgstr ""
 
@@ -3502,15 +3601,15 @@ msgstr ""
 msgid "With the proposed root certificate changes, there would be a new root, this would sign at least 1 sub-root, then the private key stored offline in a bank vault, with the sub-root doing all the signing, or alternatively 2 sub-roots, 1 for client certificates, one for server, the thinking behind this, if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: pages/account/36.php:25 pages/account/43.php:182 pages/index/1.php:120
+#: pages/account/36.php:25 pages/account/43.php:190 pages/index/1.php:120
 msgid "Within 200km Announcements"
 msgstr ""
 
-#: includes/account_stuff.php:211 pages/wot/6.php:136 pages/wot/6.php:137
+#: includes/account_stuff.php:230 pages/wot/6.php:136 pages/wot/6.php:137
 msgid "WoT Form"
 msgstr ""
 
-#: www/cap.php:93 www/ttp.php:159 pages/wot/6.php:72
+#: www/cap.php:99 www/ttp.php:159 pages/wot/6.php:72
 msgid "YYYY-MM-DD"
 msgstr ""
 
@@ -3564,11 +3663,11 @@ msgstr ""
 msgid "You are receiving this email because you have been assured by %s %s (%s)."
 msgstr ""
 
-#: includes/account.php:97 includes/account.php:1075 pages/account/13.php:22
+#: includes/account.php:97 includes/account.php:1121 pages/account/13.php:22
 msgid "You are receiving this email because you or someone else"
 msgstr ""
 
-#: includes/account.php:2472
+#: includes/account.php:2553
 msgid "You are welcome to try submitting another request at any time in the future, please make sure you take the reviewer comments into consideration or you risk having your application rejected again."
 msgstr ""
 
@@ -3580,7 +3679,7 @@ msgstr ""
 msgid "You can also become a CAcert Assurer by seeking out a public notary, justice of the peace, accountant, lawyer or bank manager. You will need to download and print out a copy of the TTP.pdf and fill in your sections. You will need to produce a photo copy of your ID, which the person assuring you will inspect against the originals. Once they are satisfied the documents appear to be genuine they need to sign the back of the photo copies, and fill in their sections of the TTP document. Once you have had your ID verified by 2 different people, pop the copies + forms in an envelope and post them to:"
 msgstr ""
 
-#: pages/account/40.php:25 pages/index/11.php:25
+#: pages/account/40.php:26 pages/index/11.php:26
 msgid "You can alternatively use the form below, however joining the list is the prefered option to support your queries"
 msgstr ""
 
@@ -3592,6 +3691,10 @@ msgstr ""
 msgid "You can list your location by going to:"
 msgstr ""
 
+#: www/advertising.php:47
+msgid "You can only place an advertisement for up to 12 months.<br />"
+msgstr ""
+
 #: pages/index/19.php:25
 msgid "You can send digitally signed/encrypted emails; others can send encrypted emails to you."
 msgstr ""
@@ -3600,6 +3703,24 @@ msgstr ""
 msgid "You currently don't have access to the email address you selected, or you haven't verified it yet."
 msgstr ""
 
+#: includes/account.php:750 includes/account.php:872 includes/account.php:1364
+#: includes/account.php:1636
+msgid "You did not select any certificates for renewal."
+msgstr ""
+
+#: includes/account.php:788 includes/account.php:909 includes/account.php:1401
+#: includes/account.php:1674
+msgid "You did not select any certificates for revocation."
+msgstr ""
+
+#: includes/account.php:529
+msgid "You did not select any domains for removal."
+msgstr ""
+
+#: includes/account.php:148
+msgid "You did not select any email accounts for removal."
+msgstr ""
+
 #: www/wot.php:220
 msgid "You didn't list a valid sponsor for this action."
 msgstr ""
@@ -3608,9 +3729,10 @@ msgstr ""
 msgid "You do not have enough/any lost password questions set. You will not be able to continue to reset your password via this method."
 msgstr ""
 
-#: includes/account.php:1650 includes/account.php:1854
-#: includes/account.php:1994 includes/account.php:2003
-#: includes/account.php:2375 pages/account/51.php:15 pages/account/52.php:15
+#: includes/account.php:1716 includes/account.php:1915
+#: includes/account.php:2055 includes/account.php:2064
+#: includes/account.php:2456 www/advertising.php:19 pages/account/51.php:15
+#: pages/account/52.php:15
 msgid "You don't have access to this area."
 msgstr ""
 
@@ -3622,7 +3744,7 @@ msgstr ""
 msgid "You failed to check all boxes to validate your adherence to the rules and policies of CAcert"
 msgstr ""
 
-#: includes/account.php:1068
+#: includes/account.php:1114
 msgid "You failed to correctly enter your current Pass Phrase."
 msgstr ""
 
@@ -3638,7 +3760,7 @@ msgstr ""
 msgid "You failed to paste a valid GPG/PGP key."
 msgstr ""
 
-#: includes/account.php:148
+#: includes/account.php:154
 msgid "You failed to select any accounts to be removed, or you attempted to remove the default account. No action was taken."
 msgstr ""
 
@@ -3646,7 +3768,7 @@ msgstr ""
 msgid "You get a vote in how CAcert (a non-profit association incorporated in Australia) is run; be eligible for positions on the CAcert board."
 msgstr ""
 
-#: includes/account.php:2401
+#: includes/account.php:2482
 msgid "You have already voted on this request."
 msgstr ""
 
@@ -3748,7 +3870,7 @@ msgstr ""
 msgid "You see this all the time on the Internet - every time you go to a secure page on a web site, for example to enter personal details, or to make a purchase, every day you browse web sites that have been digitally signed by a Certificate Authority that is accepted as having the authority to sign it. This is all invisible to the user, except that you may be aware that you are entering a secure zone (e.g. SSL and HTTPS)."
 msgstr ""
 
-#: includes/account.php:233
+#: includes/account.php:241
 msgid "You submitted invalid email addresses, or email address you no longer have control of. Can't continue with certificate request."
 msgstr ""
 
@@ -3760,7 +3882,7 @@ msgstr ""
 msgid "You tried to give a temporary points increase to someone that already has more then 150 points. Can't continue."
 msgstr ""
 
-#: includes/account.php:1964
+#: includes/account.php:2025
 msgid "You tried to use an invalid language."
 msgstr ""
 
@@ -3810,21 +3932,21 @@ msgstr ""
 msgid "You've been Assured."
 msgstr ""
 
-#: pages/account/43.php:287 pages/wot/10.php:40
+#: pages/account/43.php:295 pages/wot/10.php:40
 msgid "Your Assurance Points"
 msgstr ""
 
-#: pages/account/40.php:32 pages/account/40.php:55 pages/index/11.php:32
-#: pages/index/11.php:55
+#: pages/account/40.php:33 pages/account/40.php:56 pages/index/11.php:33
+#: pages/index/11.php:56
 msgid "Your Email"
 msgstr ""
 
-#: pages/account/40.php:31 pages/account/40.php:54 pages/index/11.php:31
-#: pages/index/11.php:54
+#: pages/account/40.php:32 pages/account/40.php:55 pages/index/11.php:32
+#: pages/index/11.php:55
 msgid "Your Name"
 msgstr ""
 
-#: includes/account.php:1072 www/index.php:117
+#: includes/account.php:1118 www/index.php:117
 msgid "Your Pass Phrase has been updated and your primary email account has been notified of the change."
 msgstr ""
 
@@ -3832,7 +3954,7 @@ msgstr ""
 msgid "Your account and/or email address has been verified. You can now start issuing certificates for this address."
 msgstr ""
 
-#: www/index.php:231
+#: www/index.php:344
 msgid "Your account has not been verified yet, please check your email account for the signup messages."
 msgstr ""
 
@@ -3840,6 +3962,10 @@ msgstr ""
 msgid "Your account information has been updated."
 msgstr ""
 
+#: www/advertising.php:78
+msgid "Your advertisement request has been lodge in the system and administrators notified. Once the information has been reviewed, you will be notified if the link was acceptable or declined and the reason for the decline. If the request is successful the system will generate an invoice."
+msgstr ""
+
 #: www/disputes.php:201
 msgid "Your attempt to accept or reject a disputed domain is invalid due to the hash string not matching with the domain ID."
 msgstr ""
@@ -3860,18 +3986,24 @@ msgstr ""
 msgid "Your browser includes special digital (root) certificates from a number of these 'Certificate Authorities' by default, and all web sites use certificates that are validated by one of these companies, which you as a user implicitly trust every time you go to the secure part of a web site. (You might ask, who validates the security of the Certificate Authorities, and why should you trust them?!"
 msgstr ""
 
-#: www/gpg.php:166
+#: www/gpg.php:273
 msgid "Your certificate request has failed to be processed correctly, please try submitting it again."
 msgstr ""
 
-#: includes/account.php:346 includes/account.php:617 includes/account.php:629
-#: includes/account.php:718 includes/account.php:833 includes/account.php:1259
-#: includes/account.php:1308 includes/account.php:1514
-#: includes/account.php:1567 includes/account.php:2233
+#: includes/account.php:359 includes/account.php:638 includes/account.php:651
+#: includes/account.php:740 includes/account.php:862 includes/account.php:1305
+#: includes/account.php:1354 includes/account.php:1573
+#: includes/account.php:1626 includes/account.php:2294
+#: includes/general.php:691
 #, php-format
 msgid "Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."
 msgstr ""
 
+#: includes/general.php:689
+#, php-format
+msgid "Your certificate request is still queued and hasn't been processed yet. Please wait, and go to Certificates -> View to see it's status."
+msgstr ""
+
 #: pages/help/3.php:48
 msgid "Your country, state and city."
 msgstr ""
@@ -3886,7 +4018,7 @@ msgstr ""
 msgid "Your default email address has been updated to '%s'."
 msgstr ""
 
-#: includes/account.php:1033
+#: includes/account.php:1079
 msgid "Your details have been updated with the database."
 msgstr ""
 
@@ -3906,8 +4038,8 @@ msgstr ""
 msgid "Your information has been submitted into our system. You will now be sent an email with a web link, you need to open that link in your web browser within 24 hours or your information will be removed from our system!"
 msgstr ""
 
-#: includes/account.php:1957 includes/account.php:1974
-#: includes/account.php:1984
+#: includes/account.php:2018 includes/account.php:2035
+#: includes/account.php:2045
 msgid "Your language setting has been updated."
 msgstr ""
 
@@ -3915,19 +4047,19 @@ msgstr ""
 msgid "Your location has been updated"
 msgstr ""
 
-#: www/account.php:49 www/index.php:475
+#: www/account.php:49 www/index.php:588
 msgid "Your message has been sent to the general support list."
 msgstr ""
 
-#: www/account.php:35 www/index.php:464
+#: www/account.php:35 www/index.php:577
 msgid "Your message has been sent."
 msgstr ""
 
-#: includes/account.php:2480
+#: includes/account.php:2561
 msgid "Your vote has been accepted."
 msgstr ""
 
-#: www/cap.php:43 www/ttp.php:48 pages/help/3.php:62
+#: www/cap.php:40 www/ttp.php:48 pages/help/3.php:62
 msgid "and"
 msgstr ""
 
@@ -3948,7 +4080,7 @@ msgstr ""
 msgid "has changed the default email on your account."
 msgstr ""
 
-#: includes/account.php:1076
+#: includes/account.php:1122
 msgid "has changed the password on your account."
 msgstr ""
 
@@ -3973,12 +4105,12 @@ msgstr ""
 msgid "subjectAltName"
 msgstr ""
 
-#: includes/account.php:1733 includes/account.php:1780
-#: includes/account.php:1792
+#: includes/account.php:1799 includes/account.php:1843
+#: includes/account.php:1855
 msgid "to continue."
 msgstr ""
 
-#: includes/account.php:837 includes/account.php:1312 pages/account/19.php:45
+#: includes/account.php:866 includes/account.php:1358 pages/account/19.php:45
 #: pages/account/6.php:43
 msgid "to install your certificate."
 msgstr ""