From 7f48f7587447731988ebf8c1403a7d988e5953fa Mon Sep 17 00:00:00 2001 From: root Date: Thu, 3 Aug 2006 13:20:55 +0000 Subject: [PATCH] bug fixes --- includes/general.php | 9 +- includes/general_stuff.php | 2 +- includes/loggedin.php | 31 ++- includes/mysql.php.sample | 5 + locale/bg.po | 2 +- locale/da.po | 10 +- locale/es.po | 23 +- locale/he.po | 418 +++++++++++++++++++++++++++++-------- locale/is.po | 50 ++--- locale/make.php.dist | 29 +++ locale/pl.po | 42 ++-- locale/pt_BR.po | 49 +++-- locale/sv.po | 6 +- locale/zh.po | 135 +++++++----- scripts/clientcerts.php | 19 +- scripts/servercerts.php | 13 +- www/ac.php | 3 +- www/gpg.php | 27 ++- www/index.php | 2 + www/logos.php | 21 +- www/src-lic.php | 2 +- 21 files changed, 610 insertions(+), 288 deletions(-) create mode 100644 locale/make.php.dist diff --git a/includes/general.php b/includes/general.php index f8b1662..6353c80 100644 --- a/includes/general.php +++ b/includes/general.php @@ -19,7 +19,6 @@ session_register("profile"); session_register("signup"); session_register("lostpw"); - if($_SESSION['profile']['id'] > 0) session_regenerate_id(); @@ -153,11 +152,11 @@ putenv("LANG=".$_SESSION['_config']['language']); setlocale(LC_ALL, $_SESSION['_config']['language']); $domain = 'messages'; - bindtextdomain("$domain", $_SESSION['_config']['filepath']."/locale"); - textdomain("$domain"); + bindtextdomain($domain, $_SESSION['_config']['filepath']."/locale"); + textdomain($domain); - if($_SESSION['profile']['id'] == 1 && 1 == 2) - echo $_SESSION['_config']['language']; + if($_SESSION['profile']['id'] == -1) + echo $_SESSION['_config']['language']." - ".$_SESSION['_config']['filepath']."/locale"; if($_SESSION['profile']['id'] > 0) { diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 523da59..0142b7b 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -85,7 +85,7 @@ google_color_border = "FFFFFF";

- +
diff --git a/includes/loggedin.php b/includes/loggedin.php index d3e2a32..0c36963 100644 --- a/includes/loggedin.php +++ b/includes/loggedin.php @@ -15,7 +15,18 @@ if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && $_SESSION['profile']['id'] > 0 && $_SESSION['profile']['loggedin'] != 0) { - $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'")); + $uid = $_SESSION['profile']['id']; + $_SESSION['profile']['loggedin'] = 0; + $_SESSION['profile'] = ""; + foreach($_SESSION as $key) + { + unset($_SESSION[$key]); + unset($$key); + session_unregister($key); + } + unset($_SESSION); + + $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$uid'")); $_SESSION['profile']['loggedin'] = 1; } @@ -28,10 +39,28 @@ { $row = mysql_fetch_assoc($res); + $_SESSION['profile']['loggedin'] = 0; + $_SESSION['profile'] = ""; + foreach($_SESSION as $key) + { + unset($_SESSION[$key]); + unset($$key); + session_unregister($key); + } + unset($_SESSION); + $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$row['memid']."'")); $_SESSION['profile']['loggedin'] = 1; } else { $_SESSION['profile']['loggedin'] = 0; + $_SESSION['profile'] = ""; + foreach($_SESSION as $key) + { + unset($_SESSION[$key]); + unset($$key); + session_unregister($key); + } + unset($_SESSION); unset($_SESSION['_config']['oldlocation']); diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index 4fcb857..81c83c2 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -78,4 +78,9 @@ fclose($rnd); } } + + function clean_csr($CSR) + { + return(preg_replace("/[^A-Za-z0-9\n\r\- ]/","",$CSR)); + } ?> diff --git a/locale/bg.po b/locale/bg.po index cecbdc7..d89ebe3 100644 --- a/locale/bg.po +++ b/locale/bg.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2006-05-27 00:51:34+0000\n" +"PO-Revision-Date: 2006-07-13 17:08:42+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/locale/da.po b/locale/da.po index e2bbffe..4377c37 100644 --- a/locale/da.po +++ b/locale/da.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2006-02-23 11:13:11+0000\n" +"PO-Revision-Date: 2006-07-13 17:09:07+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1545,6 +1545,8 @@ msgstr "Når du har indsendt det, vil systemet behandle din forespør #: www/help/2.php:45 msgid "One assumes that if a site has an SSL certificate (that's what enables secure communication, for exchanging personal details, credit card numbers, etc. and gives the 'lock' icon in the browser) that they have obtained that certificate from a reliable source (a Certificate Authority), which has the appropriate stringent credentials for issuing something so vital to the security of the Internet, and the security of your communications. You have probably never even asked yourself the question of who decided to trust these Certificate Authorities, because your browser comes with their (root) certificates pre-installed, so any web site that you come across that has an SSL certificate signed by one of them, is automatically accepted (by your browser) as trustworthy." msgstr "" +"Man antager normalt at hvis et website har et SSL certifikat (det er det som muliggør sikker kommunikation til udveksling af personlige data og kreditkort informationer mv. og vises som et "hængelås" symbol i browseren), at sitet har fået certifikatet fra en pålidelig kilde (en certifikat myndighed), som har en passende stringent legitimering så de kan udstede noget så vigtigt for sikkerheden på Internettet og din kommunikation. Du har måske aldrig spurgt dig selv, hvem der har besluttet at stole på disse certifikats myndigheder, fordi din browser allerede har deres rod-nøgler installeret. De sikrede websider du hidtil har besøgt har bliver automatisk accepteret af din browser fordi der allerede ved installationen af denne blev medleveret en række rod-nøgler fra en lang række certifikats myndigheder. " +"" #: www/wot/6.php:74 msgid "Only fill this in if you assured the person on a different day" @@ -1622,7 +1624,7 @@ msgstr "Underskrevet af et klasse 1 rod-certifikat" #: www/account/40.php:18 www/index/11.php:18 msgid "PLEASE NOTE: Due to the large amounts of support questions, incorrectly directed emails may be ignored, this is a volunteer effort and directing general questions to the right place will help everyone, including yourself as you will get a speedier reply." -msgstr "" +msgstr "Bemærk venligst: Grundet en stor mængde support spørgsmål, kan mails der sendes som CC: til listerne kan blive ignoreret. Supporten er en frivillig indsats for en større gruppe personer. Det er en god ide at bruge lidt tid på at skrive spørgsmål kort og præcist, og at sende spørgsmål til den rigtige liste første gang. Dette vil hjælpe til med at få et hurtigere svar." #: www/wot/6.php:28 msgid "PLEASE NOTE: You have already assured this person before! If this is unintentional please DO NOT CONTINUE with this assurance." @@ -1664,7 +1666,7 @@ msgstr "Personlig information" #: www/account/10.php:24 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 "" +msgstr "Bemærk: Alle informationer i dit certifikat vil blive fjernet, bortset fra CommonName feltet. Dette er fordi dette er en automatisk service som ikke automatisk kan verificere om andre detaljer i dit certifikat er korrekte eller ej. Hvis du er en valid eksisterende organisation og ønsker flere detaljer skal med i certifikater, skal du mindst have 50 forsikringspoints samt indsende en kopi af stiftelsesdokumenterne (evt. moms registreringen eller andre offentlige papirer med organisationens navn fra en offentlyg myndighed). Så kan vi tilføje disse detaljer til dine (organisationens) certifikater. Kontakt os for yderligere informationer om dette. (eller kik evt. på wiki.cacert.org)" #: www/account/3.php:65 msgid "Please Note: By ticking this box you will automatically have your name included in any certificates." @@ -1677,6 +1679,8 @@ msgstr "Bemærk venligst: Du kan ikke sætte en ubekræftet konto #: www/account/7.php:32 msgid "Please Note: You only need to enter the main part of your domain, eg. mydomain.com rather then www.mydomain.com. Once you have verified your domain you are able to enter any sub-domain, such as www.mydomain.com or www.this.is.mydomain.com as the system checks from right to left, rather then specific hostnames when you upload a CSR to the system." msgstr "" +"Bemærk: Du skal kun indtaste hoveddelen af dit domaine f.eks. example.com istedet for www.example.com. Når du har bekræftiget domænet er det muligt at ethvert underdomæne f.eks. www.example.com eller www.this.is.example.com da systemet verificerer fra venstre til højre i domænenavnet, istedet for at hele det konkrete hostnavn, når du uploader en CSR (Certifikat Signing Request = Certifikats Underskrivelses forespørgsel) til systemet. " +"" #: www/wot.php:233 #, php-format diff --git a/locale/es.po b/locale/es.po index f51fbc6..dea983f 100644 --- a/locale/es.po +++ b/locale/es.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2005-11-15 07:20:40+0000\n" +"PO-Revision-Date: 2006-08-03 12:37:38+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #: www/account/43.php:43 www/account/49.php:43 #, php-format msgid "%s rows displayed." -msgstr "%s reglones mostrados" +msgstr "%s renglones mostrados" #: www/account/43.php:71 #, php-format @@ -61,7 +61,10 @@ msgstr "...y presione 'Next/Próximo'." #: www/wot/3.php:42 msgid "A CAcert Assurer who knowingly, or reasonably ought to have known, assures an applicant contrary to this policy may be held liable." -msgstr "Un Notario CAcert que autorize a una persona sin seguir estas líneas de conducta, a sabiendas, o que, razonablemente, debiera conocer, podrá ser considerado responsable." +msgstr "" +"Un Notario CAcert que a sabiendas de o pudiendo saberlo, certifica a un solicitante que va en desacuerdo con esta política, podría ser encontrado legalmente responsable. " +" " +"" #: www/wot/4.php:17 msgid "A trusted 3rd party is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on. Other people are allowed to be authoritative in this area as well, such as bank managers, accountants and lawyers." @@ -118,7 +121,7 @@ msgstr "Después del encuentro, entre a la página Asegurar del siti #: www/help/3.php:44 msgid "After your certificate has been emailed to you, follow this process to install the certificate." -msgstr "Despues de recibir su certificado por correo, siga el siguiente procedimiento para instalar el certificado" +msgstr "Despues de recibir su certificado por correo, siga el siguiente procedimiento para instalar el certificado." #: www/account/39.php:32 www/index/10.php:32 msgid "Aggregated tracking information" @@ -130,7 +133,7 @@ msgstr "Avisarme si" #: www/index.php:332 msgid "All fields are mandatory." -msgstr "Todos los campos son obligatorios" +msgstr "Todos los campos son obligatorios." #: www/account/43.php:157 msgid "Alternate Verified Email Addresses" @@ -138,7 +141,7 @@ msgstr "Dirección de correo alternativa verificada" #: www/help/7.php:9 msgid "Alternatively as things progress we can add more layers of security with say 4 webservers talking to 2 intermediate servers, talking to the root store, and acting in a token ring fashion, anything happening out of sequence, and the server directly upstream shuts itself down, which if that were in place and there were multiple paths, any down time in this fashion would fall over to the servers not compromised, anyways just some food for thought." -msgstr "Alternativamente, a medida del progreso, podríamos agregar mas niveles de seguridad, por ejemplo, 4 servidores web comunicandose con 2 servidores intermedios, y hablando con la raíz, a la manera de anillo. Todo esto ocurriría asincrónicamente" +msgstr "Alternativamente, mientras las cosas van progresando, podríamos agregar mas niveles de seguridad, por ejemplo, 4 servidores web comunicandose con 2 servidores intermedios, y comunicándose con el almacen raíz, actuando en estilo "token-ring", cualquier cosa que suceda fuera de secuencia producirá que el servidor "upstream" ejecute un shutdown, eso si es que ocurriese y hubiese multiple caminos. Cualquier "down time" de este tipo recaería sobre los servidores no comprometidos, de todas maneras esto solamente es algo para tener en cuenta." #: www/account/40.php:52 www/index/11.php:52 msgid "Alternatively you can get in contact with us via the following methods:" @@ -328,7 +331,7 @@ msgstr "CAcert.org" #: www/index/51.php:15 msgid "CAcert.org Mission Statement" -msgstr "CAcert.org Razón de Ser" +msgstr "CAcert.org Enunciado de la Misión" #: includes/account.php:49 includes/account.php:389 www/index.php:316 msgid "CAcert.org Support!" @@ -616,7 +619,7 @@ msgstr "Departamento" #: www/help/2.php:17 msgid "Digital signing thus provides security on the Internet." -msgstr "Por lo tanto, la firma digital provee de seguridad en la internet" +msgstr "Por lo tanto, la firma digital provee de seguridad en la Internet" #: www/index/0.php:73 msgid "Digitally sign code, web applets, installers, etc. including your name and location in the certificates." @@ -877,11 +880,11 @@ msgstr "Usuarios con 1-49 puntos" #: www/help/4.php:4 msgid "Generating a 1024 bit RSA private key" -msgstr "Generar una clave privada RSA de 1024 bits" +msgstr "Generando una clave privada RSA de 1024 bits" #: www/help/3.php:1 msgid "Generating a Key Pair and Certificate Signing Request (CSR) for a Microsoft Internet Information Server (IIS) 5.0." -msgstr "Generar el Par de Claves (Key Pair) y la Solicitud de Firma de Certificado (CSR) para el Microsoft Internet Information Server (IIS) 5.0." +msgstr "Generando el Par de Claves (Key Pair) y la Solicitud de Firma de Certificado (CSR) para el Microsoft Internet Information Server (IIS) 5.0." #: includes/account_stuff.php:142 msgid "Go Home" diff --git a/locale/he.po b/locale/he.po index 31cadd6..73debe6 100644 --- a/locale/he.po +++ b/locale/he.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2005-05-27 01:17:51+0000\n" +"PO-Revision-Date: 2006-07-13 17:09:12+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,12 +18,12 @@ msgstr "" #: www/account/43.php:43 www/account/49.php:43 #, php-format msgid "%s rows displayed." -msgstr "" +msgstr "%s שורות מוצגים" #: www/account/43.php:71 #, php-format msgid "%s's Account Details" -msgstr "" +msgstr "%s פרטי החשבון של" #: www/account/32.php:21 #, php-format @@ -116,7 +116,7 @@ msgstr "" msgid "After the meeting, visit the CAcert Web site's make an Assurance page and:" msgstr "" -#: www/help/3.php:44 +#: www/help/3.php:44 msgid "After your certificate has been emailed to you, follow this process to install the certificate." msgstr "" @@ -148,7 +148,7 @@ msgstr "" msgid "And they are making mistakes" msgstr "והם עושים טעויות" -#: www/help/3.php:70 +#: www/help/3.php:70 msgid "And you're done!" msgstr "והינך סיימת!" @@ -164,7 +164,7 @@ msgstr "" msgid "Apart from the boot stuff, all data resides on an encrypted partition on the root store server and only manual intervention in the boot up process by entering the password will start it again." msgstr "" -#: www/index/17.php:61 +#: www/index/17.php:61 msgid "Can't start the CEnroll control:" msgstr "" @@ -265,7 +265,7 @@ msgstr "כל טוב" msgid "Board Member" msgstr "חבר ועד" -#: www/help/3.php:60 +#: www/help/3.php:60 msgid "Browse to the location you saved the .cer file to in step 1" msgstr "" @@ -363,7 +363,7 @@ msgstr "" msgid "Certificate Installation Error" msgstr "" -#: www/help/3.php:43 +#: www/help/3.php:43 msgid "Certificate Installation process for IIS 5.0" msgstr "" @@ -415,7 +415,7 @@ msgstr "" msgid "Change Password" msgstr "שנה סיסמא" -#: www/help/3.php:36 +#: www/help/3.php:36 msgid "Choose a filename to save the request to" msgstr "בחר שם קובץ לשמור את הבקשה ל" @@ -487,7 +487,7 @@ msgstr "" msgid "Complete the assurance form if the applicant has not already done so. Ensure that all information matches." msgstr "" -#: www/help/3.php:39 +#: www/help/3.php:39 msgid "Confirm your request details" msgstr "אשר את פרטי בקשתך" @@ -524,7 +524,7 @@ msgstr "עוגיות" msgid "Cool man! How do I create my own digital signature?!" msgstr "מגניב בן אדם! כיצד אני יכול ליצור את החתימה הדיגטלית לעצמי?" -#: www/help/3.php:47 +#: www/help/3.php:47 msgid "Copy the contents of the email including the" msgstr "" @@ -563,13 +563,15 @@ msgstr "קרדיט" msgid "Currently there is 2 main servers, one for webserver, one for root store, with the root store only connected to the webserver via serial cable, with a daemon running as non-root processes on each end of the serial listening/sending requests/info." msgstr "" -#: www/stats.php:69 www/stats.php:105 www/account/43.php:193 -#: www/account/43.php:228 www/wot/10.php:22 www/wot/10.php:55 www/wot/6.php:73 +#: www/stats.php:73 www/stats.php:109 www/ttp.php:95 www/ttp.php:142 +#: www/account/43.php:200 www/account/43.php:235 www/wot/10.php:43 +#: www/wot/10.php:76 www/wot/6.php:91 msgid "Date" msgstr "תאריך" -#: www/account/13.php:46 www/account/13.php:94 www/account/43.php:94 -#: www/index/1.php:41 www/index/5.php:25 www/wot/6.php:47 +#: www/cap.php:62 www/ttp.php:126 www/account/13.php:46 www/account/13.php:94 +#: www/account/43.php:93 www/account/52.php:44 www/index/1.php:47 +#: www/index/5.php:25 www/wot/6.php:65 msgid "Date of Birth" msgstr "תאריך לידה" @@ -683,8 +685,10 @@ msgstr "חשבונות דוא& msgid "Email Accounts and Client Certificates" msgstr "" -#: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23 -#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15 +#: www/cap.php:72 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/gpg/2.php:21 www/disputes/1.php:23 www/help/4.php:29 + msgid "Email Address" msgstr "כתובת דואר אלקטרוני" @@ -708,19 +712,19 @@ msgstr "" msgid "Enable encrypted data transfer for users accessing your web, email, or other SSL enabled service on your server; wildcard certificates are allowed." msgstr "" -#: www/help/3.php:58 +#: www/help/3.php:58 msgid "Ensure 'Process the pending request and install the certificate' is selected and click on 'Next'." msgstr "" -#: www/help/3.php:63 +#: www/help/3.php:63 msgid "Ensure that you are processing the correct certificate" msgstr "" -#: www/help/3.php:17 +#: www/help/3.php:17 msgid "Enter a certificate name and select Certificate strength" msgstr "" -#: www/help/3.php:26 +#: www/help/3.php:26 msgid "Enter the Organisation name: this must be the full legal name of the Organisation that is applying for the certificate." msgstr "" @@ -728,15 +732,15 @@ msgstr "" msgid "Enter the applicant's email address;" msgstr "" -#: www/help/3.php:33 +#: www/help/3.php:33 msgid "Enter the geographical details" msgstr "" -#: www/help/3.php:30 +#: www/help/3.php:30 msgid "Enter your Common Name" msgstr "" -#: www/help/3.php:25 +#: www/help/3.php:25 msgid "Enter your Organisation Information" msgstr "הזן את נתוני אירגונך" @@ -791,7 +795,7 @@ msgstr "מצא משתמש על msgid "Find an Assurer" msgstr "" -#: www/help/3.php:41 +#: www/help/3.php:41 msgid "Finish up and exit IIS Certificate Wizard" msgstr "" @@ -824,7 +828,7 @@ 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 "" -#: www/help/3.php:71 +#: www/help/3.php:71 msgid "For more information, refer to your server documentation or visit" msgstr "" @@ -875,7 +879,7 @@ msgstr "" msgid "Generating a 1024 bit RSA private key" msgstr "" -#: www/help/3.php:1 +#: www/help/3.php:1 msgid "Generating a Key Pair and Certificate Signing Request (CSR) for a Microsoft Internet Information Server (IIS) 5.0." msgstr "" @@ -1061,11 +1065,11 @@ msgstr "" msgid "In light of a request on the bugzilla list for more information about how our root certificate is protected I've decided to do a write up here and see if there is anything more people suggest could be done, or a better way of handling things altogether." msgstr "" -#: www/help/3.php:9 +#: www/help/3.php:9 msgid "In the 'Directory Security' folder click on the 'Server Certificate' button in the 'Secure communications' section. If you have not used this option before the 'Edit' button will not be active." msgstr "" -#: www/help/3.php:57 +#: www/help/3.php:57 msgid "In the 'IIS Certificate Wizard' you should find a 'Pending Certificate Request'." msgstr "" @@ -1090,7 +1094,7 @@ msgstr "" msgid "Install Your Certificate" msgstr "" -#: www/help/3.php:51 +#: www/help/3.php:51 msgid "Installation steps" msgstr "" @@ -1155,7 +1159,7 @@ msgstr "" msgid "Key Strength:" msgstr "" -#: www/help/3.php:4 +#: www/help/3.php:4 msgid "Key generation process" msgstr "" @@ -1280,7 +1284,7 @@ msgstr "" msgid "Microsoft Root Certificate Program" msgstr "" -#: www/help/3.php:71 +#: www/help/3.php:71 msgid "Microsoft Support Online" msgstr "" @@ -1489,7 +1493,7 @@ msgstr "" msgid "Notification of changes" msgstr "" -#: www/help/3.php:12 +#: www/help/3.php:12 msgid "Now 'Create a new certificate'." msgstr "" @@ -1552,7 +1556,7 @@ msgstr "" msgid "Only tick the next box if the Assurance was face to face." msgstr "" -#: www/help/3.php:8 +#: www/help/3.php:8 msgid "Open Directory Security folder" msgstr "" @@ -1715,7 +1719,7 @@ msgstr "" msgid "Postal Address:" msgstr "" -#: www/help/3.php:14 +#: www/help/3.php:14 msgid "Prepare the request" msgstr "" @@ -1776,7 +1780,7 @@ msgstr "" msgid "Repeat" msgstr "" -#: www/help/3.php:52 +#: www/help/3.php:52 msgid "Return to the 'Internet Information Services' screen in 'Administrative Tools' under 'Control Panel'. Right click on 'Default Web Site' and select 'Properties'." msgstr "" @@ -1835,15 +1839,15 @@ msgstr "" msgid "Same as above." msgstr "" -#: www/help/3.php:46 +#: www/help/3.php:46 msgid "Saving the certificate" msgstr "" -#: www/help/3.php:6 www/help/3.php:7 www/help/3.php:10 www/help/3.php:13 -#: www/help/3.php:16 www/help/3.php:19 www/help/3.php:29 www/help/3.php:32 -#: www/help/3.php:35 www/help/3.php:38 www/help/3.php:50 www/help/3.php:53 -#: www/help/3.php:56 www/help/3.php:59 www/help/3.php:62 www/help/3.php:65 -#: www/help/3.php:68 +#: www/help/3.php:6 www/help/3.php:7 www/help/3.php:10 www/help/3.php:13 +#: www/help/3.php:16 www/help/3.php:19 www/help/3.php:29 www/help/3.php:32 +#: www/help/3.php:35 www/help/3.php:38 www/help/3.php:50 www/help/3.php:53 +#: www/help/3.php:56 www/help/3.php:59 www/help/3.php:62 www/help/3.php:65 +#: www/help/3.php:68 msgid "Screenshot of IIS 5.0" msgstr "" @@ -1867,15 +1871,15 @@ msgstr "" msgid "Security is a serious matter. For a digital certificate with full rights to be issued to an individual by a Certificate Authority, stringent tests must be conducted, including meeting the physical person to verify their identity. At the current moment in time, my physical identity has not been verified by CAcert.org, but they have verified my email address. Installing their root certificate (see above) will thus automatically allow you to validate my digital signature. You can then be confident of the authenticity of my email address - only I have the ability to digitally sign my emails using my CAcert.org certificate, so if you get an email that I digitally signed and which is validated by your email software using the cacert.org root certificate that you installed, you know it's from me. (Visually you get a simple indication that my email is signed and trusted). Technically, they haven't verified that I really am me! But you have the guarantee that emails from my address are sent by the person who physically administers that address, i.e. me! The only way that someone could forge my digital signature would be if they logged on to my home computer (using the password) and ran my email software (using the password) to send you a digitally signed email from my address. Although I have noticed the cats watching me logon..." msgstr "" -#: www/help/3.php:18 +#: www/help/3.php:18 msgid "Select 'Bit length'. We advise a key length of 1024 bits." msgstr "" -#: www/help/3.php:11 +#: www/help/3.php:11 msgid "Select 'Create a new certificate'" msgstr "" -#: www/help/3.php:55 +#: www/help/3.php:55 msgid "Select 'Server Certificate' at the bottom of the tab in the 'Secure communications' section." msgstr "" @@ -1883,15 +1887,15 @@ msgstr "" msgid "Select Specific Account Details" msgstr "" -#: www/help/3.php:37 +#: www/help/3.php:37 msgid "Select an easy to locate folder. You'll have to open this file up with Notepad. The CSR must be copied and pasted into our online form. Once the CSR has been submitted, you won't need this CSR any more as IIS won't reuse old CSR to generate new certificates." msgstr "" -#: www/help/3.php:61 +#: www/help/3.php:61 msgid "Select the .cer file and click 'Next'." msgstr "" -#: www/help/3.php:54 +#: www/help/3.php:54 msgid "Select the Directory Security tab" msgstr "" @@ -1989,7 +1993,7 @@ msgstr "" msgid "TTP Form" msgstr "" -#: www/wot/6.php:81 +#: includes/general.php:24 www/wot/6.php:99 msgid "Temporary Increase" msgstr "" @@ -2017,8 +2021,8 @@ msgstr "" msgid "The 1024-bit key generation failed. Would you like to try 512 instead?" msgstr "" -#: www/help/3.php:31 -msgid "The Common Name is the fully qualified host and Domain Name or website address that you will be securing. Both 'www.cacert.org' and 'secure.cacert.com' are valid Common Names. IP addresses are usually not used." +#: www/help/3.php:31 +msgid "The Common Name is the fully qualified host and Domain Name or website address that you will be securing. Both 'www.CAcert.org' and 'secure.CAcert.com' are valid Common Names. IP addresses are usually not used." msgstr "" #: www/verify.php:46 @@ -2029,7 +2033,7 @@ msgstr "" msgid "The ID or Hash has already been verified, the domain no longer exists in the system, or something weird happened." msgstr "" -#: www/help/3.php:28 +#: www/help/3.php:28 msgid "The Organisational Unit field is the 'free' field. It is often the department or Server name for reference." msgstr "" @@ -2163,7 +2167,7 @@ msgstr "" #: www/index/19.php:15 msgid "Information" -msgstr "" +msgstr "מידע" #: www/help/2.php:42 msgid "There's nothing to it. I mean literally, you can already start sending your emails encrypted. Assuming of course you have your own digital signature certificate (e.g. as per above), and the person you want to send an encrypted email to also has a digital signature certificate, and has recently sent you a digitally signed email with it. If all these conditions hold, you just have to change the settings in your email software to send the email encrypted and hey presto! Your email software (probably Outlook I guess) should suss out the rest." @@ -2211,7 +2215,7 @@ msgstr "" msgid "To fully understand, read the section directly above. I am using a free Certificate Authority to provide me with the ability to digitally sign my emails. As a result, this Certificate Authority is not (yet) recognised by your email software as it is a new organisation that is not yet fully established, although it is probably being included in the Mozilla browser. If you choose to, you can go the their site at CAcert.org to install the root certificate. You may be told that the certificate is untrusted - that is normal and I suggest that you continue installation regardless. Be aware that this implies your acceptance that you trust their secure distribution and storing of digital signatures, such as mine. (You already do this all the time). The CAcert.org root certificate will then automatically provide the safe validation of my digital signature, which I have entrusted to them. Or you can simply decide that you've wasted your time reading this and do nothing (humbug!). Shame on you! :-)" msgstr "" -#: www/help/3.php:2 +#: www/help/3.php:2 msgid "To generate a public and private key pair and CSR for a Microsoft IIS 5 Server:" msgstr "" @@ -2243,7 +2247,7 @@ msgstr "" msgid "Treasurer" msgstr "" -#: includes/account_stuff.php:182 www/wot/4.php:15 +#: includes/account_stuff.php:205 includes/general.php:23 www/wot/4.php:15 msgid "Trusted Third Parties" msgstr "" @@ -2259,7 +2263,7 @@ msgstr "" msgid "Unable to match your details with any user accounts on file" msgstr "" -#: www/help/3.php:5 +#: www/help/3.php:5 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 "" @@ -2398,7 +2402,7 @@ msgstr "" msgid "When and Where?" msgstr "" -#: www/help/3.php:67 +#: www/help/3.php:67 msgid "When you have read this information, click 'Finish'." msgstr "" @@ -2447,7 +2451,7 @@ msgstr "" msgid "WoT Form" msgstr "" -#: www/wot/6.php:48 +#: www/cap.php:64 www/ttp.php:128 www/wot/6.php:66 msgid "YYYY-MM-DD" msgstr "" @@ -2491,7 +2495,7 @@ msgstr "" #: includes/general_stuff.php:112 includes/tverify_stuff.php:78 msgid "Further Information" -msgstr "" +msgstr "מידע נוסף" #: www/index/7.php:26 msgid "Has been involved in translating this website into Portuguese" @@ -2501,6 +2505,11 @@ msgstr "" 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/wot/6.php:44 +#, php-format +msgid "Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. Gross negligence may cause you to be liable." +msgstr "" + #: includes/general_stuff.php:74 msgid "CAcert Board" msgstr "" @@ -2546,8 +2555,8 @@ msgstr "" msgid "You failed to enter a location of your meeting." msgstr "" -#: www/index.php:90 -msgid "You failed to get all answers correct, system admins have been notified." +#: www/index.php:97 +msgid "You failed to get all answers correct or you didn't configure enough lost password questions for your account. System admins have been notified." msgstr "" #: www/gpg.php:24 @@ -2558,7 +2567,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 "" -#: www/help/3.php:21 +#: www/help/3.php:21 msgid "You have now created a public/private key pair. The private key is stored locally on your machine. The public portion is sent to CAcert in the form of a CSR." msgstr "" @@ -2628,11 +2637,11 @@ msgstr "" 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 "" -#: www/help/3.php:23 +#: www/help/3.php:23 msgid "You will now create a CSR. This information will be displayed on your certificate, and identifies the owner of the key to users. The CSR is only used to request the certificate. The following characters must be excluded from your CSR fields, or your certificate may not work:" msgstr "" -#: www/help/3.php:66 +#: www/help/3.php:66 msgid "You will see a confirmation screen." msgstr "" @@ -2640,7 +2649,7 @@ msgstr "" msgid "You will then be asked to enter information about your company into the certificate. Below is a valid example:" msgstr "" -#: www/help/3.php:15 +#: www/help/3.php:15 msgid "You'll prepare the request now, but you can only submit the request via the online request forms. We do not accept CSRs via email." msgstr "" @@ -2693,7 +2702,7 @@ msgstr "" msgid "Your certificate request has failed to be processed correctly, please try submitting it again." msgstr "" -#: www/help/3.php:34 +#: www/help/3.php:34 msgid "Your country, state and city." msgstr "" @@ -2734,7 +2743,7 @@ msgstr "" msgid "Your message has been sent." msgstr "" -#: www/help/3.php:48 +#: www/help/3.php:48 msgid "and" msgstr "" @@ -2747,7 +2756,7 @@ msgstr "" msgid "here" msgstr "" -#: www/help/3.php:49 +#: www/help/3.php:49 msgid "lines. Do not copy any extra line feeds or carriage returns at the beginning or end of the certificate. Save the certificate into a text editor like Notepad. Save the certificate with an extension of .cer and a meaningful name like certificate.cer" msgstr "" @@ -2781,7 +2790,7 @@ msgstr "" #: www/src-lic.php:20 msgid "CAcert Source License" -msgstr "" +msgstr "רשיון מקור CAcert" #: www/index/7.php:25 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." @@ -2803,7 +2812,7 @@ msgstr "" msgid "In light of the number of people having issues with making up a password we have the following suggestions:" msgstr "" -#: www/index/17.php:142 +#: www/index/17.php:142 msgid "Install a Root Certificate using Internet Explorer and the CEnroll ActiveX control. This avoids the Microsoft Certificate Installation wizard and all of its complexity and extra screens for users. This however will ONLY work for Microsoft Internet Explorer." msgstr "" @@ -2885,7 +2894,7 @@ msgstr "" #: www/account/52.php:48 msgid "Comment" -msgstr "" +msgstr "הערות" #: includes/account.php:478 includes/account.php:491 includes/account.php:592 #: includes/account.php:1238 includes/account.php:1251 @@ -2921,7 +2930,7 @@ msgstr "" #: www/disputes/2.php:20 msgid "Dispute Domain" -msgstr "" +msgstr "התנגד למתחם" #: www/disputes.php:286 www/disputes.php:420 msgid "Dispute Probe" @@ -2946,11 +2955,11 @@ msgstr "" #: www/disputes.php:377 www/disputes.php:422 www/disputes/2.php:15 #: www/disputes/6.php:15 www/disputes/6.php:20 msgid "Domain Dispute" -msgstr "" +msgstr "התנגדות למתחם" #: www/disputes.php:399 msgid "Domain Dispute!" -msgstr "" +msgstr "התנגדות למתחם!" #: www/disputes.php:428 msgid "Domain and Email Disputes" @@ -2983,7 +2992,7 @@ msgstr "" #: www/index/16.php:23 www/index/3.php:23 msgid "GPG Key" -msgstr "" +msgstr "GPG מפתחות" #: www/account/40.php:20 www/index/11.php:20 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." @@ -3048,7 +3057,7 @@ msgstr "" #: includes/account_stuff.php:214 msgid "More Information" -msgstr "" +msgstr "מידע נוסף" #: www/account/52.php:37 msgid "Name on file" @@ -3068,15 +3077,15 @@ msgstr "" #: includes/account_stuff.php:198 msgid "Organisation Assurance" -msgstr "" +msgstr "אימות ארגון" #: www/wot/11.php:19 msgid "Organisational Assurance" msgstr "" -#: www/wot/11.php:22 -msgid "Orgnisation Title" -msgstr "" +#: www/wot/11.php:22 +msgid "Organisation Title" +msgstr "כותרת הארגון" #: www/index/16.php:28 www/index/3.php:28 msgid "PKI finger/thumb print signed by the CAcert GPG Key" @@ -3096,7 +3105,7 @@ msgstr "" #: www/account/52.php:38 msgid "Primary email address" -msgstr "" +msgstr "כתובת דואר אלקטרוני" #: www/help/0.php:20 msgid "Digital signing (a guide for normal people)" @@ -3104,7 +3113,7 @@ msgstr "" #: www/wot/1.php:133 msgid "Email Me" -msgstr "" +msgstr "שלחו לנו/לי דואר אלקטרוני" #: www/disputes/4.php:23 www/disputes/6.php:23 msgid "Reject Dispute" @@ -3120,7 +3129,7 @@ msgstr "" #: www/account/52.php:36 msgid "Request Details" -msgstr "" +msgstr "בקש פרטים" #: www/index/0.php:75 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." @@ -3206,7 +3215,7 @@ msgstr "" #: www/account/43.php:101 msgid "Tverify Account" -msgstr "" +msgstr "חשבון Tverify" #: www/account/11.php:48 msgid "Unable to continue as no valid commonNames or subjectAltNames were present on your certificate request." @@ -3319,14 +3328,243 @@ msgstr "" msgid "Your vote has been accepted." msgstr "" -#: www/index/17.php:3 -msgid "Install CACert Root using CEnroll Active-X component and PKCS-7" +#: www/index/17.php:3 +msgid "Install CAcert Root using CEnroll Active-X component and PKCS-7" +msgstr "" + +#: www/index/17.php:65 +msgid "Problems were detected with the CAcert root certificate download error:" +msgstr "" + +#: www/index/17.php:67 +msgid "The CAcert root certificate was successfully installed" +msgstr "" + +#: www/wot/6.php:70 +#, php-format +msgid "I certify that %s %s %s has appeared in person" +msgstr "" + +#: www/logos.php:7 +#, php-format +msgid "Feel free to copy, use, change, ... the following logos. I created them using the %s site logo and some gimp magic. Send comments or suggestions to %s. Licence: Whatever. I don't care." +msgstr "" + +#: www/cap.php:83 +msgid "Applicant's signature" +msgstr "" + +#: www/cap.php:39 +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 "" + +#: www/cap.php:103 www/cap.php:107 +msgid "Assurer's Name" +msgstr "" + +#: www/cap.php:111 +msgid "Assurer's signature" +msgstr "" + +#: www/cap.php:12 +msgid "CAcert Assurance Programme" +msgstr "" + +#: www/cap.php:85 www/cap.php:113 +msgid "Date (YYYY-MM-DD)" +msgstr "" + +#: www/cap.php:81 +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 "" + +#: www/cap.php:15 www/ttp.php:24 +msgid "Identity Verification Form" +msgstr "" + +#: www/cap.php:129 +msgid "Location of Face-to-face Meeting" +msgstr "" + +#: www/cap.php:133 +msgid "Maximum Points" +msgstr "" + +#: www/cap.php:51 www/ttp.php:75 +msgid "Names" +msgstr "" + +#: www/cap.php:123 +msgid "Photo ID Shown: (ID types, not numbers. eg Drivers license, Passport)" +msgstr "" + +#: www/cap.php:131 +msgid "Points Allocated" +msgstr "" + +#: www/cap.php:37 +#, 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 "" + +#: www/cap.php:46 +msgid "Applicant's Statement" +msgstr "" + +#: www/cap.php:26 www/ttp.php:35 +msgid "CAcert's Root Certificate fingerprints" +msgstr "" + +#: www/ttp.php:109 +msgid "Applicant Information" +msgstr "" + +#: www/ttp.php:84 +msgid "Bar Association, CPA Number or Bank Name and Branch, JP/Notary Number" msgstr "" -#: www/index/17.php:65 -msgid "Problems were detected with the CACert root certificate download error:" +#: www/ttp.php:91 +msgid "Email (if applicable)" msgstr "" -#: www/index/17.php:67 -msgid "The CACert root certificate was successfully installed" +#: www/ttp.php:136 +msgid "First ID Number (driver's license, passport etc)" +msgstr "" + +#: www/ttp.php:112 +msgid "Full Name (as shown on ID)" +msgstr "" + +#: www/ttp.php:56 +#, php-format +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 "" + +#: www/ttp.php:82 +msgid "Justice of the Peace, Public Notary, Lawyer, Accountant, or Bank Manager" +msgstr "" + +#: www/ttp.php:119 +msgid "Main email (so we can find you)" +msgstr "" + +#: www/ttp.php:89 +msgid "Office Phone" +msgstr "" + +#: www/ttp.php:77 +msgid "Office Street Address" +msgstr "" + +#: www/ttp.php:58 +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 "" + +#: www/ttp.php:72 +msgid "Person Verifying Applicant's Identity" +msgstr "" + +#: www/ttp.php:50 +msgid "Please complete and sign this form, and sign the photocopies of the IDs, to acknowledge that" +msgstr "" + +#: www/ttp.php:80 +msgid "Profession (Please circle one)" +msgstr "" + +#: www/ttp.php:138 +msgid "Second ID Number (driver's license, passport etc)" +msgstr "" + +#: www/ttp.php:93 www/ttp.php:140 +msgid "Signature" +msgstr "" + +#: www/ttp.php:48 +msgid "The Applicant asks you to certify to CAcert that you have met with the Applicant and verified the Full Name, Date of Birth, and ID Numbers of the Applicant against two separate original trusted photo-identity documents. Once the documents have been verified against the originals and signed, the applicant must attach the copies to the signed forms and return them to CAcert Inc." +msgstr "" + +#: www/ttp.php:46 +msgid "The CAcert Trusted Third Party (TTP) Programme is designed to assure Internet user identities through personal verification of government issued identity documents." +msgstr "" + +#: www/ttp.php:21 +msgid "Trusted Third Party" +msgstr "" + +#: www/ttp.php:54 +msgid "You have verified that the Full Name, Date of Birth, and ID Numbers on the identity documents matches those filled in the Applicant section below and in the photocopies provided." +msgstr "" + +#: www/ttp.php:52 +msgid "You have viewed two of the Applicant's photo identity documents and you are convinced of their authenticity, and are convinced that the photos indeed depict the Applicant (allowed documents are government-issued documents with photos such as driver's license, passport, or others that are normally accepted as legal identification in your country; expired documents are allowed)." +msgstr "" + +#: www/ttp.php:86 +msgid "as applicable" +msgstr "" + +#: www/cap.php:102 +msgid "CAcert Assurer" +msgstr "" + +#: www/wot/5.php:15 +msgid "ERROR" +msgstr "" + +#: www/wot/10.php:105 +msgid "Go Back" +msgstr "" + +#: includes/general.php:23 +msgid "Administrative Increase" +msgstr "" + +#: includes/general.php:24 +msgid "CT Magazine - Germany" +msgstr "" + +#: includes/general.php:23 +msgid "Face to Face Meeting" +msgstr "" + +#: includes/general.php:23 +msgid "Thawte Points Transfer" +msgstr "" + +#: includes/general.php:24 +msgid "Unknown" +msgstr "" + +#: www/index/0.php:37 +msgid "Full Story" +msgstr "" + +#: www/index/0.php:40 +msgid "More News Items" +msgstr "" + +#: www/index/6.php:92 +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/general.php:618 +msgid "Failed to make a connection to the mail server" +msgstr "" + +#: includes/account.php:904 www/index.php:204 www/index.php:254 +msgid "For your own security you must enter 5 lost password questions and answers." +msgstr "" + +#: www/wot.php:169 +msgid "Race condition discovered, user altered details during assurance procedure. PLEASE MAKE SURE THE NEW DETAILS BELOW MATCH THE ID DOCUMENTS." +msgstr "" + +#: www/wot.php:53 +msgid "Reminder Notice" +msgstr "" + +#: www/wot.php:49 +#, php-format +msgid "This is a short reminder that you filled out forms to become trusted with CAcert.org, and %s has attempted to issue you points. Please create your account at %s as soon as possible and then notify %s so that the points can be issued." msgstr "" diff --git a/locale/is.po b/locale/is.po index c3ac6df..f632019 100644 --- a/locale/is.po +++ b/locale/is.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2006-04-30 10:26:06+0000\n" +"PO-Revision-Date: 2006-07-13 17:09:57+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -291,7 +291,7 @@ msgstr "Notendaskilmálar CAcert" #: www/account/38.php:19 www/index/13.php:19 msgid "CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to strict guidelines about how this money can to be used. If you'd like to make a donation, you can do so via" -msgstr "" +msgstr "CAcert Inc. eru samtök sem hafa lagaheimild til að taka við frjálsum framlögum. CAcert fylgir ströngum reglum um hvernig það fé skal nýtt. Ef þú vilt láta fé af hendi rakna getur þú gert það hjá" #: www/account/10.php:20 www/account/20.php:20 www/account/3.php:20 msgid "CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at" @@ -499,7 +499,7 @@ msgstr "" #: www/wot/3.php:19 msgid "Contact" -msgstr "" +msgstr "Tengiliður" #: www/wot/9.php:39 msgid "Contact Assurer" @@ -675,17 +675,17 @@ msgstr "Breyta" #: www/account/27.php:21 msgid "Edit Organisation" -msgstr "" +msgstr "Breyta félagi" #: www/account/16.php:26 www/account/16.php:31 www/account/33.php:26 #: www/account/42.php:22 www/account/43.php:34 www/account/43.php:74 #: www/account/44.php:22 www/account/50.php:22 www/wot/5.php:22 msgid "Email" -msgstr "" +msgstr "Tölvupóstfang" #: includes/account_stuff.php:149 www/account/2.php:18 msgid "Email Accounts" -msgstr "" +msgstr "Tölvupóstföng" #: www/account/0.php:21 msgid "Email Accounts and Client Certificates" @@ -700,7 +700,7 @@ msgstr "Tölvupóstfang" #: www/index.php:244 msgid "Email Address was blank" -msgstr "" +msgstr "Tölvupóstfang er tómt" #: www/wot/1.php:122 msgid "Email Assurer" @@ -766,16 +766,16 @@ msgstr "" #: www/account/12.php:50 www/account/18.php:50 www/account/22.php:50 #: www/account/5.php:54 msgid "Expired" -msgstr "" +msgstr "Útrunnið" #: www/account/12.php:25 www/account/18.php:25 www/account/22.php:25 #: www/account/5.php:25 msgid "Expires" -msgstr "" +msgstr "Rennur út" #: www/wot/3.php:38 msgid "Fees" -msgstr "" +msgstr "Gjöld" #: www/error404.php:19 msgid "File not found!" @@ -808,15 +808,15 @@ msgstr "" #: www/account/13.php:27 www/account/13.php:75 www/account/43.php:78 #: www/index/1.php:22 msgid "First Name" -msgstr "" +msgstr "Fornafn" #: includes/account.php:769 msgid "First and Last name fields can not be blank." -msgstr "" +msgstr "Reitirnir fyrir for- og föðurnafn mega ekki vera auðir." #: www/index.php:233 msgid "First and/or last names were blank." -msgstr "" +msgstr "For- og/eða föðurnafn voru ekki skráð." #: www/help/6.php:1 msgid "Firstly you need to join CAcert to do that go:" @@ -989,7 +989,7 @@ msgstr "" #: www/wot/8.php:25 msgid "I don't want to be listed" -msgstr "" +msgstr "Mig langar ekki til að vera skráð(ur)" #: www/wot/6.php:105 msgid "I have read and understood the Rules For Assurers and am making this assurance subject to and in compliance with these rules." @@ -1001,7 +1001,7 @@ msgstr "" #: www/wot/8.php:26 msgid "I want to be listed" -msgstr "" +msgstr "Mig langar til að vera skráð(ur)" #: www/help/8.php:2 msgid "I'll anwser the why part first, as that's reasonably easy. The short answer is it takes most of the key handling responsibilty away from you and/or your group. If you need to revoke your key for any reason (such as a developer leaving the project) it won't effect your ability to revoke the existing key or keys, and issue new ones." @@ -1124,7 +1124,7 @@ msgstr "" #: includes/account.php:776 www/index.php:239 msgid "Invalid date of birth" -msgstr "" +msgstr "Ógildur fæðingardagur" #: www/wot/6.php:78 msgid "Issuing a temporary increase will automatically boost their points to 200 points for a nomindated amount of days, after which the person will be reduced to 150 points regardless of the amount of points they had previously. Regardless of method chosen above it will be recorded in the system as an Administrative Increase and there is a maximum amount of 45 days that points can be issued for." @@ -1175,12 +1175,12 @@ msgstr "" #: www/wot/9.php:47 msgid "Language" -msgstr "" +msgstr "Tungumál" #: www/account/13.php:37 www/account/13.php:85 www/account/43.php:86 #: www/index/1.php:32 msgid "Last Name" -msgstr "" +msgstr "Föðurnafn" #: www/index/0.php:28 msgid "Latest News" @@ -1208,7 +1208,7 @@ msgstr "" #: www/account/11.php:30 www/account/21.php:33 www/account/43.php:196 #: www/account/43.php:231 www/wot/10.php:25 www/wot/10.php:58 www/wot/6.php:69 msgid "Location" -msgstr "" +msgstr "Staðsetning" #: www/wot/7.php:123 msgid "Location Name" @@ -1251,7 +1251,7 @@ msgstr "" #: www/account/2.php:49 msgid "Make Default" -msgstr "" +msgstr "Gera sjálfvalið" #: www/wot/7.php:138 msgid "Make my location here" @@ -1296,11 +1296,11 @@ msgstr "" #: www/account/43.php:82 msgid "Middle Name" -msgstr "" +msgstr "Millinafn" #: www/account/13.php:31 www/account/13.php:79 www/index/1.php:26 msgid "Middle Name(s)" -msgstr "" +msgstr "Millinafn/nöfn" #: includes/general_stuff.php:62 msgid "Miscellaneous" @@ -1370,11 +1370,11 @@ msgstr "" #: www/account/2.php:41 msgid "N/A" -msgstr "" +msgstr "Á ekki við" #: www/account/16.php:35 www/wot/1.php:119 www/wot/6.php:43 msgid "Name" -msgstr "" +msgstr "Nafn" #: includes/account_stuff.php:154 includes/account_stuff.php:162 #: includes/account_stuff.php:167 includes/account_stuff.php:171 @@ -2231,7 +2231,7 @@ msgstr "" #: www/index/0.php:24 msgid "To provide a trust mechanism to go with the security aspects of encryption." -msgstr "" +msgstr "Að veita umgjörð trausts, sem helst í hendur við öryggisþætti dulkóðunnar." #: www/account/43.php:217 www/account/43.php:252 www/wot/10.php:44 msgid "Total Points" diff --git a/locale/make.php.dist b/locale/make.php.dist new file mode 100644 index 0000000..0128f17 --- /dev/null +++ b/locale/make.php.dist @@ -0,0 +1,29 @@ +#!/usr/bin/php -q + "bg_BG", "da" => "da_DK", "de" => "de_DE", "es" => "es_ES", + "fr" => "fr_FR", "fi" => "fi_FI", "he" => "he_IL", "hr" => "hr_HR", + "hu" => "hu_HU", "it" => "it_IT", "ja" => "ja_JP", "nl" => "nl_NL", + "pt" => "pt_PT", "pt_BR" => "pt_BR", "ro" => "ro_RO", "ru" => "ru_RU", + "sv" => "sv_SE", "tr" => "tr_TR", "zh" => "zh_CN", "ar" => "ar_SY", + "el" => "el_GR", "tl" => "tl_PH", "pl" => "pl_PL", "cs" => "cs_CZ", + "ka" => "ka_GE", "is" => "is_IS", "ko" => "ko_KR", "nb" => "nb_NO"); + + if($argc > 1) + { + foreach($argv as $key) + { + $val = $lang[$key]; + if($val != "") + { + $do = `msgfmt -o $key/LC_MESSAGES/messages.mo $key.po 2>&1`; +echo $do; + } + } + } else { + foreach($lang as $key => $val) + { + $do = `msgfmt -o $key/LC_MESSAGES/messages.mo $key.po 2>&1`; +echo $do; + } + } +?> diff --git a/locale/pl.po b/locale/pl.po index c1d7093..a0f3669 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2006-04-30 10:23:50+0000\n" +"PO-Revision-Date: 2006-08-03 12:37:44+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -313,7 +313,7 @@ msgstr "Zasady Sieci Zaufania CAcert" #: www/wot/3.php:45 msgid "CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change. We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of CAcert require this." -msgstr "" +msgstr "CAcert, w zależności od potrzeb, może zmienić pulę Punktów, które Kontroler danej klasy może przyznać w procesie uwierzytelniania. Możemy również zmienić pulę Punktów dostępnych konkretnej lub nowej klasie Kontrolerów." #: www/help/6.php:11 msgid "CAcert then sends you an email with a signed copy of your certificate. Hopefully the rest should be pretty straight forward." @@ -532,7 +532,7 @@ msgstr "Skopiuj zawartość e-maila włączając w to" #: www/index/51.php:20 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 "" +msgstr "Główni członkowie CAcert posiadają ogromną wiedzę z zakresu IT i bezpieczeństwa, oraz jeszcze większą potrzebę przekazania jej społeczności." #: includes/account.php:617 includes/account.php:726 includes/account.php:1125 #: includes/account.php:1343 @@ -716,11 +716,11 @@ msgstr "Uruchom szyfrowaną transmisję danych dla użytkownik&oacut #: www/help/3.php:58 msgid "Ensure 'Process the pending request and install the certificate' is selected and click on 'Next'." -msgstr "" +msgstr "Upewnij się że 'Process the pending request and install the certificate' jest zaznaczony i naciśnij 'Dalej'." #: www/help/3.php:63 msgid "Ensure that you are processing the correct certificate" -msgstr "" +msgstr "Upewnij się że instalujesz poprawny certifikat" #: www/help/3.php:17 msgid "Enter a certificate name and select Certificate strength" @@ -728,7 +728,7 @@ msgstr "Wpisz nazwę certyfikatu i wybierz jego siłę" #: www/help/3.php:26 msgid "Enter the Organisation name: this must be the full legal name of the Organisation that is applying for the certificate." -msgstr "" +msgstr "Wprowadź nazwę organizacji: musi to być pełnoprawna nazwa organizacji, do której odnosi się certyfikat." #: www/wot/3.php:30 msgid "Enter the applicant's email address;" @@ -740,7 +740,7 @@ msgstr "Wpisz szczegóły geograficzne" #: www/help/3.php:30 msgid "Enter your Common Name" -msgstr "" +msgstr "Wprowadź "common name"" #: www/help/3.php:25 msgid "Enter your Organisation Information" @@ -748,7 +748,7 @@ msgstr "Wpisz informacje o Twojej organizacji" #: www/help/2.php:57 msgid "Erroneous Verisign Issued Digital Certificates Pose Spoofing Hazard" -msgstr "" +msgstr "Ryzyko spoofingu fałszywym certyfikatem Verisign" #: includes/account.php:67 www/verify.php:33 www/verify.php:45 #: www/verify.php:76 www/verify.php:89 @@ -757,7 +757,7 @@ msgstr "Błąd!" #: www/help/2.php:21 msgid "Ever requested a password that you lost to be emailed to you? That password was wide open to inspection by potential crackers." -msgstr "" +msgstr "Czy kiedykolwiek poprosiłeś o wysłanie Ci zapomnianego hasła? Twoje hasło było zatem wystawione jak na tacy potencjalnym chaksorom." #: www/account/12.php:50 www/account/18.php:50 www/account/22.php:50 #: www/account/5.php:54 @@ -779,7 +779,7 @@ msgstr "Nie znaleziono pliku!" #: www/help/4.php:16 msgid "Finally you will be asked information about 'extra' attribute, you simply hit enter to both these questions." -msgstr "" +msgstr "Na koniec, gry zostaniesz poproszony o informacje nt 'extra' atrybutów, poprostu kliknij enter w odpowiedzi na oba pytania." #: includes/account_stuff.php:191 msgid "Find Domain" @@ -828,7 +828,7 @@ msgstr "Poniżej jest kilka wskazówek, które mogą być #: www/account/37.php:23 www/index/12.php:23 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 "" +msgstr "Administratorom szukającym zabezpieczeń dla swoich szeroko pojętych usług, oferujemy certyfikaty dla hostów jak również wildcard, które są gotowe do użycia niemal natychmiast. Można ich użyć nie tylko do ochrony serwisów www, lecz również takich protokołów jak POP3, SMTP czy IMAP etc. W odrżnieniu od innych centrów certyfikacji, nie ograniczamy siły certifikatów czy użytkowania wildcardów. Każdy powinien mieć prawo do bezpieczeństwa i ochrony prywatności." #: www/help/3.php:71 msgid "For more information, refer to your server documentation or visit" @@ -1143,7 +1143,7 @@ msgstr "" #: www/index/0.php:17 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 "Długo trwało stworzenie, ale oczekiwanie było warte zachodu, w końcu możesz mieć bezpieczeństwo za rozsądną cenę.... za Darmo!" +msgstr "Długo trwało stworzenie, ale oczekiwanie było warte zachodu, w końcu możesz mieć bezpieczeństwo za rozsądną cenę... za darmo!" #: www/index/1.php:107 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." @@ -1681,12 +1681,12 @@ msgstr "" #: www/wot.php:233 #, php-format msgid "Please Note: this is a temporary increase for %s days only. After that time their points will be reduced to 150 points." -msgstr "" +msgstr "Informacja: to jest zwiększenie tylko na %s dni. Po tym czasie ich punkty zostaną zredukowane do 150." #: www/wot.php:220 #, php-format msgid "Please Note: this is a temporary increase for %s days only. After that time your points will be reduced to 150 points." -msgstr "" +msgstr "Informacja: to jest zwiększenie tylko na %s dni. Po tym czasie Twoje punkty zostaną zredukowane do 150." #: www/account/8.php:19 msgid "Please choose an authority email address" @@ -2179,7 +2179,7 @@ msgstr "" #: www/index.php:272 msgid "This email address is currently valid in the system." -msgstr "Ten email jest właśnie zatwierdzony w systemie." +msgstr "Ten email jest aktualnie zatwierdzony w systemie." #: www/wot/6.php:36 #, php-format @@ -2261,7 +2261,7 @@ msgstr "" #: www/help/2.php:21 msgid "UK Government has done this since the year 2000" -msgstr "Rząd brytyjski zrobił to przed rokiem 2000" +msgstr "Rząd brytyjski zrobił to przed 2000 rokiem" #: www/index.php:126 msgid "Unable to match your details with any user accounts on file" @@ -2408,7 +2408,7 @@ msgstr "Kiedy i Gdzie?" #: www/help/3.php:67 msgid "When you have read this information, click 'Finish'." -msgstr "Po przeczytaniu informacji kliknij 'Koniec'." +msgstr "Po przeczytaniu tej informacji kliknij 'Koniec'." #: www/account/39.php:26 www/index/10.php:26 msgid "When you post to the contact form, you must provide your name and email address. When you sign up to the website, you must provide your name, email address date of birth and some lost pass phrase question and answers." @@ -2820,7 +2820,7 @@ msgstr "" #: www/index/17.php:142 msgid "Install a Root Certificate using Internet Explorer and the CEnroll ActiveX control. This avoids the Microsoft Certificate Installation wizard and all of its complexity and extra screens for users. This however will ONLY work for Microsoft Internet Explorer." -msgstr "Zainstaluj Główny Certyfikat używając Internet Explorera i jego kontrolki CEnroll ActiveX. Unikniesz dzięki temu kreatora Instalacji Certyfikatu Microsoft i całej jego złożoności i dodatkowych ekranów dla użytkowników. To jednakże działa TYLKO z Microsoft Internet Explorerem." +msgstr "Zainstaluj Certyfikat Główny używając Internet Explorera i jego kontrolki CEnroll ActiveX. Unikniesz dzięki temu kreatora Instalacji Certyfikatu Microsoft i całej jego złożoności oraz dodatkowych ekranów dla użytkowników. Jednakże działa to TYLKO w przeglądarce Microsoft Internet Explorer." #: includes/general_stuff.php:111 msgid "Mission Statement" @@ -3435,7 +3435,7 @@ msgstr "" #: www/ttp.php:136 msgid "First ID Number (driver's license, passport etc)" -msgstr "" +msgstr "Numer pierwszego dokumentu (prawo jazdy, paszport itd)" #: www/ttp.php:112 msgid "Full Name (as shown on ID)" @@ -3480,7 +3480,7 @@ msgstr "" #: www/ttp.php:138 msgid "Second ID Number (driver's license, passport etc)" -msgstr "Numer drugiego dokumentu (prawojazdy, paszport itd)" +msgstr "Numer drugiego dokumentu (prawo jazdy, paszport itd)" #: www/ttp.php:93 www/ttp.php:140 msgid "Signature" @@ -3552,7 +3552,7 @@ msgstr "Więcej wiadomości..." #: www/index/6.php:92 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 "" +msgstr "Nie masz ustawionej wystarczającej ilości/żadnych pytań na wypadek utraty hasła. Nie będziesz mógł kontynuować resetowania swojego hasła tą metodą." #: includes/general.php:618 msgid "Failed to make a connection to the mail server" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index d58be86..7e28251 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2006-04-30 10:23:31+0000\n" +"PO-Revision-Date: 2006-08-03 12:37:49+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -38,12 +38,12 @@ msgstr "Domínios de %s" #: includes/account.php:1388 #, php-format msgid "'%s' has just been successfully added as an organisation to the database." -msgstr "'%s' foi incluída como organização no banco de dados com sucesso." +msgstr "'%s' foi incluída com sucesso, como organização, no banco de dados." #: includes/account.php:1444 #, php-format msgid "'%s' has just been successfully added to the database." -msgstr "'%s' foi adicionado com sucesso ao banco de dados." +msgstr "'%s' foi incluído com sucesso no banco de dados." #: includes/account.php:1503 #, php-format @@ -88,7 +88,7 @@ msgstr "Sobre Nós" #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21 #: www/account/33.php:47 www/account/7.php:27 msgid "Add" -msgstr "Adicionar" +msgstr "Incluir" #: www/account/7.php:19 msgid "Add Domain" @@ -96,7 +96,7 @@ msgstr "Incluir Domínio" #: www/account/1.php:18 msgid "Add Email" -msgstr "Adicionar Email" +msgstr "Incluir Email" #: www/account/16.php:22 www/account/2.php:24 www/account/3.php:31 #: www/account/9.php:23 @@ -2222,7 +2222,7 @@ msgstr "Para criar uma Autoridade Certificadora sem fins lucrativos; uma alterna #: www/help/2.php:33 msgid "To fully understand, read the section directly above. I am using a free Certificate Authority to provide me with the ability to digitally sign my emails. As a result, this Certificate Authority is not (yet) recognised by your email software as it is a new organisation that is not yet fully established, although it is probably being included in the Mozilla browser. If you choose to, you can go the their site at CAcert.org to install the root certificate. You may be told that the certificate is untrusted - that is normal and I suggest that you continue installation regardless. Be aware that this implies your acceptance that you trust their secure distribution and storing of digital signatures, such as mine. (You already do this all the time). The CAcert.org root certificate will then automatically provide the safe validation of my digital signature, which I have entrusted to them. Or you can simply decide that you've wasted your time reading this and do nothing (humbug!). Shame on you! :-)" -msgstr "" +msgstr "Para compreender inteiramente, leia a seção diretamente acima. Eu estou usando uma Autoridade de Certificação livre para fornecer-me a possibilidade de assinar digital minhas mensagens de email. Por conseguinte, esta Autoridade de Certificação (ainda) não é reconhecida por seu programa de email porque trata-se de uma organização nova que não está ainda inteiramente estabelecida, embora esteja sendo incluída provavelmente no navegador de Mozilla. Se você escolher a, você pode usar seu sítio web CAcert.org para instalar o certificado raiz. Pode-se dizer que o certificado não é confiável, o que é normal. Sugiro, de qualquer maneira, que você continue a instalação. Esteja ciente que isto implica que você concorda em confiar na distribuição e armazenanamento seguros de assinaturas digitais por parte da Autoridade de Certificação, tais como a minha. (Você já faz isto freqüentemente). O certificado da raiz de CAcert.org fornecerá então automaticamente a validação segura de minha assinatura digital, que eu confiei a eles. Você pode também simplesmente decidir que desperdiçou seu tempo ao ler isto e não fazer nada (nojento!). Que vergonha! :-)" #: www/help/3.php:2 msgid "To generate a public and private key pair and CSR for a Microsoft IIS 5 Server:" @@ -2230,7 +2230,7 @@ msgstr "Para gerar um par de chaves pública e privada e um CSR em um serv #: www/help/2.php:21 msgid "To get from computer Internet User A to Internet User B an email may pass through tens of anonymous computers on the Internet. These 'Internet infrastructure' computers are all free to inspect and change the contents of your email as they see fit. Governments systematically browse the contents of all emails going in/out/within their country, e.g. the" -msgstr "" +msgstr "Para passar do computador do internauta A para o do Internauta B uma mensagem de correio eletrônico pode passar por dezenas de computadores anônimos na Internet. Estes computadores da "infra-estructura da Internet" têm a capacidade de permitir a inspecção e a alteração dos conteúdos de suas mensagens a seu bel prazer. Há governos que vasculham sistematicamente os conteúdos de todos as mensagens que entrem ou que saiam de um país, por exemplo os ..." #: www/index/0.php:24 msgid "To provide a trust mechanism to go with the security aspects of encryption." @@ -2361,7 +2361,7 @@ msgstr "Aviso! Este local requer que cookies estejam habilitados para assegurar #: www/index/4.php:17 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 "" +msgstr "Atenção! Você tentou entrar no sistema com um certificado de cliente, mas, devido a o certificado ter expirado, ter sido revogado, ou, simplesmente, ser inválido para este sítio, seu login falhou. Pode-se entrar no sistema usando login e senha para obter um novo certificado, para tanto clique em ' Iniciar uma sessão normal ' à direita de sua tela." #: includes/account.php:1609 #, php-format @@ -2370,7 +2370,7 @@ msgstr "Impossível relacionar '%s' com qualquer usuário no sistema #: www/account/39.php:34 www/index/10.php:34 msgid "We analyse visitors' use of our sites by tracking information such as page views, traffic flow, search terms, and click through. We use this information to improve our sites. We also share this anonymous traffic and demographic information in aggregate form with advertisers and other business partners. We do not share any information with advertisers that can identify an individual user." -msgstr "" +msgstr "Analisamos o uso que os visitantes fazem de nossos sítios segundo informações tais como vistas à página, fluxo de tráfego, termos de busca, e padrão de cliques pelo sítio. Usamos estas informações para melhorar nossos sítios. Compartilhamos também informações anônimas sobre tráfego e demografia provenientes do formulário agregado com publicitários e outros associados de negócio. Não compartilhamos com publicitários nenhuma informação que possibilite identificar individualmente um usuário." #: www/account/39.php:21 www/index/10.php:21 msgid "We collect two kinds of information about 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." @@ -2417,7 +2417,7 @@ msgstr "Quando você ler esta informação, clique 'Terminar'." #: www/account/39.php:26 www/index/10.php:26 msgid "When you post to the contact form, you must provide your name and email address. When you sign up to the website, you must provide your name, email address date of birth and some lost pass phrase question and answers." -msgstr "" +msgstr "Ao preencher o formulário do contato, deve-se fornecer nome e endereço de email. Para assinar o sítio Web, deve-se fornecer nome, endereço de email, data de nascimento e, para o caso de perda de frase-senha, pares de pergunta e resposta que possibilitarão a criação de nova frase-senha." #: www/account/43.php:194 www/account/43.php:229 www/wot/10.php:23 #: www/wot/10.php:56 @@ -2442,7 +2442,7 @@ msgstr "Por que não está sendo adotado por todos?" #: www/help/7.php:7 msgid "Why use serial you ask? Well certificate requests are low bandwidth for starters, then of course simpler systems in security are less prone to exploits, and finally serial code is pretty mature and well tested and hopefully all exploits were found and fixed a long time ago." -msgstr "" +msgstr "Por que usar conexão serial? Para começar, os pedidos de certificado consomem pouca largura de banda, sistemas simples na área de segurança implicam em menos chances de exploração de falhas e, para concluir, conexões seriais existem há muito tempo e os softwares de conexão serial são maduros, bem testados e provavelmente todas as brechas de segurança imagináveis já foram sanadas." #: www/index/51.php:23 msgid "Why?" @@ -2450,7 +2450,7 @@ msgstr "Porque?" #: www/help/7.php:8 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 "" +msgstr "Com as mudanças propostas do certificado da raiz, haveria uma raiz nova, esta assinaria ao menos 1 secundário-raiz, a seguir a chave confidencial armazenada fora de linha em um vault do banco, com a secundário-raiz que faz todo o assinar, ou alternativamente 2 secundário-raizes, 1 para certificados do cliente, um para o usuário, pensar atrás deste, se algumas das secundário-raizes forem comprometido elas podem ser revogadas e reeditado." #: www/account/36.php:25 www/index/1.php:114 msgid "Within 200km Announcements" @@ -2470,7 +2470,7 @@ msgstr "Sim" #: www/account/39.php:52 www/index/10.php:52 msgid "You are able to update, add and remove your information at any time via our web interface, log into the 'My Account' and then click on the 'My Details' section, and then click the relevant link" -msgstr "" +msgstr "Pode adicionar e remover sua informação em qualquer momento pela interface web: faça login em "Minha Conta", clique em "Meus Detalhes" e, então clique na opção relevante." #: www/account/19.php:44 www/account/6.php:42 msgid "You are about to install a certificate, if you are using mozilla/netscape based browsers you will not be informed that the certificate was installed successfully, you can go into the options dialog box, security and manage certificates to view if it was installed correctly however." @@ -2517,7 +2517,7 @@ msgstr "Tem depositado muito tempo e esforço na promoção e #: www/wot/6.php:44 #, php-format msgid "Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. Gross negligence may cause you to be liable." -msgstr "" +msgstr "Verifique por favor se os seguintes detalhes conferem com os que você testemunhou quando você se encontrou com %s em pessoa. Você NÃO DEVE proseguir a menos que você esteja certo de que os detalhes estão corretos. Qualquer grave negligência poderá torná-lo responsável." #: includes/general_stuff.php:74 msgid "CAcert Board" @@ -2594,7 +2594,7 @@ msgstr "Você deve confirmar seu endereço de email respondendo a um #: www/index/0.php:85 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 "" +msgstr "Você deve confirmar que você é o proprietário (ou administrador autorizado) do domínio respondendo ao email de verificação enviado a ambos os endereços listados no registro whois, ou um dos endereços mandatórios de RFC (hostmaster/postmaster/etc)." #: www/account/17.php:17 www/account/19.php:57 www/account/4.php:17 #: www/account/6.php:55 @@ -2619,7 +2619,7 @@ msgstr "Você agora tem mais de 50 pontos, e pode incluir seu nome em certi #: www/help/2.php:15 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 "" +msgstr "Você vê isto a toda hora na Internet - cada vez que você vai a uma página segura em um web site, por exemplo para fornecer detalhes pessoais, ou fazer uma compra, todo dia você navega por web sites que foram assinados digitalmente por uma Autoridade Certificadora que é aceita como tendo a autoridade para assiná-lo. Isto é tudo invisível ao usuário, exceto que você poderá estar ciente de que você está entrando em uma zona segura (por exemplo SSL e HTTPS)." #: includes/account.php:177 msgid "You submitted invalid email addresses, or email address you no longer have control of. Can't continue with certificate request." @@ -2644,11 +2644,11 @@ msgstr "Você recebeu %s pontos e você tem agora %s pontos no total." #: www/index/0.php:105 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 "" +msgstr "Você receberá 100 pontos encontrando-se com certificadores da CAcert Web de confiança, que verificarão sua identidade usando seus documentos emitidos pelo governo com foto; OU se for muito difícil encontrar com tais certificadores na sua área, encontrando-se com dois certificadores terceiros (publicamente notórios, pessoas da justiça, advogados, gerentes de bancos, contadores) para realizarem a verificação." #: www/help/3.php:23 msgid "You will now create a CSR. This information will be displayed on your certificate, and identifies the owner of the key to users. The CSR is only used to request the certificate. The following characters must be excluded from your CSR fields, or your certificate may not work:" -msgstr "" +msgstr "Você criará agora um CSR. Esta informação será indicada em seu certificado, e identifica o proprietário da chave aos usuários. O CSR é usado somente para pedir o certificado. Os seguintes carácteres devem ser excluídos de seus campos do CSR, ou seu certificado pode não funcionar:" #: www/help/3.php:66 msgid "You will see a confirmation screen." @@ -2702,7 +2702,7 @@ msgstr "Suas informações de conta foram atualizadas." #: www/help/2.php:16 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 "" +msgstr "Seu navegador inclui certificados digitais especiais (raiz) de diversas 'Autoridades Certificadores' por padrão, e você como usuário implicitamente confia em todos os sites que são validados por uma destas empresas cada vez que você acessa uma parte segura de um web site (você pode perguntar, quem valida a segurança das Autoridades Certificadores, e por quê você deveria confirar neste?)." #: includes/account.php:281 includes/account.php:491 includes/account.php:554 #: includes/account.php:667 includes/account.php:1017 @@ -2738,7 +2738,7 @@ msgstr "Sua mensagem foi enviada a" #: www/index/2.php:16 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 "" +msgstr "Sua informação foi submetida ao nosso sistema. Você receberá um email com um link web que deverá abrir em seu navegador em 24 horas ou sua informação será removida de nosso sistema!" #: includes/account.php:1669 msgid "Your language setting has been updated." @@ -2767,7 +2767,7 @@ msgstr "aqui" #: www/help/3.php:49 msgid "lines. Do not copy any extra line feeds or carriage returns at the beginning or end of the certificate. Save the certificate into a text editor like Notepad. Save the certificate with an extension of .cer and a meaningful name like certificate.cer" -msgstr "" +msgstr "linhas. Não copie nenhum LINE FEED extra ou retornos de carro no começo ou na extremidade do certificado. Salve o certificado em um editor de texto como o Notepad. Salve o certificado com uma extensão .cer e de um nome significativo (ilustrativo), como por exemplo certificate.cer" #: www/account/13.php:32 www/account/13.php:42 www/account/13.php:80 #: www/account/13.php:90 www/index/1.php:27 www/index/1.php:37 @@ -2796,6 +2796,9 @@ msgstr "Analise" #, 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 "" +"A frase senha submetida falhou em conter número suficiente de caracteres diferentes e/ou por conter palavras de seu nome e/ou email. " +" " +"Apenas atingiu %s pontos de 6." #: www/src-lic.php:20 msgid "CAcert Source License" @@ -2803,11 +2806,11 @@ msgstr "Licença de Código Fonte CAcert" #: www/index/7.php:25 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 "" +msgstr "Realizado uma quantidade substancial de trabalho no projeto anterior deste website, e têm contribuindo muito nas listas de email dando idéias importantes sobre como fazer as coisas melhor." #: includes/account.php:25 includes/account.php:302 msgid "Due to the possibility for punycode domain exploits we currently do not allow any certificates to sign punycode domains or email addresses." -msgstr "" +msgstr "Devido à possibilidades de explorações de domínios punycode atualmente não permitimos nenhum certificado assinar domínios ou endereços de email punycode." #: www/help/9.php:28 msgid "Firstly you need mod-ssl and apache setup (this is beyond the scope of this FAQ item and you will need to search on google etc for LAMP setup information). I recommend mod-ssl over apache-ssl because it means you need less resources to achieve the same result." diff --git a/locale/sv.po b/locale/sv.po index 64e31c4..dd288cf 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2006-04-30 10:22:44+0000\n" +"PO-Revision-Date: 2006-07-13 17:10:13+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -118,7 +118,7 @@ msgstr "Efter mötet, gå till CAcert:s verifieringssida - CAcerts Web #: www/help/3.php:44 msgid "After your certificate has been emailed to you, follow this process to install the certificate." -msgstr "" +msgstr "När du fått certifikatet med epost, gör på följande sätt för att installera certifikatet." #: www/account/39.php:32 www/index/10.php:32 msgid "Aggregated tracking information" @@ -138,7 +138,7 @@ msgstr "Altervativ verifierad epostadress" #: www/help/7.php:9 msgid "Alternatively as things progress we can add more layers of security with say 4 webservers talking to 2 intermediate servers, talking to the root store, and acting in a token ring fashion, anything happening out of sequence, and the server directly upstream shuts itself down, which if that were in place and there were multiple paths, any down time in this fashion would fall over to the servers not compromised, anyways just some food for thought." -msgstr "" +msgstr "I framtiden kan skyddet av CaCerts root komma att förändras. (Den föregående meningen 'I framtiden ... förändras' är inte en översättning av den engelska originaltexten utan översättarens kommentar. Originaltexten är under diskussion - maj 2006)." #: www/account/40.php:52 www/index/11.php:52 msgid "Alternatively you can get in contact with us via the following methods:" diff --git a/locale/zh.po b/locale/zh.po index d100705..0e979da 100644 --- a/locale/zh.po +++ b/locale/zh.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-09 08:25:26+0000\n" -"PO-Revision-Date: 2005-06-22 10:37:43+0000\n" +"PO-Revision-Date: 2006-07-13 17:10:18+0000\n" "Last-Translator: Someone \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,12 +18,12 @@ msgstr "" #: www/account/43.php:43 www/account/49.php:43 #, php-format msgid "%s rows displayed." -msgstr "" +msgstr "显示 %s 列。" #: www/account/43.php:71 #, php-format msgid "%s's Account Details" -msgstr "%s's 帐户信息" +msgstr "%s 的帐户详细资料" #: www/account/32.php:21 #, php-format @@ -48,12 +48,12 @@ msgstr "'%s' 已成功加入数据库 #: includes/account.php:1503 #, php-format msgid "'%s' has just been successfully deleted from the database." -msgstr "'%s' 已由数据库成功删除。" +msgstr "'%s' 已成功从数据库删除。" #: includes/account.php:1416 includes/account.php:1491 #, php-format msgid "'%s' has just been successfully updated in the database." -msgstr "'%s' 已在数据库中成功更新。" +msgstr "'%s' 已成功在数据库中更新。" #: www/help/3.php:64 msgid "...then click 'Next'." @@ -101,7 +101,7 @@ msgstr "添加电子邮件" #: www/account/16.php:22 www/account/2.php:24 www/account/3.php:31 #: www/account/9.php:23 msgid "Address" -msgstr "" +msgstr "地址" #: www/account/32.php:24 msgid "Administrator" @@ -110,11 +110,11 @@ msgstr "管理员" #: www/account/25.php:22 www/account/25.php:39 www/account/35.php:21 #: www/account/35.php:35 msgid "Admins" -msgstr "" +msgstr "管理员们" #: www/wot/3.php:28 msgid "After the meeting, visit the CAcert Web site's make an Assurance page and:" -msgstr "" +msgstr "会面结束后，访问 CAcert 网站的“制作公证”页面，并：" #: www/help/3.php:44 msgid "After your certificate has been emailed to you, follow this process to install the certificate." @@ -122,11 +122,11 @@ msgstr "" #: www/account/39.php:32 www/index/10.php:32 msgid "Aggregated tracking information" -msgstr "" +msgstr "累计跟踪信息" #: www/account/36.php:21 www/index/1.php:110 msgid "Alert me if" -msgstr "" +msgstr "通知我，如果" #: www/index.php:332 msgid "All fields are mandatory." @@ -134,7 +134,7 @@ msgstr "所有空格都必须填写 #: www/account/43.php:157 msgid "Alternate Verified Email Addresses" -msgstr "" +msgstr "更改 Email 验证地址" #: www/help/7.php:9 msgid "Alternatively as things progress we can add more layers of security with say 4 webservers talking to 2 intermediate servers, talking to the root store, and acting in a token ring fashion, anything happening out of sequence, and the server directly upstream shuts itself down, which if that were in place and there were multiple paths, any down time in this fashion would fall over to the servers not compromised, anyways just some food for thought." @@ -189,35 +189,35 @@ msgstr "" #: www/wot/6.php:24 msgid "Assurance Confirmation" -msgstr "" +msgstr "确认公证" #: www/account/43.php:146 www/wot/3.php:44 msgid "Assurance Points" -msgstr "" +msgstr "信用点数" #: www/account/43.php:225 www/wot/10.php:52 msgid "Assurance Points You Issued" -msgstr "" +msgstr "您用有的担保点数" #: www/stats.php:51 msgid "Assurances Made" -msgstr "" +msgstr "做出的担保" #: includes/account_stuff.php:182 www/wot/5.php:19 msgid "Assure Someone" -msgstr "" +msgstr "公证某人" #: www/index/0.php:60 msgid "Assured client certificates" -msgstr "" +msgstr "客户证书" #: www/index/0.php:90 msgid "Assured server certificates" -msgstr "" +msgstr "服务器证书" #: www/stats.php:47 msgid "Assurers" -msgstr "" +msgstr "保证人" #: www/index/51.php:28 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." @@ -233,7 +233,7 @@ msgstr "" #: includes/account_stuff.php:182 msgid "Becoming an Assurer" -msgstr "" +msgstr "成为公证人" #: www/account/40.php:19 www/index/11.php:19 msgid "Before contacting us, be sure to read over the inforation on our official and unofficial HowTo and FAQ pages." @@ -303,7 +303,7 @@ msgstr "CAcert 技术支持小组" #: includes/account_stuff.php:181 www/account/0.php:27 www/wot/0.php:15 msgid "CAcert Web of Trust" -msgstr "" +msgstr "CAcert 信任网络" #: www/wot/3.php:15 msgid "CAcert Web of Trust Rules" @@ -593,7 +593,7 @@ msgstr "删除" #: www/account/43.php:102 www/account/43.php:103 msgid "Delete Account" -msgstr "" +msgstr "删除账号" #: www/account/34.php:28 #, php-format @@ -643,7 +643,7 @@ msgstr "域认证" #: includes/account_stuff.php:157 www/account/25.php:21 www/account/25.php:38 #: www/account/9.php:18 msgid "Domains" -msgstr "" +msgstr "域" #: www/account/0.php:23 msgid "Domains and Server Certificates." @@ -698,7 +698,7 @@ msgstr "电子邮件地址没有填 #: www/wot/1.php:122 msgid "Email Assurer" -msgstr "" +msgstr "电子邮件担保人" #: includes/account.php:51 includes/account.php:391 msgid "Email Probe" @@ -734,7 +734,7 @@ msgstr "输入申请人的电子邮 #: www/help/3.php:33 msgid "Enter the geographical details" -msgstr "" +msgstr "输入详细位置信息" #: www/help/3.php:30 msgid "Enter your Common Name" @@ -742,7 +742,7 @@ msgstr "" #: www/help/3.php:25 msgid "Enter your Organisation Information" -msgstr "" +msgstr "输入所属组织信息" #: www/help/2.php:57 msgid "Erroneous Verisign Issued Digital Certificates Pose Spoofing Hazard" @@ -781,19 +781,19 @@ msgstr "" #: includes/account_stuff.php:191 msgid "Find Domain" -msgstr "" +msgstr "搜索域" #: includes/account_stuff.php:191 www/account/42.php:19 msgid "Find User" -msgstr "" +msgstr "搜索用户" #: www/account/48.php:19 msgid "Find User by Domain" -msgstr "" +msgstr "在域中搜索用户" #: includes/account_stuff.php:182 msgid "Find an Assurer" -msgstr "" +msgstr "搜索担保人" #: www/help/3.php:41 msgid "Finish up and exit IIS Certificate Wizard" @@ -1096,7 +1096,7 @@ msgstr "安装你的认证" #: www/help/3.php:51 msgid "Installation steps" -msgstr "" +msgstr "安装步骤" #: www/account/19.php:43 www/account/19.php:52 www/account/6.php:41 #: www/account/6.php:50 @@ -1290,7 +1290,7 @@ msgstr "" #: www/account/43.php:82 msgid "Middle Name" -msgstr "" +msgstr "中间名(无)" #: www/account/13.php:31 www/account/13.php:79 www/index/1.php:26 msgid "Middle Name(s)" @@ -1348,11 +1348,11 @@ msgstr "我的详细信息" #: www/account/41.php:18 msgid "My Language Settings" -msgstr "" +msgstr "我的语言设定" #: includes/account_stuff.php:146 www/wot/8.php:19 msgid "My Listing" -msgstr "" +msgstr "我的列表" #: includes/account_stuff.php:146 msgid "My Location" @@ -1412,7 +1412,7 @@ msgstr "输入的新密文不相符 #: www/account/44.php:26 msgid "New Password" -msgstr "" +msgstr "新密码" #: www/stats.php:70 www/stats.php:106 msgid "New Users" @@ -1422,7 +1422,7 @@ msgstr "" #: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26 #: www/index/1.php:117 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26 msgid "Next" -msgstr "" +msgstr "下一步" #: www/help/4.php:17 msgid "Next step is that you submit the contents of server.csr to the CAcert website, it should look *EXACTLY* like the following example otherwise the server may reject your request because it appears to be invalid." @@ -1704,7 +1704,7 @@ msgstr "请注意：为了达到更 #: www/wot/8.php:40 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 "" +msgstr "请注意：联系信息框会剥离所有 html，并自动加入一个电子邮件表格，以保证你的个人隐私。" #: www/account/43.php:195 www/account/43.php:230 www/wot/10.php:24 #: www/wot/10.php:57 www/wot/6.php:108 @@ -2555,9 +2555,9 @@ msgstr "你没有正确输入你账 msgid "You failed to enter a location of your meeting." msgstr "" -#: www/index.php:90 -msgid "You failed to get all answers correct, system admins have been notified." -msgstr "你没有正确回答所有问题，系统管理员将会被告知此事。" +#: www/index.php:97 +msgid "You failed to get all answers correct or you didn't configure enough lost password questions for your account. System admins have been notified." +msgstr "" #: www/gpg.php:24 msgid "You failed to paste a valid GPG/PGP key." @@ -2729,19 +2729,19 @@ msgstr "你的电子邮件已经发 #: www/index/2.php:16 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 "你的信息已经提交给我们的系统。我们现在会发送一封包含网页链接的电子邮件，你必须在24小时内用你的网络浏览器打开该链接，否则我们将从系统中删除你的信息！" +msgstr "你的信息已经提交给我们的系统。我们现在会发送一封包含网页链接的电子邮件，你必须在24小时内用浏览器打开该链接，否则我们将从系统中删除你的信息！" #: includes/account.php:1669 msgid "Your language setting has been updated." -msgstr "" +msgstr "你的语言设置已经更新。" #: www/account.php:37 www/index.php:354 msgid "Your message has been sent to the general support list." -msgstr "" +msgstr "你的邮件已经发送到常见问题邮件列表。" #: www/account.php:28 www/index.php:343 msgid "Your message has been sent." -msgstr "" +msgstr "你的消息已经发出。" #: www/help/3.php:48 msgid "and" @@ -2768,12 +2768,12 @@ msgstr "可选的" #: includes/account.php:1445 includes/account.php:1492 #: includes/account.php:1504 msgid "to continue." -msgstr "" +msgstr "以继续。" #: includes/account.php:671 includes/account.php:1068 www/account/19.php:45 #: www/account/6.php:43 msgid "to install your certificate." -msgstr "" +msgstr "以安装你的证书。" #: www/help/4.php:7 msgid "writing new private key to 'private.key'" @@ -2790,7 +2790,7 @@ msgstr "" #: www/src-lic.php:20 msgid "CAcert Source License" -msgstr "" +msgstr "CAcert 代码许可证" #: www/index/7.php:25 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." @@ -2847,7 +2847,7 @@ msgstr "" #: includes/account_stuff.php:153 includes/general_stuff.php:48 #: includes/tverify_stuff.php:34 msgid "Free digital certificates!" -msgstr "" +msgstr "免费数字证书！" #: www/wot.php:240 #, php-format @@ -2866,7 +2866,7 @@ msgstr "" #: www/wot.php:49 msgid "A reminder notice has been sent." -msgstr "" +msgstr "提示信息已经发送。" #: includes/account_stuff.php:214 www/disputes/0.php:19 msgid "Abuses" @@ -2882,11 +2882,11 @@ msgstr "" #: www/index/16.php:24 www/index/3.php:24 msgid "CAcert's GPG Key" -msgstr "" +msgstr "CAcert 的 GPG 密钥" #: www/account/52.php:39 msgid "Certificate Subject" -msgstr "" +msgstr "证书标题" #: www/index/16.php:17 www/index/3.php:17 msgid "Click here if you want to import the root certificate into Microsoft Internet Explorer" @@ -2894,7 +2894,7 @@ msgstr "" #: www/account/52.php:48 msgid "Comment" -msgstr "" +msgstr "注解" #: includes/account.php:478 includes/account.php:491 includes/account.php:592 #: includes/account.php:1238 includes/account.php:1251 @@ -2904,7 +2904,7 @@ msgstr "" #: www/account/52.php:42 msgid "Current Points" -msgstr "" +msgstr "当前点数" #: www/disputes/6.php:16 #, php-format @@ -2922,7 +2922,7 @@ msgstr "" #: www/gpg/0.php:15 msgid "Paste your GPG key below..." -msgstr "" +msgstr "把你的 GPG 密钥粘贴在下面……" #: www/index/1.php:18 msgid "To get a password that will work, we suggest the following example" @@ -2930,7 +2930,7 @@ msgstr "" #: www/disputes/2.php:20 msgid "Dispute Domain" -msgstr "" +msgstr "有争议的域" #: www/disputes.php:286 www/disputes.php:420 msgid "Dispute Probe" @@ -3543,3 +3543,28 @@ msgstr "" #: www/index/0.php:40 msgid "More News Items" msgstr "" + +#: www/index/6.php:92 +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/general.php:618 +msgid "Failed to make a connection to the mail server" +msgstr "" + +#: includes/account.php:904 www/index.php:204 www/index.php:254 +msgid "For your own security you must enter 5 lost password questions and answers." +msgstr "" + +#: www/wot.php:169 +msgid "Race condition discovered, user altered details during assurance procedure. PLEASE MAKE SURE THE NEW DETAILS BELOW MATCH THE ID DOCUMENTS." +msgstr "" + +#: www/wot.php:53 +msgid "Reminder Notice" +msgstr "" + +#: www/wot.php:49 +#, php-format +msgid "This is a short reminder that you filled out forms to become trusted with CAcert.org, and %s has attempted to issue you points. Please create your account at %s as soon as possible and then notify %s so that the points can be issued." +msgstr "" diff --git a/scripts/clientcerts.php b/scripts/clientcerts.php index c8c33f9..f64181f 100755 --- a/scripts/clientcerts.php +++ b/scripts/clientcerts.php @@ -14,18 +14,14 @@ PARTICULAR PURPOSE. See the License for more details. */ - do - { - $ps = trim(`ps auxww|grep clientcerts.php|grep -v grep|wc -l`); - $ps += trim(`ps auxww|grep servercerts.php|grep -v grep|wc -l`); - if($ps > 1) - usleep(rand(90000, 100000)); - } while($ps > 1); + $lck = fopen('/tmp/SslLock', 'w'); + while(flock($lck, LOCK_EX) < 0) + sleep(rand(100000,200000)); - $monarr = array("Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, - "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12); + $monarr = array('Jan' => 1, 'Feb' => 2, 'Mar' => 3, 'Apr' => 4, 'May' => 5, 'Jun' => 6, + 'Jul' => 7, 'Aug' => 8, 'Sep' => 9, 'Oct' => 10, 'Nov' => 11, 'Dec' => 12); - include_once("/www/includes/mysql.php"); + include_once('/www/includes/mysql.php'); $query = "select * from `emailcerts` where `crt_name`='' and `keytype`='NS'"; $res = mysql_query($query); @@ -318,4 +314,7 @@ $body .= _("Best regards")."\n"._("CAcert.org Support!"); sendmail($user[email], "[CAcert.org] ".sprintf(_("Certificate for %s has been revoked"), $row['CN']), $body, "support@cacert.org", "", "", "CAcert Support"); } + + flock($lck, LOCK_UN); + fclose($lck); ?> diff --git a/scripts/servercerts.php b/scripts/servercerts.php index 32f982c..9b898ac 100755 --- a/scripts/servercerts.php +++ b/scripts/servercerts.php @@ -14,13 +14,9 @@ PARTICULAR PURPOSE. See the License for more details. */ - do - { - $ps = trim(`ps auxww|grep clientcerts.php|grep -v grep|wc -l`); - $ps += trim(`ps auxww|grep servercerts.php|grep -v grep|wc -l`); - if($ps > 1) - usleep(rand(90000, 100000)); - } while($ps > 1); + $lck = fopen('/tmp/SslLock', 'w'); + while(flock($lck, LOCK_EX) < 0) + sleep(rand(100000,200000)); $monarr = array("Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12); @@ -244,4 +240,7 @@ $do = `/usr/bin/openssl crl -in /tmp/cacert-revoke.crl -outform DER -out ../www/revoke.crl > /dev/null 2>&1`; mysql_query("update `orgdomaincerts` set `revoked`=FROM_UNIXTIME(UNIX_TIMESTAMP()) where `id`='$row[id]'"); } + + flock($lck, LOCK_UN); + fclose($lck); ?> diff --git a/www/ac.php b/www/ac.php index 383db07..dd6f1c3 100644 --- a/www/ac.php +++ b/www/ac.php @@ -6,8 +6,7 @@ $s = mysql_real_escape_string($_REQUEST['s']); - $id = intval($_REQUEST['id']); - + $id = mysql_real_escape_string(strip_tags($_REQUEST['id'])); echo "parent._ac_rpc('$id',"; $bits = explode(",", $s); diff --git a/www/gpg.php b/www/gpg.php index 6ff2339..7950e52 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -31,7 +31,7 @@ if($oldid == "0") { - if($_POST['process'] == _("Submit") && $_POST['CSR'] == "") + if($_REQUEST['process'] == _("Submit") && $_REQUEST['CSR'] == "") { $_SESSION['_config']['errmsg'] = _("You failed to paste a valid GPG/PGP key."); $id = $oldid; @@ -39,12 +39,13 @@ } } - if($oldid == "0" && $_POST['CSR'] != "") + if($oldid == "0" && $_REQUEST['CSR'] != "") { - $gpgkey = $_POST['CSR']; - $gpg = mysql_real_escape_string(trim(`echo "$gpgkey"|gpg --with-colons --homedir /tmp 2>&1`)); + $debugkey = $gpgkey = clean_csr(stripslashes($_REQUEST['CSR'])); + $debugpg = $gpg = mysql_real_escape_string(trim(`echo "$gpgkey"|gpg --with-colons --homedir /tmp 2>&1`)); $lines = ""; - foreach(explode("\n", $gpg) as $line) + $gpgarr = explode("\n", $gpg); + foreach($gpgarr as $line) { if(substr($line, 0, 3) == "pub" || substr($line, 0, 3) == "uid") { @@ -113,9 +114,10 @@ if($name == $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix']) continue; $_SESSION['_config']['errmsg'] = _("No suitable name combination could be matched from your PGP/GPG keys to what we have in the database ('$name')"); - unset($_POST['process']); + unset($_REQUEST['process']); $id = $oldid; unset($oldid); + $do = `echo "$debugkey\n--\n$debugpg\n--" >> /www/tmp/gpg.debug`; } } @@ -127,19 +129,21 @@ `email`='".mysql_real_escape_string($email)."' and `deleted`=0 and `hash`=''")) > 0) continue; $_SESSION['_config']['errmsg'] = _("No suitable emails could be matched from your PGP/GPG keys to what we have in the database. ('$email')"); - unset($_POST['process']); + unset($_REQUEST['process']); $id = $oldid; unset($oldid); + $do = `echo "$debugkey\n--\n$debugpg\n--" >> /www/tmp/gpg.debug`; } } else { $_SESSION['_config']['errmsg'] = _("No emails found on your key"); - unset($_POST['process']); + unset($_REQUEST['process']); $id = $oldid; unset($oldid); + $do = `echo "$debugkey\n--\n$debugpg\n--" >> /www/tmp/gpg.debug`; } } - if($oldid == "0" && $_POST['CSR'] != "") + if($oldid == "0" && $_REQUEST['CSR'] != "") { $query = "insert into `gpg` set `memid`='".$_SESSION['profile']['id']."', `email`='".mysql_real_escape_string($emailaddies['0'])."', @@ -150,7 +154,7 @@ $id = mysql_insert_id(); $fp = fopen("../csr/gpg-$id.csr", "w"); - fputs($fp, $_POST['CSR']); + fputs($fp, clean_csr(stripslashes($_REQUEST['CSR']))); fclose($fp); mysql_query("update `gpg` set `csr`='../csr/gpg-$id.csr' where `id`='$id'"); @@ -162,7 +166,8 @@ $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { - echo _("Your certificate request has failed to be processed correctly, please try submitting it again."); + echo _("Your certificate request has failed to be processed correctly, please try submitting it again.")."
\n"; + echo _("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."); } else { echo "
";
 			readfile("../crt/gpg-$id.crt");
