\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: www/wot/9.php:48
+#, php-format
+msgid "%s prefers to be contacted in %s"
+msgstr ""
+
#: www/account/43.php:42 www/account/49.php:43
#, php-format
msgid "%s rows displayed."
@@ -35,22 +40,22 @@ msgstr ""
msgid "%s's Domains"
msgstr ""
-#: includes/account.php:1486
+#: includes/account.php:1552
#, php-format
msgid "'%s' has just been successfully added as an organisation to the database."
msgstr ""
-#: includes/account.php:1542
+#: includes/account.php:1608
#, php-format
msgid "'%s' has just been successfully added to the database."
msgstr ""
-#: includes/account.php:1601
+#: includes/account.php:1667
#, php-format
msgid "'%s' has just been successfully deleted from the database."
msgstr ""
-#: includes/account.php:1514 includes/account.php:1589
+#: includes/account.php:1580 includes/account.php:1655
#, php-format
msgid "'%s' has just been successfully updated in the database."
msgstr ""
@@ -169,11 +174,11 @@ msgstr ""
msgid "And you're done!"
msgstr ""
-#: www/account/16.php:39
+#: www/account/16.php:46
msgid "Another Email"
msgstr ""
-#: includes/account.php:433
+#: includes/account.php:443
msgid "Any valid certificates will be revoked as well"
msgstr ""
@@ -212,7 +217,7 @@ msgstr ""
msgid "Assurance Points You Issued"
msgstr ""
-#: www/stats.php:51
+#: www/stats.php:47
msgid "Assurances Made"
msgstr ""
@@ -220,11 +225,11 @@ msgstr ""
msgid "Assure Someone"
msgstr ""
-#: www/index/0.php:60
+#: www/index/19.php:32
msgid "Assured client certificates"
msgstr ""
-#: www/index/0.php:90
+#: www/index/19.php:62
msgid "Assured server certificates"
msgstr ""
@@ -232,7 +237,7 @@ msgstr ""
msgid "Assurer Ranking"
msgstr ""
-#: www/stats.php:47
+#: www/stats.php:59
msgid "Assurers"
msgstr ""
@@ -240,11 +245,11 @@ msgstr ""
msgid "Based on OpenSSL, PHP, a little bit of C and MySQL, we were able to build not only a free certificate authority that could verify your email address or domain, but actually build in a highly effective trust model. Our model goes further than that used by some commercial CAs to prove your identity."
msgstr ""
-#: www/index/0.php:110
+#: www/index/19.php:82
msgid "Become a member of the CAcert Association"
msgstr ""
-#: www/index/0.php:100
+#: www/index/19.php:72
msgid "Become an assurer in CAcert Web of Trust"
msgstr ""
@@ -260,21 +265,26 @@ 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:61 includes/account.php:416
+#: includes/account.php:61 includes/account.php:426
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 till your hearts' content!"
msgstr ""
+#: www/gpg/3.php:28
+msgid "Below is your PGP/GPG Certificate"
+msgstr ""
+
#: www/account/15.php:32 www/account/23.php:32
msgid "Below is your Server Certificate"
msgstr ""
-#: www/index/0.php:53 www/index/0.php:63 www/index/0.php:73 www/index/0.php:83
-#: www/index/0.php:93 www/index/0.php:103 www/index/0.php:113
+#: www/index/19.php:25 www/index/19.php:35 www/index/19.php:45
+#: www/index/19.php:55 www/index/19.php:65 www/index/19.php:75
+#: www/index/19.php:85
msgid "Benefits"
msgstr ""
-#: includes/account.php:63 includes/account.php:418 includes/account.php:2062
-#: includes/account.php:2083 www/disputes.php:284 www/disputes.php:418
+#: includes/account.php:63 includes/account.php:428 includes/account.php:2128
+#: includes/account.php:2149 www/disputes.php:284 www/disputes.php:418
#: www/index.php:337 www/wot.php:264 www/wot.php:280 scripts/removedead.php:67
msgid "Best regards"
msgstr ""
@@ -315,7 +325,11 @@ msgstr ""
msgid "CAcert Inc., as a community-based project, is not driven by profits - it is driven by the community's desire for privacy and security."
msgstr ""
-#: includes/account.php:2063 includes/account.php:2084 www/wot.php:265
+#: www/src-lic.php:20
+msgid "CAcert Source License"
+msgstr ""
+
+#: includes/account.php:2129 includes/account.php:2150 www/wot.php:265
#: www/wot.php:281 scripts/removedead.php:68
msgid "CAcert Support Team"
msgstr ""
@@ -353,7 +367,7 @@ msgstr ""
msgid "CAcert.org Mission Statement"
msgstr ""
-#: includes/account.php:63 includes/account.php:418 www/disputes.php:284
+#: includes/account.php:63 includes/account.php:428 www/disputes.php:284
#: www/disputes.php:418 www/index.php:337
msgid "CAcert.org Support!"
msgstr ""
@@ -370,7 +384,7 @@ msgstr ""
msgid "CRL"
msgstr ""
-#: includes/account.php:1562 includes/account.php:1613 www/account/30.php:34
+#: includes/account.php:1628 includes/account.php:1679 www/account/30.php:34
#: www/account/31.php:30 www/account/34.php:34
msgid "Cancel"
msgstr ""
@@ -391,21 +405,17 @@ msgstr ""
msgid "Certificate Installation process for IIS 5.0"
msgstr ""
-#: www/help/0.php:19
-msgid "Certificate Retrieval Proposal"
-msgstr ""
-
#: www/account/52.php:39
msgid "Certificate Subject"
msgstr ""
-#: includes/account.php:729 includes/account.php:1127
+#: includes/account.php:782 includes/account.php:1187
#, php-format
msgid "Certificate for '%s' has been renewed."
msgstr ""
-#: includes/account.php:653 includes/account.php:765 includes/account.php:1164
-#: includes/account.php:1417
+#: includes/account.php:705 includes/account.php:818 includes/account.php:1224
+#: includes/account.php:1483
#, php-format
msgid "Certificate for '%s' has been revoked."
msgstr ""
@@ -414,23 +424,27 @@ msgstr ""
msgid "Certificate installation failed!"
msgstr ""
+#: www/help/0.php:19
+msgid "Certificate retrieval proposal"
+msgstr ""
+
#: www/stats.php:31
msgid "Certificates Issued"
msgstr ""
-#: www/index/0.php:64
+#: www/index/19.php:36
msgid "Certificates expires in 12 months."
msgstr ""
-#: www/index/0.php:74
+#: www/index/19.php:46
msgid "Certificates expires in 12 months; certificates must include your full name."
msgstr ""
-#: www/index/0.php:54
+#: www/index/19.php:26
msgid "Certificates expires in 12 months; only the email address itself can be entered into the certificate (not your full name)"
msgstr ""
-#: www/index/0.php:84
+#: www/index/19.php:56
msgid "Certificates expires in 6 months; only the domain name itself can be entered into the certificates (not your full name, company name, location, etc.)."
msgstr ""
@@ -447,9 +461,9 @@ msgstr ""
msgid "Choose a filename to save the request to"
msgstr ""
-#: includes/account.php:731 includes/account.php:1129
-#: includes/account.php:1543 includes/account.php:1590
-#: includes/account.php:1602 www/account/19.php:45 www/account/6.php:43
+#: includes/account.php:784 includes/account.php:1189
+#: includes/account.php:1609 includes/account.php:1656
+#: includes/account.php:1668 www/account/19.php:45 www/account/6.php:43
msgid "Click here"
msgstr ""
@@ -466,10 +480,11 @@ msgid "Click here to view all lists available"
msgstr ""
#: includes/account_stuff.php:169 www/account/18.php:18 www/account/5.php:18
+#: www/gpg/2.php:17
msgid "Client Certificates"
msgstr ""
-#: www/index/0.php:50
+#: www/index/19.php:22
msgid "Client certificates (un-assured)"
msgstr ""
@@ -477,11 +492,11 @@ msgstr ""
msgid "Code Signing"
msgstr ""
-#: www/account/3.php:63
+#: www/account/3.php:70
msgid "Code Signing "
msgstr ""
-#: www/index/0.php:70
+#: www/index/19.php:42
msgid "Code signing certificates"
msgstr ""
@@ -503,9 +518,9 @@ msgstr ""
msgid "CommonName"
msgstr ""
-#: includes/account.php:478 includes/account.php:491 includes/account.php:592
-#: includes/account.php:1238 includes/account.php:1251
-#: includes/account.php:1859 includes/account.php:1884
+#: includes/account.php:488 includes/account.php:509 includes/account.php:628
+#: includes/account.php:1298 includes/account.php:1315
+#: includes/account.php:1925 includes/account.php:1950
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 ""
@@ -566,8 +581,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:676 includes/account.php:786 includes/account.php:1186
-#: includes/account.php:1441
+#: includes/account.php:728 includes/account.php:839 includes/account.php:1246
+#: includes/account.php:1507
#, php-format
msgid "Couldn't remove the request for `%s`, request had already been processed."
msgstr ""
@@ -615,7 +630,7 @@ msgstr ""
msgid "Currently we only issue certificates for Punycode domains if the person requesting them has code signing attributes attached to their account, as these have potentially slightly higher security risk."
msgstr ""
-#: www/stats.php:69 www/stats.php:105 www/account/43.php:200
+#: www/stats.php:73 www/stats.php:109 www/account/43.php:200
#: www/account/43.php:235 www/wot/10.php:43 www/wot/10.php:76 www/wot/6.php:77
msgid "Date"
msgstr ""
@@ -666,18 +681,18 @@ msgid "Department"
msgstr ""
#: www/index/7.php:25
-msgid "Did a substantial amount of work on the previous website design, adn has been floating about on the mailing lists often giving invaluble insight into what we should be doing better."
+msgid "Did a substantial amount of work on the previous website design, and has been floating about on the mailing lists often giving invaluble insight into what we should be doing better."
msgstr ""
#: www/help/0.php:20
-msgid "Digital Signing (a guide for normal people)"
+msgid "Digital signing (a guide for normal people)"
msgstr ""
#: www/help/2.php:31
msgid "Digital signing thus provides security on the Internet."
msgstr ""
-#: www/index/0.php:73
+#: www/index/19.php:45
msgid "Digitally sign code, web applets, installers, etc. including your name and location in the certificates."
msgstr ""
@@ -758,7 +773,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:25 includes/account.php:309
+#: includes/account.php:25 includes/account.php:319
msgid "Due to the possibility for punycode domain exploits we currently do not allow any certificates to sign punycode domains or email addresses."
msgstr ""
@@ -790,12 +805,12 @@ msgid "Email Accounts and Client Certificates"
msgstr ""
#: www/account/1.php:22 www/account/11.php:34 www/account/5.php:23
-#: www/index/1.php:75 www/index/4.php:26 www/index/5.php:21 www/help/4.php:29
-#: www/disputes/1.php:23
+#: www/index/1.php:75 www/index/4.php:26 www/index/5.php:21 www/gpg/2.php:21
+#: www/disputes/1.php:23 www/help/4.php:29
msgid "Email Address"
msgstr ""
-#: includes/account.php:50 includes/account.php:402 www/index.php:293
+#: includes/account.php:50 includes/account.php:412 www/index.php:293
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 ""
@@ -816,7 +831,11 @@ msgstr ""
msgid "Email Dispute"
msgstr ""
-#: includes/account.php:65 includes/account.php:420
+#: www/wot/1.php:133
+msgid "Email Me"
+msgstr ""
+
+#: includes/account.php:65 includes/account.php:430
msgid "Email Probe"
msgstr ""
@@ -824,7 +843,7 @@ msgstr ""
msgid "Emails are not secure. In fact emails are VERY not secure!"
msgstr ""
-#: www/index/0.php:83
+#: www/index/19.php:55
msgid "Enable encrypted data transfer for users accessing your web, email, or other SSL enabled service on your server; wildcard certificates are allowed."
msgstr ""
@@ -873,13 +892,13 @@ msgstr ""
msgid "Ever requested a password that you lost to be emailed to you? That password was wide open to inspection by potential crackers."
msgstr ""
-#: www/account/12.php:55 www/account/18.php:52 www/account/22.php:52
-#: www/account/5.php:58
+#: www/account/12.php:55 www/account/18.php:55 www/account/22.php:55
+#: www/account/5.php:58 www/gpg/2.php:44
msgid "Expired"
msgstr ""
#: www/account/12.php:25 www/account/18.php:25 www/account/22.php:25
-#: www/account/5.php:25
+#: www/account/5.php:25 www/gpg/2.php:22
msgid "Expires"
msgstr ""
@@ -924,7 +943,7 @@ msgstr ""
msgid "First Name"
msgstr ""
-#: includes/account.php:829
+#: includes/account.php:882
msgid "First and Last name fields can not be blank."
msgstr ""
@@ -968,11 +987,15 @@ 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 ""
-#: www/account/12.php:83 www/account/18.php:86 www/account/22.php:82
-#: www/account/5.php:88
+#: www/account/12.php:83 www/account/18.php:89 www/account/22.php:85
+#: www/account/5.php:88 www/gpg/2.php:66
msgid "From here you can delete pending requests, or revoke valid certificates."
msgstr ""
+#: includes/general_stuff.php:112 includes/tverify_stuff.php:78
+msgid "Further Information"
+msgstr ""
+
#: www/index/16.php:23 www/index/3.php:23
msgid "GPG Key"
msgstr ""
@@ -1002,7 +1025,7 @@ msgid "Generating a Key Pair and Certificate Signing Request (CSR) for a Microso
msgstr ""
#: www/help/0.php:21
-msgid "Generating a New Key Pair and CSR for IIS 5.0"
+msgid "Generating a new key pair and CSR for IIS 5.0"
msgstr ""
#: includes/account_stuff.php:158
@@ -1017,20 +1040,24 @@ msgstr ""
msgid "Good question"
msgstr ""
-#: www/stats.php:102
+#: www/stats.php:106
msgid "Growth by year"
msgstr ""
-#: www/stats.php:66
+#: www/stats.php:70
msgid "Growth in the last 12 months"
msgstr ""
+#: www/index/7.php:26
+msgid "Has been involved in translating this website into Portuguese"
+msgstr ""
+
#: www/index/7.php:24
-msgid "Has put a lot of time and effort into promoting and assuring people in Brazil and South America, and for doing most of the Portuguese translations"
+msgid "Has put a lot of time and effort into promoting and assuring people in Brazil and South America, and for helping to translate this site into Portuguese"
msgstr ""
#: www/index/7.php:23
-msgid "Has put so much effort into CAcert I don't know where to begin, he managed to bring the CPS Chrisitian had started up to draft status, he has given countless hours to assuring people and attending conferences to help spread the word"
+msgid "Has put so much effort into CAcert I don't know where to begin, he managed to get the CPS Chrisitian had started up to draft status, he has given countless hours to assuring people and attending conferences to help spread the word"
msgstr ""
#: www/index/7.php:21
@@ -1073,16 +1100,16 @@ msgstr ""
msgid "How do I generate a private key and CSR using OpenSSL?"
msgstr ""
-#: www/help/0.php:24
-msgid "How do I get a Server certificate from CAcert?"
-msgstr ""
-
#: www/help/0.php:23
msgid "How do I get a secured by CAcert emblem on my site?"
msgstr ""
+#: www/help/0.php:24
+msgid "How do I get a server certificate from CAcert?"
+msgstr ""
+
#: www/help/0.php:25
-msgid "How does CAcert Protect it's root private key?"
+msgid "How does CAcert protect its root private key?"
msgstr ""
#: www/help/2.php:18 www/help/2.php:35 www/help/2.php:38
@@ -1117,12 +1144,12 @@ msgstr ""
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
-#: includes/account.php:944
+#: includes/account.php:997
msgid "I couldn't match any emails against your organisational account."
msgstr ""
-#: includes/account.php:134 includes/account.php:166 includes/account.php:268
-#: includes/account.php:964 includes/account.php:1051
+#: includes/account.php:134 includes/account.php:174 includes/account.php:277
+#: includes/account.php:1021 includes/account.php:1109
msgid "I didn't receive a valid Certificate Request, hit the back button and try again."
msgstr ""
@@ -1246,8 +1273,8 @@ msgstr ""
msgid "In this section you will be able to edit your personal information (if you haven't been assured), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned assurance event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events."
msgstr ""
-#: www/account/3.php:53 www/account/3.php:54 www/account/3.php:55
-#: www/account/3.php:56
+#: www/account/3.php:60 www/account/3.php:61 www/account/3.php:62
+#: www/account/3.php:63
msgid "Include"
msgstr ""
@@ -1259,6 +1286,10 @@ msgstr ""
msgid "Incorrect email address and/or Pass Phrase."
msgstr ""
+#: www/index/19.php:15
+msgid "Information"
+msgstr ""
+
#: www/account/19.php:60 www/account/6.php:58
msgid "Install Your Certificate"
msgstr ""
@@ -1280,16 +1311,16 @@ msgstr ""
msgid "Introduction"
msgstr ""
-#: includes/account.php:566 includes/account.php:642 includes/account.php:670
-#: includes/account.php:703 includes/account.php:754 includes/account.php:780
-#: includes/account.php:1102 includes/account.php:1153
-#: includes/account.php:1180 includes/account.php:1350
-#: includes/account.php:1406 includes/account.php:1435
+#: includes/account.php:602 includes/account.php:694 includes/account.php:722
+#: includes/account.php:755 includes/account.php:807 includes/account.php:833
+#: includes/account.php:1161 includes/account.php:1213
+#: includes/account.php:1240 includes/account.php:1416
+#: includes/account.php:1472 includes/account.php:1501
#, php-format
msgid "Invalid ID '%s' presented, can't do anything with it."
msgstr ""
-#: includes/account.php:836 www/index.php:251
+#: includes/account.php:889 www/index.php:251
msgid "Invalid date of birth"
msgstr ""
@@ -1310,9 +1341,9 @@ msgstr ""
msgid "It is imperative that you maintain the confidentiality and privacy of the applicant, and never disclose the information obtained without the applicant's consent."
msgstr ""
-#: includes/account.php:648 includes/account.php:760 includes/account.php:1109
-#: includes/account.php:1159 includes/account.php:1357
-#: includes/account.php:1412
+#: includes/account.php:700 includes/account.php:813 includes/account.php:1168
+#: includes/account.php:1219 includes/account.php:1423
+#: includes/account.php:1478
#, php-format
msgid "It would seem '%s' has already been revoked. I'll skip this for now."
msgstr ""
@@ -1362,8 +1393,9 @@ msgstr ""
msgid "Liability"
msgstr ""
-#: www/index/0.php:54 www/index/0.php:64 www/index/0.php:74 www/index/0.php:84
-#: www/index/0.php:94 www/index/0.php:104 www/index/0.php:114
+#: www/index/19.php:26 www/index/19.php:36 www/index/19.php:46
+#: www/index/19.php:56 www/index/19.php:66 www/index/19.php:76
+#: www/index/19.php:86
msgid "Limitations"
msgstr ""
@@ -1510,33 +1542,35 @@ msgstr ""
#: includes/account.php:24 includes/account.php:31 includes/account.php:42
#: includes/account.php:49 includes/account.php:67 includes/account.php:90
-#: includes/account.php:99 includes/account.php:133 includes/account.php:165
-#: includes/account.php:190 includes/account.php:267 includes/account.php:294
-#: includes/account.php:308 includes/account.php:325 includes/account.php:384
-#: includes/account.php:394 includes/account.php:401 includes/account.php:422
-#: includes/account.php:431 includes/account.php:477 includes/account.php:490
-#: includes/account.php:527 includes/account.php:539 includes/account.php:552
-#: includes/account.php:591 includes/account.php:628 includes/account.php:691
-#: includes/account.php:742 includes/account.php:873 includes/account.php:886
-#: includes/account.php:943 includes/account.php:963 includes/account.php:1050
-#: includes/account.php:1076 includes/account.php:1088
-#: includes/account.php:1140 includes/account.php:1237
-#: includes/account.php:1250 includes/account.php:1323
-#: includes/account.php:1335 includes/account.php:1391
-#: includes/account.php:1459 includes/account.php:1485
-#: includes/account.php:1513 includes/account.php:1541
-#: includes/account.php:1588 includes/account.php:1600
-#: includes/account.php:1663 includes/account.php:1766
-#: includes/account.php:1773 includes/account.php:1783
-#: includes/account.php:1826 includes/account.php:1858
-#: includes/account.php:1883 includes/account.php:1911
-#: includes/account.php:1983 includes/account.php:1996
-#: includes/account.php:2009 includes/account.php:2088 www/account.php:45
-#: www/disputes.php:389 www/error404.php:17 www/wot.php:28 www/wot.php:157
-#: www/wot.php:165 www/wot.php:178 www/wot.php:292 www/wot.php:311
-#: www/wot.php:323 www/wot.php:334 www/account/15.php:23 www/account/19.php:23
+#: includes/account.php:99 includes/account.php:133 includes/account.php:173
+#: includes/account.php:198 includes/account.php:276 includes/account.php:304
+#: includes/account.php:318 includes/account.php:335 includes/account.php:394
+#: includes/account.php:404 includes/account.php:411 includes/account.php:432
+#: includes/account.php:441 includes/account.php:487 includes/account.php:508
+#: includes/account.php:563 includes/account.php:575 includes/account.php:588
+#: includes/account.php:627 includes/account.php:680 includes/account.php:743
+#: includes/account.php:795 includes/account.php:926 includes/account.php:939
+#: includes/account.php:996 includes/account.php:1020
+#: includes/account.php:1108 includes/account.php:1135
+#: includes/account.php:1147 includes/account.php:1200
+#: includes/account.php:1297 includes/account.php:1314
+#: includes/account.php:1389 includes/account.php:1401
+#: includes/account.php:1457 includes/account.php:1525
+#: includes/account.php:1551 includes/account.php:1579
+#: includes/account.php:1607 includes/account.php:1654
+#: includes/account.php:1666 includes/account.php:1729
+#: includes/account.php:1832 includes/account.php:1839
+#: includes/account.php:1849 includes/account.php:1892
+#: includes/account.php:1924 includes/account.php:1949
+#: includes/account.php:1977 includes/account.php:2049
+#: includes/account.php:2062 includes/account.php:2075
+#: includes/account.php:2154 www/account.php:45 www/disputes.php:389
+#: www/error404.php:17 www/wot.php:28 www/wot.php:157 www/wot.php:165
+#: www/wot.php:178 www/wot.php:292 www/wot.php:311 www/wot.php:323
+#: www/wot.php:334 www/account/15.php:23 www/account/19.php:23
#: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
#: www/account/6.php:21 www/account/6.php:40 www/account/6.php:48
+#: www/gpg/3.php:21
msgid "My CAcert.org Account!"
msgstr ""
@@ -1557,6 +1591,10 @@ msgstr ""
msgid "My Location"
msgstr ""
+#: includes/account_stuff.php:162
+msgid "My Points"
+msgstr ""
+
#: www/account/41.php:21
msgid "My prefered language"
msgstr ""
@@ -1584,11 +1622,11 @@ msgstr ""
msgid "New Admin for %s"
msgstr ""
-#: www/stats.php:71 www/stats.php:107
+#: www/stats.php:75 www/stats.php:111
msgid "New Assurers"
msgstr ""
-#: www/stats.php:72 www/stats.php:108
+#: www/stats.php:76 www/stats.php:112
msgid "New Certificates"
msgstr ""
@@ -1609,7 +1647,7 @@ msgstr ""
msgid "New Pass Phrase"
msgstr ""
-#: includes/account.php:889 www/index.php:104
+#: includes/account.php:942 www/index.php:104
msgid "New Pass Phrases specified don't match or were blank."
msgstr ""
@@ -1617,7 +1655,7 @@ msgstr ""
msgid "New Password"
msgstr ""
-#: www/stats.php:70 www/stats.php:106
+#: www/stats.php:74 www/stats.php:110
msgid "New Users"
msgstr ""
@@ -1625,7 +1663,7 @@ msgstr ""
msgid "News"
msgstr ""
-#: www/account/16.php:40 www/account/24.php:45 www/account/3.php:70
+#: www/account/16.php:47 www/account/24.php:45 www/account/3.php:77
#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
#: www/index/1.php:123 www/index/5.php:53 www/index/6.php:56 www/wot/5.php:37
msgid "Next"
@@ -1639,15 +1677,19 @@ msgstr ""
msgid "No"
msgstr ""
-#: www/account/3.php:52
+#: www/account/3.php:59
msgid "No Name"
msgstr ""
+#: www/gpg/2.php:36
+msgid "No PGP/GPG certificates are currently listed."
+msgstr ""
+
#: www/account/11.php:36
msgid "No additional information will be included on certificates because it can not be automatically checked by the system."
msgstr ""
-#: www/account/12.php:47 www/account/22.php:44 www/account/9.php:32
+#: www/account/12.php:47 www/account/22.php:47 www/account/9.php:32
msgid "No domains are currently listed."
msgstr ""
@@ -1660,12 +1702,16 @@ msgstr ""
msgid "No emails found on your key"
msgstr ""
+#: www/gpg/3.php:22
+msgid "No such PGP/GPG certificates attached to your account."
+msgstr ""
+
#: www/account/15.php:24 www/account/19.php:24 www/account/23.php:24
#: www/account/6.php:22
msgid "No such certificate attached to your account."
msgstr ""
-#: includes/account.php:1829
+#: includes/account.php:1895
msgid "No such user found."
msgstr ""
@@ -1674,11 +1720,11 @@ msgstr ""
msgid "No users found matching %s"
msgstr ""
-#: www/index/0.php:114
+#: www/index/19.php:86
msgid "None, the sky is the limit for CAcert."
msgstr ""
-#: www/index/0.php:115
+#: www/index/19.php:87
msgid "None; $10 USD per year membership fee."
msgstr ""
@@ -1686,7 +1732,7 @@ msgstr ""
msgid "Normal Login"
msgstr ""
-#: www/account/12.php:61 www/account/18.php:58 www/account/22.php:58
+#: www/account/12.php:61 www/account/18.php:61 www/account/22.php:61
#: www/account/5.php:64
msgid "Not Revoked"
msgstr ""
@@ -1716,18 +1762,18 @@ msgstr ""
msgid "Now 'Create a new certificate'."
msgstr ""
-#: includes/account.php:659 includes/account.php:771 includes/account.php:1170
-#: includes/account.php:1423
+#: includes/account.php:711 includes/account.php:824 includes/account.php:1230
+#: includes/account.php:1489
msgid "Now deleting the following pending requests:"
msgstr ""
-#: includes/account.php:555 includes/account.php:694 includes/account.php:1092
-#: includes/account.php:1338
+#: includes/account.php:591 includes/account.php:746 includes/account.php:1151
+#: includes/account.php:1404
msgid "Now renewing the following certificates:"
msgstr ""
-#: includes/account.php:631 includes/account.php:745 includes/account.php:1143
-#: includes/account.php:1394
+#: includes/account.php:683 includes/account.php:798 includes/account.php:1203
+#: includes/account.php:1460
msgid "Now revoking the following certificates:"
msgstr ""
@@ -1820,7 +1866,7 @@ msgstr ""
msgid "Organisation Name"
msgstr ""
-#: includes/account.php:1477 includes/account.php:1504
+#: includes/account.php:1543 includes/account.php:1570
msgid "Organisation Name and Contact Email are required fields."
msgstr ""
@@ -1880,13 +1926,17 @@ msgstr ""
msgid "Pass Phrases were blank"
msgstr ""
-#: www/account/10.php:26 www/account/20.php:24 www/account/45.php:15
+#: www/account/10.php:32 www/account/20.php:28 www/account/45.php:15
msgid "Paste your CSR below..."
msgstr ""
-#: www/account/12.php:57 www/account/12.php:64 www/account/18.php:54
-#: www/account/18.php:65 www/account/22.php:54 www/account/22.php:63
-#: www/account/5.php:60 www/account/5.php:67
+#: www/gpg/0.php:15
+msgid "Paste your GPG key below..."
+msgstr ""
+
+#: www/account/12.php:57 www/account/12.php:64 www/account/18.php:57
+#: www/account/18.php:68 www/account/22.php:57 www/account/22.php:66
+#: www/account/5.php:60 www/account/5.php:67 www/gpg/2.php:46 www/gpg/2.php:52
msgid "Pending"
msgstr ""
@@ -1906,7 +1956,7 @@ msgstr ""
msgid "Please Note. All information on your certificate will be removed except the CommonName field, this is because it's an automated service and cannot automatically verify other details on your certificates are valid or not. If you are a valid organisation and would like more details to appear on certificates, you will need to have at least 50 assurance points and you need to send us a copy of your document of incorporation. Then we can add those details to your certificates. Contact us for more information on our organisational services."
msgstr ""
-#: www/account/3.php:65
+#: www/account/3.php:72
msgid "Please Note: By ticking this box you will automatically have your name included in any certificates."
msgstr ""
@@ -1936,7 +1986,7 @@ msgstr ""
msgid "Please make sure the following details are correct before proceeding any further."
msgstr ""
-#: www/index/0.php:120
+#: www/index/19.php:92
msgid "Please note a general limitation is that, unlike long-time players like Verisign, CAcert's root certificate is not included by default in mainstream browsers, email clients, etc. This means people to whom you send encrypted email, or users who visit your SSL-enabled web server, will first have to import CAcert's root certificate, or they will have to agree to pop-up security warnings (which may look a little scary to non-techy users)."
msgstr ""
@@ -1952,6 +2002,14 @@ msgstr ""
msgid "Please note: All html will be stripped from the contact information box, a link to an email form will automatically be inserted to ensure your privacy."
msgstr ""
+#: www/account/16.php:42 www/account/3.php:54
+msgid "Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"
+msgstr ""
+
+#: www/account/10.php:30 www/account/20.php:27
+msgid "Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people."
+msgstr ""
+
#: www/disputes/0.php:16
msgid "Please select the most appropriate section to report your problem."
msgstr ""
@@ -1961,7 +2019,7 @@ msgstr ""
msgid "Points"
msgstr ""
-#: www/stats.php:59
+#: www/stats.php:63
msgid "Points Issued"
msgstr ""
@@ -2003,7 +2061,7 @@ msgid "Processing"
msgstr ""
#: www/index/7.php:20
-msgid "Put a lot of effort convincing people in Germany to signup and be assured, he started work on a new RFC complient CPS, spent countless hours helping with tech support, and so much more"
+msgid "Put a lot of effort convincing people in Germany to signup and be assured, he started work on a new RFC compliant CPS, spent countless hours helping with tech support, and so much more"
msgstr ""
#: www/help/8.php:15
@@ -2030,13 +2088,13 @@ msgstr ""
msgid "Rejected"
msgstr ""
-#: includes/account.php:682 includes/account.php:792 includes/account.php:1192
-#: includes/account.php:1447
+#: includes/account.php:734 includes/account.php:845 includes/account.php:1252
+#: includes/account.php:1513
#, php-format
msgid "Removed a pending request for '%s'"
msgstr ""
-#: www/account/12.php:76 www/account/18.php:79 www/account/22.php:75
+#: www/account/12.php:76 www/account/18.php:82 www/account/22.php:78
#: www/account/5.php:81
msgid "Renew"
msgstr ""
@@ -2046,7 +2104,7 @@ msgstr ""
msgid "Renew/Revoke/Delete"
msgstr ""
-#: includes/account.php:607 includes/account.php:1368
+#: includes/account.php:659 includes/account.php:1434
msgid "Renewing"
msgstr ""
@@ -2066,13 +2124,13 @@ 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 ""
-#: www/account/12.php:77 www/account/18.php:80 www/account/22.php:76
+#: www/account/12.php:77 www/account/18.php:83 www/account/22.php:79
#: www/account/5.php:82
msgid "Revoke/Delete"
msgstr ""
#: www/account/12.php:24 www/account/12.php:59 www/account/18.php:24
-#: www/account/18.php:56 www/account/22.php:24 www/account/22.php:56
+#: www/account/18.php:59 www/account/22.php:24 www/account/22.php:59
#: www/account/5.php:24 www/account/5.php:62
msgid "Revoked"
msgstr ""
@@ -2097,27 +2155,27 @@ msgstr ""
msgid "Rules"
msgstr ""
-#: www/index/0.php:75
+#: www/index/19.php:47
msgid "Same as above plus get 100 assurance points by meeting with multiple assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents."
msgstr ""
-#: www/index/0.php:63
+#: www/index/19.php:35
msgid "Same as above plus you can include your full name in the certificates."
msgstr ""
-#: www/index/0.php:94
+#: www/index/19.php:66
msgid "Same as above, except certificates expire in 24 months."
msgstr ""
-#: www/index/0.php:95
+#: www/index/19.php:67
msgid "Same as above, plus get 50 assurance points by meeting with assurer(s) from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents."
msgstr ""
-#: www/index/0.php:65
+#: www/index/19.php:37
msgid "Same as above, plus you must get a minimum of 50 assurance points by meeting with one or more assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents."
msgstr ""
-#: www/index/0.php:93
+#: www/index/19.php:65
msgid "Same as above."
msgstr ""
@@ -2198,7 +2256,7 @@ msgstr ""
msgid "Server Certificates"
msgstr ""
-#: www/index/0.php:80
+#: www/index/19.php:52
msgid "Server certificates (un-assured)"
msgstr ""
@@ -2206,6 +2264,16 @@ 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 ""
+#: www/account/10.php:28 www/account/16.php:40 www/account/20.php:25
+#: www/account/3.php:52
+msgid "Sign by class 1 root certificate"
+msgstr ""
+
+#: www/account/10.php:29 www/account/16.php:41 www/account/20.php:26
+#: www/account/3.php:53
+msgid "Sign by class 3 root certificate"
+msgstr ""
+
#: www/account/40.php:51 www/index/11.php:51
msgid "Snail Mail"
msgstr ""
@@ -2249,6 +2317,7 @@ msgstr ""
#: www/account/12.php:22 www/account/18.php:22 www/account/2.php:22
#: www/account/22.php:22 www/account/5.php:22 www/account/9.php:22
+#: www/gpg/2.php:20
msgid "Status"
msgstr ""
@@ -2257,8 +2326,9 @@ msgstr ""
msgid "Subject"
msgstr ""
-#: www/gpg.php:28 www/account/10.php:29 www/account/11.php:44
-#: www/account/20.php:27 www/account/21.php:40 www/account/45.php:18
+#: www/gpg.php:28 www/account/10.php:34 www/account/11.php:44
+#: www/account/20.php:30 www/account/21.php:40 www/account/45.php:18
+#: www/gpg/0.php:18
msgid "Submit"
msgstr ""
@@ -2323,12 +2393,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:900 www/index.php:112
+#: includes/account.php:953 www/index.php:112
#, 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:898
+#: includes/account.php:951
msgid "The Pass Phrase you submitted was too short."
msgstr ""
@@ -2344,11 +2414,11 @@ msgstr ""
msgid "The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons. You can also get trust points via the Trust Third Party system where you go to a lawyer, bank manager, accountant, or public notary/juctise of the peace and they via your ID and fill in the TTP form to state they have viewed your ID documents and it appears authentic and true. More information on the TTP system can be found in the TTP sub-menu"
msgstr ""
-#: www/index/0.php:103
+#: www/index/19.php:75
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:385 www/disputes.php:390
+#: includes/account.php:395 www/disputes.php:390
msgid "The address you submitted isn't a valid authority address for the domain."
msgstr ""
@@ -2364,10 +2434,10 @@ msgstr ""
#: www/disputes.php:320
#, php-format
-msgid "The domain '%s' doesn't already in the system. Can't continue."
+msgid "The domain '%s' doesn't exist in the system. Can't continue."
msgstr ""
-#: includes/account.php:423
+#: includes/account.php:433
#, 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 ""
@@ -2377,8 +2447,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:326 includes/account.php:395 includes/account.php:1526
-#: includes/account.php:1556
+#: includes/account.php:336 includes/account.php:405 includes/account.php:1592
+#: includes/account.php:1622
#, php-format
msgid "The domain '%s' is already in the system and is listed as valid. Can't continue."
msgstr ""
@@ -2399,7 +2469,7 @@ msgstr ""
#: www/disputes.php:247
#, php-format
-msgid "The email address '%s' doesn't already in the system. Can't continue."
+msgid "The email address '%s' doesn't exist in the system. Can't continue."
msgstr ""
#: includes/account.php:68
@@ -2421,11 +2491,11 @@ msgstr ""
msgid "The following accounts have been removed:"
msgstr ""
-#: includes/account.php:2056
+#: includes/account.php:2122
msgid "The following comments were made by reviewers"
msgstr ""
-#: includes/account.php:432
+#: includes/account.php:442
msgid "The following domains have been removed:"
msgstr ""
@@ -2437,7 +2507,7 @@ msgstr ""
msgid "The list of names are in no sense of order"
msgstr ""
-#: www/index/0.php:104
+#: www/index/19.php:76
msgid "The number of assurance point you have will limit the maximum assurance points you can issue for people you assure."
msgstr ""
@@ -2450,7 +2520,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:1833
+#: includes/account.php:1899
#, php-format
msgid "The password for %s has been updated sucessfully in the system."
msgstr ""
@@ -2570,7 +2640,7 @@ msgid "To generate a public and private key pair and CSR for a Microsoft IIS 5 S
msgstr ""
#: www/index/1.php:18
-msgid "To get a password that will work I suggest the following example: "
+msgid "To get a password that will work, we suggest the following example"
msgstr ""
#: www/help/2.php:35
@@ -2625,7 +2695,7 @@ msgstr ""
msgid "Unable to continue as no valid commonNames or subjectAltNames were present on your certificate request."
msgstr ""
-#: includes/account.php:1997
+#: includes/account.php:2063
msgid "Unable to find a valid tverify request for this ID."
msgstr ""
@@ -2641,7 +2711,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:2075
+#: includes/account.php:2141
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 ""
@@ -2683,12 +2753,17 @@ msgstr ""
msgid "Upon receiving your documents you will be notified, and points will be added to your account."
msgstr ""
+#: www/stats.php:51
+msgid "Users with 1-49 Points"
+msgstr ""
+
#: www/stats.php:55
-msgid "Users with Points"
+msgid "Users with 50-99 Points"
msgstr ""
-#: www/account/12.php:53 www/account/18.php:50 www/account/18.php:61
-#: www/account/22.php:50 www/account/22.php:61 www/account/5.php:56
+#: www/account/12.php:53 www/account/18.php:53 www/account/18.php:64
+#: www/account/22.php:53 www/account/22.php:64 www/account/5.php:56
+#: www/gpg/2.php:42 www/gpg/2.php:49
msgid "Valid"
msgstr ""
@@ -2696,8 +2771,9 @@ msgstr ""
msgid "Valid Certificates"
msgstr ""
-#: www/index/0.php:55 www/index/0.php:65 www/index/0.php:75 www/index/0.php:85
-#: www/index/0.php:95 www/index/0.php:105 www/index/0.php:115
+#: www/index/19.php:27 www/index/19.php:37 www/index/19.php:47
+#: www/index/19.php:57 www/index/19.php:67 www/index/19.php:77
+#: www/index/19.php:87
msgid "Verification needed"
msgstr ""
@@ -2732,7 +2808,8 @@ msgstr ""
msgid "View Organisations"
msgstr ""
-#: www/account/12.php:18 www/account/5.php:18
+#: www/account/12.php:18 www/account/18.php:18 www/account/22.php:18
+#: www/account/5.php:18
msgid "View all certificates"
msgstr ""
@@ -2748,7 +2825,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:1707
+#: includes/account.php:1773
#, php-format
msgid "Wasn't able to match '%s' against any user in the system"
msgstr ""
@@ -2784,7 +2861,7 @@ msgstr ""
msgid "Welcome to your account section of the website. Below is a description of the different sections and what they're for."
msgstr ""
-#: www/index/0.php:46
+#: www/index/19.php:18
msgid "What can CAcert provide to you, to increase your privacy and security for free?"
msgstr ""
@@ -2895,7 +2972,7 @@ msgstr ""
msgid "You are receiving this email because you have been assured by %s %s (%s)."
msgstr ""
-#: includes/account.php:2081
+#: includes/account.php:2147
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 ""
@@ -2919,7 +2996,7 @@ msgstr ""
msgid "You can list your location by going to:"
msgstr ""
-#: www/index/0.php:53
+#: www/index/19.php:25
msgid "You can send digitally signed/encrypted emails; others can send encrypted emails to you."
msgstr ""
@@ -2931,8 +3008,8 @@ msgstr ""
msgid "You didn't list a valid sponsor for this action."
msgstr ""
-#: includes/account.php:1460 includes/account.php:1664
-#: includes/account.php:1784 includes/account.php:1984 www/account/51.php:15
+#: includes/account.php:1526 includes/account.php:1730
+#: includes/account.php:1850 includes/account.php:2050 www/account/51.php:15
#: www/account/52.php:15
msgid "You don't have access to this area."
msgstr ""
@@ -2945,7 +3022,7 @@ msgstr ""
msgid "You failed to check all boxes to validate your adherence to the rules and policies of CAcert"
msgstr ""
-#: includes/account.php:902
+#: includes/account.php:955
msgid "You failed to correctly enter your current Pass Phrase."
msgstr ""
@@ -2961,11 +3038,11 @@ msgstr ""
msgid "You failed to paste a valid GPG/PGP key."
msgstr ""
-#: www/index/0.php:113
+#: www/index/19.php:85
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:2010
+#: includes/account.php:2076
msgid "You have already voted on this request."
msgstr ""
@@ -3018,11 +3095,11 @@ msgstr ""
msgid "You may charge a fee for your expenses if the applicant has been advised of the amount prior to the meeting."
msgstr ""
-#: www/index/0.php:55
+#: www/index/19.php:27
msgid "You must confirm it is your email address by responding to a 'ping' email sent to it."
msgstr ""
-#: www/index/0.php:85
+#: www/index/19.php:57
msgid "You must confirm that you are the owner (or authorized administrator) of the domain by responding to a 'ping' email sent to either the email address listed in the whois record, or one of the RFC-mandatory addresses (hostmaster/postmaster/etc)."
msgstr ""
@@ -3055,7 +3132,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:191
+#: includes/account.php:199
msgid "You submitted invalid email addresses, or email address you no longer have control of. Can't continue with certificate request."
msgstr ""
@@ -3067,7 +3144,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:1774
+#: includes/account.php:1840
msgid "You tried to use an invalid language."
msgstr ""
@@ -3081,7 +3158,7 @@ msgstr ""
msgid "You were issued %s points however the system has rounded this down to %s and you now have %s points in total."
msgstr ""
-#: www/index/0.php:105
+#: www/index/19.php:77
msgid "You will need to be issued 100 points by meeting with existing assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents; OR if it is too difficult to meet up with existing assurers in your area, meet with two Trusted Third Party assurers (notary public, justice of the peace, lawyer, bank manager, accountant) to do the verifying."
msgstr ""
@@ -3131,7 +3208,7 @@ msgstr ""
msgid "Your Name"
msgstr ""
-#: includes/account.php:906 www/index.php:118
+#: includes/account.php:959 www/index.php:118
msgid "Your Pass Phrase has been updated and your primary email account has been notified of the change."
msgstr ""
@@ -3163,10 +3240,10 @@ 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 ""
-#: includes/account.php:295 includes/account.php:528 includes/account.php:540
-#: includes/account.php:613 includes/account.php:727 includes/account.php:1077
-#: includes/account.php:1125 includes/account.php:1324
-#: includes/account.php:1377 includes/account.php:1912 www/gpg.php:159
+#: includes/account.php:305 includes/account.php:564 includes/account.php:576
+#: includes/account.php:665 includes/account.php:780 includes/account.php:1136
+#: includes/account.php:1185 includes/account.php:1390
+#: includes/account.php:1443 includes/account.php:1978 www/gpg.php:159
msgid "Your certificate request has failed to be processed correctly, please try submitting it again."
msgstr ""
@@ -3179,7 +3256,7 @@ msgstr ""
msgid "Your default email address has been updated to '%s'."
msgstr ""
-#: includes/account.php:874
+#: includes/account.php:927
msgid "Your details have been updated with the database."
msgstr ""
@@ -3199,7 +3276,7 @@ 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:1767
+#: includes/account.php:1833
msgid "Your language setting has been updated."
msgstr ""
@@ -3211,7 +3288,7 @@ msgstr ""
msgid "Your message has been sent."
msgstr ""
-#: includes/account.php:2089
+#: includes/account.php:2155
msgid "Your vote has been accepted."
msgstr ""
@@ -3241,12 +3318,12 @@ msgstr ""
msgid "subjectAltName"
msgstr ""
-#: includes/account.php:1543 includes/account.php:1590
-#: includes/account.php:1602
+#: includes/account.php:1609 includes/account.php:1656
+#: includes/account.php:1668
msgid "to continue."
msgstr ""
-#: includes/account.php:731 includes/account.php:1129 www/account/19.php:45
+#: includes/account.php:784 includes/account.php:1189 www/account/19.php:45
#: www/account/6.php:43
msgid "to install your certificate."
msgstr ""
diff --git a/pages/help/0.php b/pages/help/0.php
index 4bb3cfd..4ceca46 100644
--- a/pages/help/0.php
+++ b/pages/help/0.php
@@ -16,13 +16,13 @@
=_("Following are several tips you may find useful.")?>
diff --git a/pages/index/1.php b/pages/index/1.php
index 9826304..7bbd3a0 100644
--- a/pages/index/1.php
+++ b/pages/index/1.php
@@ -15,7 +15,7 @@
=_("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.")?>
=_("In light of the number of people having issues with making up a password we have the following suggestions:")?>
-=_("To get a password that will work I suggest the following example: ")?>Fr3d Sm|7h
+=_("To get a password that will work, we suggest the following example")?>: Fr3d Sm|7h
=_("This wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional points for being over 15 characters and a second additional point for having it over 30. The system starts reducing points if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?>
diff --git a/pages/index/7.php b/pages/index/7.php
index c60ead6..1fb39c2 100644
--- a/pages/index/7.php
+++ b/pages/index/7.php
@@ -17,10 +17,11 @@
=_("Many people to thank, if you've had a large input with the CAcert project with code, documentation, translations, or assurances and would like recognition let me know.")?>
=_("The list of names are in no sense of order")?>
-- * Christian Barmala - =_("Put a lot of effort convincing people in Germany to signup and be assured, he started work on a new RFC complient CPS, spent countless hours helping with tech support, and so much more")?>
+- * Christian Barmala - =_("Put a lot of effort convincing people in Germany to signup and be assured, he started work on a new RFC compliant CPS, spent countless hours helping with tech support, and so much more")?>
- * Guillaume Romagny - =_("He's constantly helping out on the support list, building up documentation and all round nice guy, he was even offered a free book and turned down the offer until there is a book on CAcert available!")?>
- * Adam Butler - =_("For much of the art work that exists on the website, t-shirt designs, much of the organisational work for Usenix '04, as well as a few published articles and written documents.")?>
-- * Philipp Gühring - =_("Has put so much effort into CAcert I don't know where to begin, he managed to bring the CPS Chrisitian had started up to draft status, he has given countless hours to assuring people and attending conferences to help spread the word")?>
-- * Evaldo Gardenali - =_("Has put a lot of time and effort into promoting and assuring people in Brazil and South America, and for doing most of the Portuguese translations")?>
+- * Philipp Gühring - =_("Has put so much effort into CAcert I don't know where to begin, he managed to get the CPS Christian had started up to draft status, he has given countless hours to assuring people and attending conferences to help spread the word")?>
+- * Evaldo Gardenali - =_("Has put a lot of time and effort into promoting and assuring people in Brazil and South America, and for helping to translate this site into Portuguese")?>
- * Ben Pollinger - =_("Did a substantial amount of work on the previous website design, and has been floating about on the mailing lists often giving invaluble insight into what we should be doing better.")?>
+- * William Amaral - =_("Has been involved in translating this website into Portuguese")?>
diff --git a/pages/wot/1.php b/pages/wot/1.php
index 24a54e1..9586b18 100644
--- a/pages/wot/1.php
+++ b/pages/wot/1.php
@@ -130,7 +130,7 @@
=$row['fname']?> |
=maxpoints($row['id'])?> |
=$row['contactinfo']?> |
- Email Me |
+ =_("Email Me")?> |
} ?>
diff --git a/pages/wot/9.php b/pages/wot/9.php
index 05c236f..81b365b 100644
--- a/pages/wot/9.php
+++ b/pages/wot/9.php
@@ -45,7 +45,7 @@
if($userlang != "") { ?>
=_("Language")?>: |
- printf("%s prefers to be contacted in %s", $user['fname'], $_SESSION['_config']['translations'][$userlang]) ?> |
+ printf(_("%s prefers to be contacted in %s"), $user['fname'], $_SESSION['_config']['translations'][$userlang]) ?> |
} ?>
diff --git a/www/disputes.php b/www/disputes.php
index 1dc8d91..1d50b02 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -244,7 +244,7 @@
if(mysql_num_rows($res) <= 0)
{
showheader(_("Email Dispute"));
- printf(_("The email address '%s' doesn't already in the system. Can't continue."), $email);
+ printf(_("The email address '%s' doesn't exist in the system. Can't continue."), $email);
showfooter();
exit;
}
@@ -317,7 +317,7 @@
if(mysql_num_rows($res) <= 0)
{
showheader(_("Domain Dispute"));
- printf(_("The domain '%s' doesn't already in the system. Can't continue."), $email);
+ printf(_("The domain '%s' doesn't exist in the system. Can't continue."), $email);
showfooter();
exit;
}