diff --git a/www/index.php b/www/index.php
index 9570525..61a3dd0 100644
--- a/www/index.php
+++ b/www/index.php
@@ -18,6 +18,8 @@
                 $key = $val;
 
 	$id = intval($_REQUEST['id']);
+	if($id == 2)
+		$id = 0;
 	$_REQUEST['oldid'] = intval($_REQUEST['oldid']);
 
 	if($id == 17 || $id == 20)
diff --git a/www/logos.php b/www/logos.php
index 213f7e9..e87b864 100644
--- a/www/logos.php
+++ b/www/logos.php
@@ -11,28 +11,11 @@
 

   www.cacert.org


   www.cacert.org  
-  www.cacert.org  
-  www.cacert.org


-  www.cacert.org  
-  www.cacert.org  
-  www.cacert.org


-  www.cacert.org


-  www.cacert.org  
-  www.cacert.org


+  www.cacert.org  


   www.cacert.org  
-  www.cacert.org


-  www.cacert.org  
   www.cacert.org


 

 
-
Image by Paul Drain

-
-
www.cacert.org

-
-
Animated image by Wyatt (December 2004)

-
-
www.cacert.org

-
 
How can I put a logo on to my website?

 
 
It is extremly easy! Just pick an image from the collections above and use it for example with the following html code fragment:
@@ -41,7 +24,7 @@
 

 
 
The result should get you something like:
-www.cacert.org
+www.cacert.org
 

 
 
Create more badges

diff --git a/www/src-lic.php b/www/src-lic.php
index a98df62..a8ef4eb 100644
--- a/www/src-lic.php
+++ b/www/src-lic.php
@@ -1,7 +1,7 @@