summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/about_menu.php2
-rw-r--r--includes/account_stuff.php2
-rw-r--r--includes/general_stuff.php16
-rw-r--r--includes/tverify_stuff.php16
-rw-r--r--locale/ar.po19
-rw-r--r--locale/bg.po19
-rw-r--r--locale/cs.po19
-rw-r--r--locale/da.po19
-rw-r--r--locale/de.po21
-rw-r--r--locale/el.po19
-rw-r--r--locale/es.po19
-rw-r--r--locale/fa.po19
-rw-r--r--locale/fi.po19
-rw-r--r--locale/fr.po21
-rw-r--r--locale/he.po19
-rw-r--r--locale/hr.po19
-rw-r--r--locale/hu.po19
-rw-r--r--locale/is.po19
-rw-r--r--locale/it.po21
-rw-r--r--locale/ja.po19
-rw-r--r--locale/ka.po19
-rw-r--r--locale/ko.po19
-rw-r--r--locale/nb.po19
-rw-r--r--locale/nl.po21
-rw-r--r--locale/pl.po21
-rw-r--r--locale/pt.po21
-rw-r--r--locale/ro.po19
-rw-r--r--locale/ru.po19
-rw-r--r--locale/sv.po21
-rw-r--r--locale/tl.po19
-rw-r--r--locale/tr.po19
-rw-r--r--locale/zh.po19
-rw-r--r--messages.po139
-rw-r--r--pages/account/49.php14
-rw-r--r--pages/index/0.php2
-rwxr-xr-xpages/index/16.php3
-rw-r--r--pages/index/3.php3
-rw-r--r--pages/wot/7-old.php183
-rw-r--r--scripts/21de-ate-essen-email.txt97
-rw-r--r--scripts/21de-ate-essen-mail.php.txt135
-rw-r--r--scripts/22de-ate-aachen-email.txt133
-rw-r--r--scripts/22de-ate-aachen-mail.php.txt141
-rw-r--r--scripts/23au-ate-canberra-email.txt31
-rw-r--r--scripts/23au-ate-canberra-mail.php.txt142
-rw-r--r--scripts/24de-blit2010-email.txt15
-rw-r--r--scripts/24de-blit2010-mail.php.txt147
-rw-r--r--scripts/25de-ate-hamburg-mail.php.txt143
-rw-r--r--scripts/25de-ate-hamburg-mail.txt67
-rw-r--r--scripts/26us-lisa2010-email.txt26
-rw-r--r--scripts/26us-lisa2010-mail.php.txt151
-rw-r--r--scripts/27au-ate-melbourne-email.txt31
-rw-r--r--scripts/27au-ate-melbourne-mail.php.txt156
-rwxr-xr-xscripts/addpoints.php2
-rw-r--r--www/cats/.#cats_import.php.1.2165
-rw-r--r--www/images/CAcert-logo-mono-1000.pngbin0 -> 19406 bytes
-rw-r--r--www/index.php1
-rw-r--r--www/policy/NRPDisclaimerAndLicence.php105
-rw-r--r--www/policy/index.php2
-rw-r--r--www/wot.php2
59 files changed, 1751 insertions, 867 deletions
diff --git a/includes/about_menu.php b/includes/about_menu.php
index ff1e265..f354cfc 100644
--- a/includes/about_menu.php
+++ b/includes/about_menu.php
@@ -2,11 +2,9 @@
<h3 class="pointer" onclick="explode('misc')">+ <?=_("About CAcert.org")?></h3>
<ul class="menu" id="misc">
<li><a href="http://blog.cacert.org/"><?=_("CAcert News")?></a></li>
- <li><a href="/help.php"><?=_("Howto Information")?></a></li>
<li><a href="http://wiki.CAcert.org/"><?=_("Wiki Documentation")?></a></li>
<li><a href="/policy/"><?=_("Policies")?></a></li>
<li><a href="/index.php?id=19"><?=_("Point System")?></a></li>
- <li><a href="/policy/NRPDisclaimerAndLicence.php" target="_blank"><?=_("Disclaimer")?></a></li>
<li><a href="http://bugs.CAcert.org/"><?=_("Bug Database")?></a></li>
<? // <li><a href="/index.php?id=47">< = _ ("PR Materials" ) > </a></li> ?>
<? // <li><a href="/logos.php">< ? = _ ( " CAcert Logos " ) ? > </a></li> ?>
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 39ae5ed..fa6757b 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -168,7 +168,7 @@ function hideall() {
<div id="pageNav">
<div class="relatedLinks">
<h3>CAcert.org</h3>
- <ul class="menu" id="home"><li><a href="index.php"><?=_("Go Home")?></a></li><li><a href="account.php?id=logout"><?=_("Logout")?></a></li></ul>
+ <ul class="menu" id="home"><li><a href="/index.php"><?=_("Go Home")?></a></li><li><a href="account.php?id=logout"><?=_("Logout")?></a></li></ul>
</div>
<div class="relatedLinks">
<h3 class="pointer" onclick="explode('mydetails')">+ <?=_("My Details")?></h3>
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 48d469d..6747c84 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -46,7 +46,7 @@ google_color_border = "FFFFFF";
<a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=1"><?=_("Join")?></a>
<? } ?>
<a href="/policy/CAcertCommunityAgreement.php"><?=_("Community Agreement")?></a>
- <a href="index.php?id=3"><?=_("Root Certificate")?></a>
+ <a href="/index.php?id=3"><?=_("Root Certificate")?></a>
</div>
<? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
<div class="relatedLinks">
@@ -131,17 +131,9 @@ if(!function_exists("showfooter"))
</div>
<? include("sponsorinfo.php") ?>
<div id="siteInfo">
-<? if(!array_key_exists('HTTPS',$_SERVER) || !$_SERVER["HTTPS"]) { ?><!--ONESTAT SCRIPTCODE START-->
-<script type="text/javascript" src="onestat.js"></script>
-<noscript>
-<a href="http://www.onestat.com/asp/login.asp?sid=164863">
-<img src="http://stat.onestat.com/asp/stat.asp?tagver=1&amp;sid=164863&amp;js=no&amp;" alt="this site tracked by onestat.com" />
-</a>
-</noscript>
-<!--ONESTAT SCRIPTCODE END--><? } ?>
- <a href="index.php?id=12"><?=_("About Us")?></a> | <a href="index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
- <a href="index.php?id=10"><?=_("Privacy Policy")?></a> |
- <a href="index.php?id=51"><?=_("Mission Statement")?></a> | <a href="index.php?id=11"><?=_("Contact Us")?></a> |
+ <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
+ <a href="/index.php?id=10"><?=_("Privacy Policy")?></a> |
+ <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> |
&copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
</div>
</body>
diff --git a/includes/tverify_stuff.php b/includes/tverify_stuff.php
index 2053aaa..46f49f6 100644
--- a/includes/tverify_stuff.php
+++ b/includes/tverify_stuff.php
@@ -66,18 +66,10 @@ if(!function_exists("showfooter"))
</div>
</div>
<div id="siteInfo">
-<? if(!$_SERVER["HTTPS"]) { ?><!--ONESTAT SCRIPTCODE START-->
-<script type="text/javascript" src="onestat.js"></script>
-<noscript>
-<a href="http://www.onestat.com/asp/login.asp?sid=164863">
-<img src="http://stat.onestat.com/asp/stat.asp?tagver=1&amp;sid=164863&amp;js=no&amp;" alt="this site tracked by onestat.com" />
-</a>
-</noscript>
-<!--ONESTAT SCRIPTCODE END--><? } ?>
- <a href="index.php?id=12"><?=_("About Us")?></a> | <a href="index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
- <a href="index.php?id=10"><?=_("Privacy Policy")?></a> |
- <a href="index.php?id=51"><?=_("Mission Statement")?></a> | <a href="index.php?id=11"><?=_("Contact Us")?></a> |
- <a href="index.php?id=19"><?=_("Further Information")?></a> | &copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
+ <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
+ <a href="/index.php?id=10"><?=_("Privacy Policy")?></a> |
+ <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> |
+ <a href="/index.php?id=19"><?=_("Further Information")?></a> | &copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
</div>
</body>
</html><?
diff --git a/locale/ar.po b/locale/ar.po
index 061c16d..69cbdce 100644
--- a/locale/ar.po
+++ b/locale/ar.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: 2010-08-02 20:57:28+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:13+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/bg.po b/locale/bg.po
index bc40693..a1dca24 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: 2010-08-02 20:57:11+0000\n"
+"PO-Revision-Date: 2010-08-05 13:28:56+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "&#1050;&#1072;&#1082; &#1076;&#1072; &#1086;&#1073;&#1085;&#1086;&#1074;
msgid "How?"
msgstr "&#1050;&#1072;&#1082;?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "&#1048;&#1085;&#1092;&#1086;&#1088;&#1084;&#1072;&#1094;&#1080;&#1103; &quot;&#1050;&#1072;&#1082; &#1076;&#1072;...&quot;"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "&#1053;&#1103;&#1084;&#1072;&#1084; &#1090;&#1098;&#1088;&#1087;&#1077;&#1085;&#1080;&#1077; &#1076;&#1072; &#1079;&#1072;&#1087;&#1086;&#1095;&#1085; &#1076;&#1072; &#1080;&#1079;&#1087;&#1088;&#1072;&#1097;&#1072;&#1084; &#1082;&#1090;&#1080;&#1087;&#1090;&#1080;&#1088;&#1072;&#1085;&#1072; &#1087;&#1086;&#1097;&#1072;!"
@@ -959,6 +955,11 @@ msgstr "&#1047;&#1072;&#1103;&#1074;&#1082;&#1072;&#1090;&#1072; &#1079;&#1072;
msgid "I don't want to be listed"
msgstr "&#1053;&#1077; &#1078;&#1077;&#1083;&#1072;&#1103; &#1076;&#1072; &#1073;&#1098;&#1076;&#1072; &#1074;&#1082;&#1083;&#1102;&#1095;&#1077;&#1085; &#1074; &#1089;&#1087;&#1080;&#1089;&#1098;&#1082;&#1072;."
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "&#1040;&#1079;, &#1087;&#1086; &#1090;&#1086;&#1079;&#1080; &#1085;&#1072;&#1095;&#1080;&#1085;, &#1087;&#1086;&#1090;&#1074;&#1098;&#1088;&#1078;&#1076;&#1072;&#1074;&#1072;&#1084; &#1095;&#1077; &#1089;&#1098;&#1084; &#1085;&#1072;&#1087;&#1098;&#1083;&#1085;&#1086; &#1086;&#1090;&#1086;&#1088;&#1080;&#1079;&#1080;&#1088;&#1072;&#1085; &#1086;&#1090; &#1089;&#1086;&#1073;&#1089;&#1090;&#1074;&#1077;&#1085;&#1080;&#1082;&#1072; &#1085;&#1072; &#1080;&#1085;&#1092;&#1086;&#1088;&#1084;&#1072;&#1094;&#1080;&#1103;&#1090;&#1072; &#1089;&#1098;&#1076;&#1098;&#1088;&#1078;&#1072;&#1097;&#1072; &#1089;&#1077; &#1074; CSR-&#1072; &#1080;&#1079;&#1087;&#1088;&#1072;&#1088;&#1090;&#1077;&#1085; &#1076;&#1086; CAcert Inc. &#1076;&#1072; &#1082;&#1072;&#1085;&#1076;&#1080;&#1076;&#1072;&#1090;&#1089;&#1090;&#1074;&#1072;&#1084; &#1079;&#1072; &#1062;&#1080;&#1092;&#1088;&#1086;&#1074; &#1089;&#1077;&#1088;&#1090;&#1080;&#1092;&#1080;&#1082;&#1072;&#1090; &#1079;&#1072; &#1089;&#1080;&#1075;&#1091;&#1088;&#1085;&#1080; &#1080; &#1091;&#1076;&#1086;&#1089;&#1090;&#1086;&#1074;&#1077;&#1088;&#1077;&#1085;&#1080; &#1077;&#1083;&#1077;&#1082;&#1090;&#1088;&#1086;&#1085;&#1085;&#1080; &#1090;&#1088;&#1072;&#1085;&#1079;&#1072;&#1082;&#1094;&#1080;&#1080;. &#1056;&#1072;&#1079;&#1073;&#1080;&#1088;&#1072;&#1084; &#1095;&#1077; &#1094;&#1080;&#1092;&#1088;&#1086;&#1074;&#1080;&#1090;&#1077; &#1089;&#1077;&#1088;&#1090;&#1080;&#1092;&#1080;&#1082;&#1072;&#1090;&#1080; &#1089;&#1083;&#1091;&#1078;&#1072;&#1090; &#1076;&#1072; &#1091;&#1076;&#1086;&#1089;&#1090;&#1086;&#1074;&#1077;&#1088;&#1103;&#1090; &#1089;&#1072;&#1084;&#1086;&#1083;&#1080;&#1095;&#1085;&#1086;&#1089;&#1090;&#1090;&#1072; &#1085;&#1072; &#1040;&#1073;&#1086;&#1085;&#1072;&#1090;&#1072; &#1079;&#1072; &#1094;&#1077;&#1083;&#1080;&#1090;&#1077; &#1085;&#1072; &#1077;&#1083;&#1077;&#1082;&#1090;&#1088;&#1086;&#1085;&#1085;&#1072;&#1090;&#1072; &#1082;&#1086;&#1084;&#1091;&#1085;&#1080;&#1082;&#1072;&#1094;&#1080;&#1103; &#1080; &#1095;&#1077; &#1091;&#1087;&#1088;&#1072;&#1074;&#1083;&#1077;&#1085;&#1080;&#1077;&#1090;&#1086; &#1080; &#1089;&#1098;&#1093;&#1088;&#1072;&#1085;&#1077;&#1085;&#1080;&#1077;&#1090;&#1086; &#1085;&#1072; &#1095;&#1072;&#1089;&#1090;&#1085;&#1080;&#1090;&#1077; &#1082;&#1083;&#1102;&#1095;&#1086;&#1074;&#1077; &#1072;&#1089;&#1086;&#1094;&#1080;&#1080;&#1088;&#1072;&#1085;&#1080; &#1089; &#1090;&#1072;&#1082;&#1080;&#1074;&#1072; &#1089;&#1077;&#1088;&#1090;&#1080;&#1092;&#1080;&#1082;&#1072;&#1090;&#1080; &#1077; &#1075;&#1088;&#1080;&#1078;&#1072; &#1080; &#1086;&#1090;&#1075;&#1086;&#1074;&#1086;&#1088;&#1085;&#1086;&#1089;&#1090; &#1085;&#1072; &#1090;&#1077;&#1093;&#1085;&#1080;&#1095;&#1077;&#1089;&#1082;&#1080;&#1103;&#1090; &#1087;&#1088;&#1077;&#1089;&#1086;&#1085;&#1072;&#1083; &#1085;&#1072; &#1040;&#1073;&#1086;&#1085;&#1072;&#1090;&#1072; &#1080;/&#1080;&#1083;&#1080; &#1085;&#1077;&#1075;&#1086;&#1074;&#1080;&#1090;&#1077; &#1087;&#1072;&#1088;&#1090;&#1085;&#1100;&#1086;&#1088;&#1080;."
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/cs.po b/locale/cs.po
index 828bdaa..fb293ff 100644
--- a/locale/cs.po
+++ b/locale/cs.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: 2010-08-02 20:57:31+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:16+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr "Jak?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Informace Howto"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Nemohu se do&#269;kat, a&#382; budu moci za&#269;&iacute;t pos&iacute;lat &scaron;ifrovan&eacute; emaily!"
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr "Nechci b&yacute;t zobrazen v seznamu"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/da.po b/locale/da.po
index a73083c..ebbb1bb 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: 2010-08-02 20:57:13+0000\n"
+"PO-Revision-Date: 2010-08-05 13:28:57+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Hvordan du opdatere, retter eller sletter dine informationer"
msgid "How?"
msgstr "Hvordan?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Howto info"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Jeg gl&aelig;der mig til at kunne begynde med at sende krypterede emails!"
@@ -959,6 +955,11 @@ msgstr "Jeg modtog ikke et gyldigt Certificate Request, tryk p&aring; tilbage kn
msgid "I don't want to be listed"
msgstr "I &oslash;nsker ikke at v&aelig;re listet"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Jeg bekr&aelig;fter hermed at jeg er fuldt autoriseret af ejeren af informationen som er indeholdt i denne CSR der hermed sendes til CAcert Inc. som ans&oslash;gning om et digitalt signatur til brug for sikker og authentificeret elektroniske transaktioner. Jeg er klar over at et digitalt signaturs form&aring;l er at identificere ans&oslash;geren n&aring;r denne anvender elektronisk kommunikation samt at ansvaret for h&aring;ndteringen af de private n&oslash;gler som h&oslash;rer til certifikaterne ligger hos ans&oslash;gerens tekniske ansatte eller andre der har f&aring;et overf&oslash;rt denne opgave."
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/de.po b/locale/de.po
index 26f2ad7..5c1ed9c 100644
--- a/locale/de.po
+++ b/locale/de.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: 2010-08-02 20:57:14+0000\n"
+"PO-Revision-Date: 2010-08-05 13:28:58+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Eigene Daten &auml;nderen, korrigieren oder l&ouml;schen"
msgid "How?"
msgstr "Wie?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Hilfestellung"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Ich kann es nicht erwarten eigene verschl&uuml;sselte E-Mails zu versenden!"
@@ -959,6 +955,11 @@ msgstr "Wir haben keine g&uuml;ltige Zertifikat-Anfrage (CSR) bekommen. Klicken
msgid "I don't want to be listed"
msgstr "Ich will nicht im Benutzerverzeichnis aufgelistet werden"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Ich best&auml;tige hiermit, dass ich bevollm&auml;chtigt bin, im Namen der im der im CSR (Zertifikat-Anfrage) an CAcert angegebenen Person, ein Digitales Zertifikat zu f&uuml;r sichere und authentifizierte elektronische Transaktionen zu beantragen. Ich verstehe, dass ein digitales Zertifikat zur Identifizierung der Teilnehmer einer elektronischen Kommunikation vorgesehen ist, und dass ich selbst f&uuml;r die Aufbewahrung der privaten Schl&uuml;ssel die mit dem Zertifikat verbunden sind verantwortlich bin."
@@ -4501,10 +4502,6 @@ msgstr "CAcert Public-Relations Material"
msgid "Colour version"
msgstr "Farbversion"
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr "Haftungsausschluss"
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr "Fehler: Sowohl Name als auch Email Adresse sind leer"
@@ -4611,10 +4608,10 @@ msgstr "Ich habe keine g&uuml;ltige Zertifikatsanfrage bekommen, bitte versuchen
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr "Wenn Sie kostenlose Zertifikate ausgestellt haben wollen, treten Sie der %s CAcert-Gemeinschaft %s bei."
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
-msgstr "Wenn Sie die von CAcert ausgestellten Zertifikate verwenden wollen, lesen Sie bitte CAcert-%s Haftungsausschluss und Lizenz %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
msgid "More information about CAcert Incorporated:"
diff --git a/locale/el.po b/locale/el.po
index 533d8e9..17d42ba 100644
--- a/locale/el.po
+++ b/locale/el.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: 2010-08-02 20:57:29+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:13+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "&Pi;&lambda;&eta;&rho;&omicron;&phi;&omicron;&rho;&#943;&epsilon;&sigmaf; &Epsilon;&pi;&iota;&kappa;&omicron;&iota;&nu;&omega;&nu;&#943;&alpha;&sigmaf;"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr "&Delta;&epsilon;&nu; &epsilon;&lambda;&#942;&phi;&theta;&eta; &#941;&gam
msgid "I don't want to be listed"
msgstr "&Delta;&epsilon;&nu; &epsilon;&pi;&iota;&theta;&upsilon;&mu;&#974; &nu;&alpha; &epsilon;&mu;&phi;&alpha;&nu;&#943;&zeta;&omicron;&nu;&tau;&alpha;&iota; &tau;&alpha; &sigma;&tau;&omicron;&iota;&chi;&epsilon;&#943;&alpha; &mu;&omicron;&upsilon;"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/es.po b/locale/es.po
index 3db083e..9ed9101 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: 2010-08-02 20:57:14+0000\n"
+"PO-Revision-Date: 2010-08-05 13:28:59+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "C&oacute;mo actualizar, corregir o eliminar su informaci&oacute;n"
msgid "How?"
msgstr "Como?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Informaci&oacute;n de Contacto"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "No puedo esperar para enviar correos encriptados!"
@@ -959,6 +955,11 @@ msgstr "No se ha recibido una Solicitud de Certificado v&aacute;lida, presione e
msgid "I don't want to be listed"
msgstr "No quiero ser listado"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Por la presente solicito un Certificado Digital para transacciones seguras y autenticadas en nombre y con autorizaci&oacute;n del propietario cuya informaci&oacute;n est&aacute; contenida en la CSR enviada a CAcer Inc. Entiendo que un certificado digital sirve para identificar a su benefiario en comunicaciones electr&oacute;nicas y que la custodia de las claves privadas asociadas con ese certificado es responsabilidad del personal t&eacute;cnico de dicho beneficiario o de sus servicios t&eacute;cnicos externos."
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/fa.po b/locale/fa.po
index db36069..39341e0 100644
--- a/locale/fa.po
+++ b/locale/fa.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: 2010-08-02 20:57:25+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:09+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/fi.po b/locale/fi.po
index 0d7b8fd..ea160c4 100644
--- a/locale/fi.po
+++ b/locale/fi.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: 2010-08-02 20:57:16+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:00+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Kuinka muokkaat, tarkistat tai poistat tietojasi"
msgid "How?"
msgstr "Kuinka?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Ohjeita"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "En voi odottaa p&auml;&auml;st&auml;kseni l&auml;hett&auml;m&auml;&auml;n salattuja s&auml;hk&ouml;posteja!"
@@ -959,6 +955,11 @@ msgstr "Varmennepyynt&ouml; (CSR) oli ep&auml;kelpo, palaa takaisin ja yrit&auml
msgid "I don't want to be listed"
msgstr "En halua n&auml;ky&auml; luettelossa"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "T&auml;ten takaan ett&auml; olen varmennepyynn&ouml;n (CSR) tietojen omistajan valtuuttama hankkimaan s&auml;hk&ouml;isen varmenteen turvalliselle ja varmennetulle s&auml;hk&ouml;iselle liikenteelle. Ymm&auml;rr&auml;n ett&auml; s&auml;hk&ouml;inen varmenne yksil&ouml;i k&auml;ytt&auml;j&auml;n s&auml;hk&ouml;isess&auml; viestinn&auml;ss&auml; ja ett&auml; varmenteiden salaisten avaimien hallinta on hakijan teknisen henkil&ouml;kunnan ja/tai sopimuskumppaneiden vastuulla."
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/fr.po b/locale/fr.po
index 0f6996f..b0a1bef 100644
--- a/locale/fr.po
+++ b/locale/fr.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: 2010-08-02 20:57:15+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:00+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Comment mettre &agrave; jour, corriger ou supprimer vos informations"
msgid "How?"
msgstr "Comment ?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Informations G&eacute;n&eacute;rales"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Je ne peux plus attendre d'envoyer des emails chiffr&eacute;s !"
@@ -959,6 +955,11 @@ msgstr "Je n'ai pas re&ccedil;u de requ&ecirc;te de certificat valide, cliquez s
msgid "I don't want to be listed"
msgstr "Je ne veux pas &ecirc;tre list&eacute;"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr "Documents de relations publiques CAcert"
msgid "Colour version"
msgstr "Version couleur"
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr "Avertissement"
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr "Erreur: le nom et l'adresse email sont vides"
@@ -4611,10 +4608,10 @@ msgstr "Je n'ai pas re&ccedil;u une demande de certificat valide, merci d'essaye
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr "Si vous souhaitez recevoir des certificats gratuits &agrave; votre nom, rejoignez la %s Communaut&eacute; CAcert %s."
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
-msgstr "Si vous souhaitez utiliser des certificats d&eacute;livr&eacute;s par CAcert, lisez les %s avertissements et licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
msgid "More information about CAcert Incorporated:"
diff --git a/locale/he.po b/locale/he.po
index d024981..bc4dea3 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: 2010-08-02 20:57:17+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:01+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "&amp;#1499;&amp;#1497;&amp;#1510;&amp;#1491; &amp;#1500;&amp;#1506;&amp;
msgid "How?"
msgstr "&amp;#1499;&amp;#1497;&amp;#1510;&amp;#1491;?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "&amp;#1488;&amp;#1504;&amp;#1497; &amp;#1500;&amp;#1488; &amp;#1497;&amp;#1499;&amp;#1493;&amp;#1500; &amp;#1500;&amp;#1495;&amp;#1499;&amp;#1493;&amp;#1514; &amp;#1500;&amp;#1492;&amp;#1514;&amp;#1495;&amp;#1497;&amp;#1500; &amp;#1500;&amp;#1513;&amp;#1500;&amp;#1493;&amp;#1495; &amp;#1491;&amp;#1493;&amp;#1488;&amp;#1512; &amp;#1488;&amp;#1500;&amp;#1511;&amp;#1496;&amp;#1512;&amp;#1493;&amp;#1504;&amp;#1497; &amp;#1502;&amp;#1493;&amp;#1510;&amp;#1508;&amp;#1503;!"
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr "&amp;#1488;&amp;#1504;&amp;#1497; &amp;#1500;&amp;#1488; &amp;#1512;&amp;#1493;&amp;#1510;&amp;#1492; &amp;#1500;&amp;#1492;&amp;#1497;&amp;#1493;&amp;#1514; &amp;#1512;&amp;#1513;&amp;#1493;&amp;#1501; &amp;#1489;&amp;#1512;&amp;#1513;&amp;#1497;&amp;#1502;&amp;#1492;"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/hr.po b/locale/hr.po
index d86c566..f2b0ff6 100644
--- a/locale/hr.po
+++ b/locale/hr.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: 2010-08-02 20:57:18+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:02+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/hu.po b/locale/hu.po
index f2c4897..7109975 100644
--- a/locale/hu.po
+++ b/locale/hu.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: 2010-08-02 20:57:19+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:03+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Hogyan tudja friss&iacute;teni, m&oacute;dos&iacute;tani, vagy t&ouml;r&
msgid "How?"
msgstr "Hogyan?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Kapcsolat inform&aacute;ci&oacute;"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Nem gy&#337;z&ouml;m kiv&aacute;rni, hogy titkos&iacute;tott leveleket k&uuml;ldhessek!"
@@ -959,6 +955,11 @@ msgstr "Nem kaptam &eacute;rv&eacute;nyes tan&uacute;s&iacute;tv&aacute;ny k&eac
msgid "I don't want to be listed"
msgstr "Nem szeretn&eacute;m, hogy felsoroljanak"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "&Eacute;n itt tudatom, hogy a CAcert Inc-hez k&uuml;ld&ouml;tt CSR-ben tal&aacute;lhat&oacute; inform&aacute;ci&oacute;j&aacute;nak tulajdonosa &aacute;ltal, teljesen felhetalmazott vagyok arra, hogy digit&aacute;lis tanus&iacute;tv&aacute;nyt k&eacute;rjek titkos&iacute;tott &eacute;s azonos&iacute;tott elektronikus tranzakci&oacute;khoz. Meg&eacute;rtettem, hogy a digit&aacute;lis tanus&iacute;tv&aacute;ny azt a c&eacute;lt szolg&aacute;lja, hogy igazolja a feliratkozottat elektronikus kommunik&aacute;ci&oacute;hoz &eacute;s hogy az ilyen tanus&iacute;tv&aacute;nyokhoz rendelt priv&aacute;t kulcsok kezel&eacute;se a feliratkozott tecjnikai szem&eacute;lyzete &eacute;s/vagy kapcsolattartoj&aacute;nak felel&#337;s&eacute;ge."
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/is.po b/locale/is.po
index 9d68a9d..266b196 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: 2010-08-02 20:57:33+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:18+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Hvernig &aacute; a&eth; uppf&aelig;ra, lei&eth;r&eacute;tta e&eth;a ey&e
msgid "How?"
msgstr "Hvernig?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Howto hj&aacute;lpin"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr "Mig langar ekki til a&eth; vera skr&aacute;&eth;(ur)"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/it.po b/locale/it.po
index 8cb68ae..aa6bbf6 100644
--- a/locale/it.po
+++ b/locale/it.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: 2010-08-02 20:57:20+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:04+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Come aggiornare, correggere o cancellare le tue informazioni"
msgid "How?"
msgstr "Come?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Come fare"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Non vedo l'ora di cominciare a inviare e-mail cifrate!"
@@ -959,6 +955,11 @@ msgstr "Non &egrave; stata ricevuta una Richiesta di Certificato valida, premi i
msgid "I don't want to be listed"
msgstr "Non voglio essere elencato"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Dichiaro di essere autorizzato dal proprietario delle informazioni contenute nella Richiesta di Certificazione (CSR - Certificate Signing Request) inviata a CAcert, Inc. di richiedere un Certificato Digitale da utilizzare per comunicazioni elettroniche sicure e autenticate. Ho compreso che un certificato digitale serve a identificare il sottoscrittore per gli scopi della comunicazione elettronica e che la gestione delle chiavi private associate a tale certificato &egrave; di responsabilit&agrave; dello staff tecnico e/o dei contraenti del sottoscrittore."
@@ -4501,10 +4502,6 @@ msgstr "Materiale di CAcert per le pubbliche relazioni"
msgid "Colour version"
msgstr "Versione a colori"
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr "Limitazione di responsabilit&agrave;"
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr "Errore: sia il nome che l'indirizzo e-mail sono vuoti"
@@ -4611,10 +4608,10 @@ msgstr "Non &egrave; stata ricevuta una richiesta di certificato valida, per fav
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr "Se vuoi avere certificati gratuiti per te, entra a far parte della %s Comunit&agrave; CAcert %s."
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
-msgstr "Se vuoi utilizzare i certificati emessi da CAcert, leggi la %s Limitazione di responsabilit&agrave; e Licenza %s di CAcert."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
msgid "More information about CAcert Incorporated:"
diff --git a/locale/ja.po b/locale/ja.po
index ad41217..ca98c5e 100644
--- a/locale/ja.po
+++ b/locale/ja.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: 2010-08-02 20:57:20+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:05+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "&#12354;&#12394;&#12383;&#12398;&#24773;&#22577;&#12398;&#26356;&#26032;
msgid "How?"
msgstr "&#12393;&#12358;&#12420;&#12387;&#12390;?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "HowTo &#24773;&#22577;"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "&#26263;&#21495;&#21270;&#12375;&#12383;&#12513;&#12540;&#12523;&#12434;&#20170;&#12377;&#12368;&#36865;&#12426;&#12383;&#12356;&#12435;&#12384;&#12369;&#12393;!"
@@ -959,6 +955,11 @@ msgstr "&#26377;&#21177;&#12394;&#35388;&#26126;&#26360;&#35201;&#27714;&#12434;
msgid "I don't want to be listed"
msgstr "&#12522;&#12473;&#12488;&#12395;&#36861;&#21152;&#12375;&#12394;&#12356;&#12391;&#12411;&#12375;&#12356;"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/ka.po b/locale/ka.po
index f991475..b165234 100644
--- a/locale/ka.po
+++ b/locale/ka.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: 2010-08-02 20:57:32+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:18+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/ko.po b/locale/ko.po
index 013656e..6e9a349 100644
--- a/locale/ko.po
+++ b/locale/ko.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: 2010-08-02 20:57:34+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:19+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/nb.po b/locale/nb.po
index 0b3e7e5..6cd2ad8 100644
--- a/locale/nb.po
+++ b/locale/nb.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: 2010-08-02 20:57:34+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:20+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Hvordan oppdatere, rette, eller slette din informasjon"
msgid "How?"
msgstr "Hvordan?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Jeg kan ikke vente med &aring; sende kryptert epost!"
@@ -959,6 +955,11 @@ msgstr "Jeg mottok ikke en gyldig sertifikatforesp&oslash;rsel, g&aring; tilbake
msgid "I don't want to be listed"
msgstr "Jeg vil ikke bli skrevet opp"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/nl.po b/locale/nl.po
index f7b4eb9..4015fd9 100644
--- a/locale/nl.po
+++ b/locale/nl.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: 2010-08-02 20:57:21+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:06+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Hoe u uw gegevens kan aanpassen of verwijderen"
msgid "How?"
msgstr "Hoe?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "'Howto' informatie"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Ik kan niet wachten om te beginnen met versleutelde e-mail berichten"
@@ -959,6 +955,11 @@ msgstr "Er is geen geldige certificaatsaanvraag ontvangen. Klik op de 'terug' kn
msgid "I don't want to be listed"
msgstr "Ik wil niet op de lijst vermeld worden"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Ik verklaar hiermee dat ik volledig geautoriseerd ben door de houder van de informatie die in de CSR is opgenomen. Dit CSR is verstuurd aan CAcert Inc. voor het aanvragen van een Digitaal Certificaat bedoeld voor beveiligde en geautoriseerde transacties. Ik begrijp dat het digitale certificaat de mogelijkheid biedt om de identiteit van 'de ingeschrevene' vast te stellen voor elektronische gegevensoverdracht en dat het beheer van de private keys die bij zo'n certificaat horen de verantwoordelijkheid zijn van de technische staf en/of contractors."
@@ -4501,10 +4502,6 @@ msgstr "CAcert Public Relations materiaal"
msgid "Colour version"
msgstr "Kleuren versie"
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr "Disclaimer"
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr "Fout: Zowel Naam als E-mail Adres zijn leeg"
@@ -4611,10 +4608,10 @@ msgstr "Ik heb geen geldig Certificaat Verzoek ontvangen. Wilt u s.v.p. een ande
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr "Als u gratis certificaten op uw naam uitgeschreven wilt hebben, schrijf u dan in bij de %s CAcert Community %s."
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
-msgstr "Als u certificaten wilt gebruiken die uitgeschreven zijn door CAcert, lees dan de CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
msgid "More information about CAcert Incorporated:"
diff --git a/locale/pl.po b/locale/pl.po
index 464866e..e6fe9bb 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: 2010-08-02 20:57:31+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:15+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Jak poprawi&#263;, uzupe&#322;ni&#263; albo usun&#261;&#263; moje inform
msgid "How?"
msgstr "Jak?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Informacje Howto"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Nie mog&#281; si&#281; ju&#380; doczeka&#263; wysy&#322;ania zaszyfrowanych maili!"
@@ -959,6 +955,11 @@ msgstr "Nie otrzyma&#322;em poprawnego Certificate Request, wci&#347;niej wstecz
msgid "I don't want to be listed"
msgstr "Nie chc&#281; by&#263; wy&#347;wietlany"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Niniejszym o&#347;wiadczam, &#380;e jestem w pe&#322;ni upowa&#380;niony przez w&#322;a&#347;ciciela informacji zawartych w Wniosku o Wydanie Certyfikatu (CRS) przes&#322;anego co CAcert Inc. do ubiegania si&#281; o cyfrowy ceryfikat dla bezpiecznych i autoryzowanych transakcji elektronicznych. Rozumiem, &#380;e certyfikat s&#322;u&#380;y do identyfikacji subskrybenta dla cel&oacute;w komunizacji elektronicznej i &#380;e odpowiedzialno&#347;&#263; za zarz&#261;dzanie kluczami prywatnymi zwi&#261;zanymi z takimi certyfikatami spoczywa na personelu technicznym subskrybenta lub jego kontrahentach."
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,10 +4608,10 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr "Jeżeli chcesz mieć swobodny i darmowy dostęp do certyfikat&oacute;w, przyłącz się do %s CAcert Community %s."
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
-msgstr "Jeśli chcesz używać certyfikat&oacute;w wydanych przez CAcert, przeczytaj CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
msgid "More information about CAcert Incorporated:"
diff --git a/locale/pt.po b/locale/pt.po
index d4a52af..c5e7086 100644
--- a/locale/pt.po
+++ b/locale/pt.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: 2010-08-02 20:57:22+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:07+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Como atualizar, corrigir ou apagar a sua informa&ccedil;&atilde;o"
msgid "How?"
msgstr "Como?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Informa&ccedil;&otilde;es de Contato"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Mal posso esperar para come&ccedil;ar a enviar emails encriptados!"
@@ -959,6 +955,11 @@ msgstr "Requisi&ccedil;&atilde;o de Certificado recebida &eacute; inv&aacute;lid
msgid "I don't want to be listed"
msgstr "N&atilde;o quero ser listado"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Eu declaro por este meio que estou totalmente autorizado pelo propriet&aacute;rio da informa&ccedil;&atilde;o contida no CSR enviado &agrave; CAcert Inc. para requisitar o Certificado Digital para comunica&ccedil;&otilde;es eletr&ocirc;nicas seguras e autenticadas. Eu entendo que um certificado digital serve para identificar o assinante para fins de comunica&ccedil;&atilde;o eletr&ocirc;nica e que o gerenciamento das chaves privadas associadas a tais certificados, &eacute; da responsabilidade da equipa t&eacute;cnica ou contratados do assinante."
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,10 +4608,10 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr "Se voc&ecirc; deseja receber certificados gratuitos, junte-se a %s Comunidade CAcert %s."
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
-msgstr "Se voc&ecirc; deseja utilizar certificados emitidos pela CAcert, leia o nosso %s Termo de Uso %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
msgid "More information about CAcert Incorporated:"
diff --git a/locale/ro.po b/locale/ro.po
index e3da6e9..a8c895e 100644
--- a/locale/ro.po
+++ b/locale/ro.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: 2010-08-02 20:57:23+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:08+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/ru.po b/locale/ru.po
index cde54ed..5a6f2f9 100644
--- a/locale/ru.po
+++ b/locale/ru.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: 2010-08-02 20:57:24+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:09+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Теперь обновите, поправьте или удалите
msgid "How?"
msgstr "Как?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Я не могу дождаться, чтобы начать отправлять зашифрованные письма!"
@@ -959,6 +955,11 @@ msgstr "Я не получил верный запрос на сертифика
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr "Цветной вариант"
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr "Отречение"
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/sv.po b/locale/sv.po
index 1f76649..b0b5270 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: 2010-08-02 20:57:25+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:10+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Hur du uppdaterar, r&auml;ttar eller tar bort din information"
msgid "How?"
msgstr "Hur?"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Howto-information"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "Jag vill genast b&ouml;rja skicka krypterade e-brev!"
@@ -959,6 +955,11 @@ msgstr "Jag tog inte emot en giltig certfikatbeg&auml;ran. Tryck p&aring; Bak&ar
msgid "I don't want to be listed"
msgstr "Jag vill inte bli listad"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "Jag intygar h&auml;rmed att jag &auml;r den r&auml;ttm&auml;tige &auml;garen till informationen i denna CSR som s&auml;nds till CAcert Inc. som en del av en ans&ouml;kan om ett digitalt certifikat f&ouml;r s&auml;kra och autentiserade transaktioner. Jag &auml;r inf&ouml;rst&aring;dd med att ett digitalt servercertifikat &auml;r till f&ouml;r att identifiera anv&auml;ndaren i samband med elektronisk kommunikation och att hanteringen av privata nycklar associerade med s&aring;dana certifikat tillh&ouml;r anv&auml;ndarens tekniska avdelning och/eller underleverant&ouml;rer."
@@ -4501,10 +4502,6 @@ msgstr "PR-material f&ouml;r CAcert"
msgid "Colour version"
msgstr "F&auml;rgversion"
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr "Friskrivning"
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr "Fel: B&aring;de namn och e-postadress &auml;r tomma"
@@ -4611,10 +4608,10 @@ msgstr "Jag fick inte in en giltig certifikatbeg&auml;ran, v&auml;nligen f&ouml;
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr "Om du vill ha gratis certifikat utf&auml;rdade till dig, g&aring; med i %sCAcert-gemenskapen%s."
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
-msgstr "Om du vill anv&auml;nda certifikat utf&auml;rdade av CAcert, l&auml;s CAcerts %sfriskrivning och licens%s. "
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
msgid "More information about CAcert Incorporated:"
diff --git a/locale/tl.po b/locale/tl.po
index 058daca..75cd201 100644
--- a/locale/tl.po
+++ b/locale/tl.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: 2010-08-02 20:57:30+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:14+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr ""
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr ""
msgid "I don't want to be listed"
msgstr ""
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/tr.po b/locale/tr.po
index 1ef73ca..4edfd57 100644
--- a/locale/tr.po
+++ b/locale/tr.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: 2010-08-02 20:57:26+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:11+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "Nasl bilginizi gnceller, dzeltir ve silersiniz"
msgid "How?"
msgstr ""
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "Nasl Bilgisi"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr "ifreli e-posta gnderimine balamak iin sabrszlanyorum'"
@@ -959,6 +955,11 @@ msgstr "Geerli Sertifia Talebi alamadm, geri butonuna basarak tekrar deneyiniz"
msgid "I don't want to be listed"
msgstr "Listede yer almak istemiyorum"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr ""
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/locale/zh.po b/locale/zh.po
index cdd5ac7..cd67c8c 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: 2010-08-02 20:57:27+0000\n"
+"PO-Revision-Date: 2010-08-05 13:29:12+0000\n"
"Last-Translator: Someone <someone@someisp.com>\n"
"Language-Team: <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -938,10 +938,6 @@ msgstr "&#22914;&#20309;&#26356;&#26032;&#12289;&#26356;&#27491;&#12289;&#25110;
msgid "How?"
msgstr "&#24590;&#20040;&#26679;&#65311;"
-#: includes/general_stuff.php:64
-msgid "Howto Information"
-msgstr "&#32852;&#31995;&#20449;&#24687;"
-
#: www/help/2.php:9 www/help/2.php:41
msgid "I can't wait to start sending encrypted emails!"
msgstr ""
@@ -959,6 +955,11 @@ msgstr "&#25105;&#27809;&#26377;&#21463;&#21040;&#20219;&#20309;&#26377;&#25928;
msgid "I don't want to be listed"
msgstr "&#25105;&#19981;&#24819;&#34987;&#21015;&#20986;"
+#: pages/index/0.php:22
+#, php-format
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
+msgstr ""
+
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors."
msgstr "&#25105;&#22312;&#27492;&#23459;&#31216;&#65292;&#21457;&#36865;&#32473; CAcert Inc. &#30340; CSR &#20013;&#25152;&#21253;&#21547;&#20449;&#24687;&#30340;&#25317;&#26377;&#32773;&#20840;&#26435;&#25209;&#20934;&#25105;&#30003;&#35831;&#29992;&#20110;&#23433;&#20840;&#35748;&#35777;&#30005;&#23376;&#20132;&#26131;&#30340;&#25968;&#23383;&#35777;&#20070;&#12290;&#25105;&#20102;&#35299;&#65292;&#25968;&#23383;&#35777;&#20070;&#29992;&#20110;&#22312;&#30005;&#23376;&#36890;&#20449;&#20013;&#37492;&#35748;&#35777;&#20070;&#25345;&#26377;&#20154;&#65307;&#24182;&#19988;&#65292;&#35777;&#20070;&#25345;&#26377;&#20154;&#30340;&#25216;&#26415;&#20154;&#21592;&#25110;&#25216;&#26415;&#21512;&#21516;&#21830;&#24212;&#36127;&#36131;&#31649;&#29702;&#35813;&#35777;&#20070;&#30340;&#31169;&#38053;&#12290;"
@@ -4501,10 +4502,6 @@ msgstr ""
msgid "Colour version"
msgstr ""
-#: includes/about_menu.php:8
-msgid "Disclaimer"
-msgstr ""
-
#: www/gpg.php:176
msgid "Error: Both Name and Email address are empty"
msgstr ""
@@ -4611,9 +4608,9 @@ msgstr ""
msgid "If you want to have free certificates issued to you, join the %s CAcert Community %s."
msgstr ""
-#: pages/index/0.php:19
+#: pages/index/16.php:19 pages/index/3.php:19
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
msgstr ""
#: pages/account/37.php:28 pages/index/12.php:28
diff --git a/messages.po b/messages.po
index 012a8b3..fc6b9af 100644
--- a/messages.po
+++ b/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-02 22:55+0200\n"
+"POT-Creation-Date: 2010-08-05 15:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s prefers to be contacted in %s"
msgstr ""
-#: pages/account/43.php:72 pages/account/49.php:52 pages/account/49.php:83
+#: pages/account/43.php:72 pages/account/49.php:53 pages/account/49.php:85
#, php-format
msgid "%s rows displayed."
msgstr ""
@@ -236,7 +236,7 @@ msgstr ""
msgid "Alert me if"
msgstr ""
-#: www/index.php:602
+#: www/index.php:601
msgid "All fields are mandatory."
msgstr ""
@@ -503,7 +503,7 @@ msgstr ""
#: includes/account.php:1269 includes/account.php:2441
#: includes/account.php:2791 includes/account.php:2812
#: includes/general.php:750 www/disputes.php:289 www/disputes.php:425
-#: www/index.php:551 www/wot.php:64 www/wot.php:353 www/wot.php:369
+#: www/index.php:550 www/wot.php:64 www/wot.php:353 www/wot.php:369
#: scripts/removedead.php:78
msgid "Best regards"
msgstr ""
@@ -520,7 +520,7 @@ msgstr ""
msgid "Browse to the location you saved the .cer file to in step 1"
msgstr ""
-#: includes/about_menu.php:10
+#: includes/about_menu.php:8
msgid "Bug Database"
msgstr ""
@@ -572,7 +572,7 @@ msgstr ""
msgid "CAcert Assurers can see the name, birthday and the number of points by looking up the correct email address. No other person related data is published by CAcert."
msgstr ""
-#: includes/about_menu.php:16
+#: includes/about_menu.php:14
msgid "CAcert Board"
msgstr ""
@@ -644,7 +644,7 @@ msgstr ""
msgid "CAcert Source License"
msgstr ""
-#: includes/about_menu.php:13
+#: includes/about_menu.php:11
msgid "CAcert Statistics"
msgstr ""
@@ -693,7 +693,7 @@ msgstr ""
msgid "CAcert then sends you an email with a signed copy of your certificate. Hopefully the rest should be pretty straight forward."
msgstr ""
-#: pages/index/16.php:41 pages/index/3.php:41
+#: pages/index/16.php:44 pages/index/3.php:44
msgid "CAcert's GPG Key"
msgstr ""
@@ -726,7 +726,7 @@ msgstr ""
#: includes/account.php:95 includes/account.php:123 includes/account.php:569
#: includes/account.php:1269 includes/account.php:2441
#: includes/general.php:750 www/disputes.php:289 www/disputes.php:425
-#: www/index.php:551
+#: www/index.php:550
msgid "CAcert.org Support!"
msgstr ""
@@ -854,7 +854,7 @@ msgstr ""
msgid "Click here"
msgstr ""
-#: pages/index/16.php:20 pages/index/3.php:20
+#: pages/index/16.php:23 pages/index/3.php:23
msgid "Click here if you want to import the root certificate into Microsoft Internet Explorer 5.x/6.x"
msgstr ""
@@ -1117,10 +1117,6 @@ msgstr ""
msgid "Directory Listing"
msgstr ""
-#: includes/about_menu.php:9
-msgid "Disclaimer"
-msgstr ""
-
#: pages/help/2.php:78
msgid "Disclaimer : These are the author's opinions, but they should not be considered 'truth' without personal verification. The author may have made mistakes and any mistakes will be willingly rectified by contacting the administrator of elucido.net, contact details available from the normal domain registration information services (e.g. whois.net).&nbsp; No recommendation to install a Certificate Authority's root certificate is either intended nor implied."
msgstr ""
@@ -1163,7 +1159,7 @@ msgstr ""
#: pages/account/26.php:27 pages/account/28.php:28 pages/account/29.php:34
#: pages/account/43.php:313 pages/account/48.php:25 pages/account/49.php:43
-#: pages/account/49.php:74 pages/account/7.php:26 pages/disputes/2.php:26
+#: pages/account/49.php:75 pages/account/7.php:26 pages/disputes/2.php:26
msgid "Domain"
msgstr ""
@@ -1285,11 +1281,11 @@ msgstr ""
msgid "Email Address (primary)"
msgstr ""
-#: includes/account.php:82 includes/account.php:554 www/index.php:506
+#: includes/account.php:82 includes/account.php:554 www/index.php:505
msgid "Email Address given was invalid, or a test connection couldn't be made to your server, or the server rejected the email address as invalid"
msgstr ""
-#: www/index.php:452
+#: www/index.php:451
msgid "Email Address was blank"
msgstr ""
@@ -1470,9 +1466,9 @@ msgstr ""
msgid "Find an Assurer"
msgstr ""
-#: pages/index/16.php:25 pages/index/16.php:26 pages/index/16.php:35
-#: pages/index/16.php:36 pages/index/3.php:25 pages/index/3.php:26
-#: pages/index/3.php:35 pages/index/3.php:36
+#: pages/index/16.php:28 pages/index/16.php:29 pages/index/16.php:38
+#: pages/index/16.php:39 pages/index/3.php:28 pages/index/3.php:29
+#: pages/index/3.php:38 pages/index/3.php:39
msgid "Fingerprint"
msgstr ""
@@ -1493,7 +1489,7 @@ msgstr ""
msgid "First and Last name fields can not be blank."
msgstr ""
-#: www/index.php:434
+#: www/index.php:433
msgid "First and/or last names were blank."
msgstr ""
@@ -1576,11 +1572,11 @@ msgstr ""
msgid "For years we've all been charged high amounts of money to pay for security that doesn't and shouldn't cost the earth."
msgstr ""
-#: includes/account.php:1128 www/index.php:421
+#: includes/account.php:1128 www/index.php:420
msgid "For your own security you must enter 5 different password questions and answers. You aren't allowed to duplicate questions, set questions as answers or use the question as the answer."
msgstr ""
-#: includes/account.php:1137 www/index.php:333 www/index.php:429
+#: includes/account.php:1137 www/index.php:332 www/index.php:428
msgid "For your own security you must enter 5 lost password questions and answers."
msgstr ""
@@ -1614,7 +1610,7 @@ msgstr ""
msgid "Further Information"
msgstr ""
-#: pages/index/16.php:40 pages/index/3.php:40
+#: pages/index/16.php:43 pages/index/3.php:43
msgid "GPG Key"
msgstr ""
@@ -1791,10 +1787,6 @@ msgstr ""
msgid "How?"
msgstr ""
-#: includes/about_menu.php:5
-msgid "Howto Information"
-msgstr ""
-
#: www/cap.html.php:160 www/cap.php:149 www/capnew.php:1300
#: www/coap.html.php:211 www/coapnew.php:1319
msgid "I agree to the CAcert Community Agreement."
@@ -2060,7 +2052,7 @@ msgstr ""
#: pages/index/0.php:22
#, php-format
-msgid "If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."
+msgid "If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."
msgstr ""
#: www/logos.php:24
@@ -2121,7 +2113,7 @@ msgstr ""
msgid "Inclusion into mainstream browsers!"
msgstr ""
-#: www/index.php:348
+#: www/index.php:347
msgid "Incorrect email address and/or Pass Phrase."
msgstr ""
@@ -2150,15 +2142,15 @@ msgstr ""
msgid "Installing your certificate"
msgstr ""
-#: pages/index/16.php:32 pages/index/3.php:32
+#: pages/index/16.php:35 pages/index/3.php:35
msgid "Intermediate Certificate (DER Format)"
msgstr ""
-#: pages/index/16.php:31 pages/index/3.php:31
+#: pages/index/16.php:34 pages/index/3.php:34
msgid "Intermediate Certificate (PEM Format)"
msgstr ""
-#: pages/index/16.php:33 pages/index/3.php:33
+#: pages/index/16.php:36 pages/index/3.php:36
msgid "Intermediate Certificate (Text Format)"
msgstr ""
@@ -2184,7 +2176,7 @@ msgstr ""
msgid "Invalid ID '%s' presented, can't do anything with it."
msgstr ""
-#: includes/account.php:1169 www/index.php:442
+#: includes/account.php:1169 www/index.php:441
msgid "Invalid date of birth"
msgstr ""
@@ -2394,11 +2386,11 @@ msgstr ""
msgid "Lost Password"
msgstr ""
-#: www/index.php:553
+#: www/index.php:552
msgid "Mail Probe"
msgstr ""
-#: includes/about_menu.php:17
+#: includes/about_menu.php:15
msgid "Mailing Lists"
msgstr ""
@@ -2662,7 +2654,7 @@ msgstr ""
msgid "New Pass Phrase"
msgstr ""
-#: includes/account.php:1240 www/index.php:109
+#: includes/account.php:1240 www/index.php:108
msgid "New Pass Phrases specified don't match or were blank."
msgstr ""
@@ -2713,12 +2705,12 @@ msgstr ""
msgid "No domains are currently listed."
msgstr ""
-#: pages/account/49.php:91
+#: pages/account/49.php:93
#, php-format
msgid "No organisational domains found matching %s"
msgstr ""
-#: pages/account/49.php:60
+#: pages/account/49.php:61
#, php-format
msgid "No personal domains found matching %s"
msgstr ""
@@ -2927,7 +2919,7 @@ msgstr ""
msgid "Only fill this in if you assured the person on a different day"
msgstr ""
-#: pages/account/43.php:68 pages/account/49.php:48 pages/account/49.php:79
+#: pages/account/43.php:68 pages/account/49.php:49 pages/account/49.php:81
msgid "Only the first 100 rows are displayed."
msgstr ""
@@ -3044,12 +3036,12 @@ msgstr ""
msgid "Other registered trade names of the organisation. (comma separated)"
msgstr ""
-#: pages/index/16.php:19 pages/index/16.php:30 pages/index/3.php:19
-#: pages/index/3.php:30
+#: pages/index/16.php:22 pages/index/16.php:33 pages/index/3.php:22
+#: pages/index/3.php:33
msgid "PKI Key"
msgstr ""
-#: pages/index/16.php:45 pages/index/3.php:45
+#: pages/index/16.php:48 pages/index/3.php:48
msgid "PKI finger/thumb print signed by the CAcert GPG Key"
msgstr ""
@@ -3077,11 +3069,11 @@ msgstr ""
msgid "Pass Phrase Again"
msgstr ""
-#: www/index.php:462
+#: www/index.php:461
msgid "Pass Phrases don't match"
msgstr ""
-#: www/index.php:457
+#: www/index.php:456
msgid "Pass Phrases were blank"
msgstr ""
@@ -3244,7 +3236,7 @@ msgstr ""
msgid "Please use any of the following ways to report security issues: You can use the above contact form for sensitive information. You can email us to support@cacert.org. You can file a bugreport on <a href='https://bugs.cacert.org/'>bugs.cacert.org</a> and mark it as private."
msgstr ""
-#: includes/about_menu.php:8
+#: includes/about_menu.php:7
msgid "Point System"
msgstr ""
@@ -3261,7 +3253,7 @@ msgstr ""
msgid "Points Issued"
msgstr ""
-#: includes/about_menu.php:7
+#: includes/about_menu.php:6
msgid "Policies"
msgstr ""
@@ -3342,7 +3334,7 @@ msgstr ""
msgid "Question: I'm a software developer for linux and I want to use CAcert/openssl to distribute my packages with detached signatures, is this possible and why would I do this over PGP/GPG detached signatures?"
msgstr ""
-#: includes/about_menu.php:14
+#: includes/about_menu.php:12
msgid "RSS News Feed"
msgstr ""
@@ -3443,15 +3435,15 @@ msgstr ""
msgid "Root Certificate"
msgstr ""
-#: pages/index/16.php:22 pages/index/3.php:22
+#: pages/index/16.php:25 pages/index/3.php:25
msgid "Root Certificate (DER Format)"
msgstr ""
-#: pages/index/16.php:21 pages/index/3.php:21
+#: pages/index/16.php:24 pages/index/3.php:24
msgid "Root Certificate (PEM Format)"
msgstr ""
-#: pages/index/16.php:23 pages/index/3.php:23
+#: pages/index/16.php:26 pages/index/3.php:26
msgid "Root Certificate (Text Format)"
msgstr ""
@@ -3544,7 +3536,7 @@ msgstr ""
msgid "Select 'Server Certificate' at the bottom of the tab in the 'Secure communications' section."
msgstr ""
-#: pages/account/43.php:53 pages/account/49.php:37 pages/account/49.php:68
+#: pages/account/43.php:53 pages/account/49.php:37 pages/account/49.php:69
msgid "Select Specific Account Details"
msgstr ""
@@ -3663,7 +3655,7 @@ msgstr ""
msgid "Sorry, you are not allowed to be an Assurer. Please contact"
msgstr ""
-#: includes/about_menu.php:18
+#: includes/about_menu.php:16
msgid "Sourcecode"
msgstr ""
@@ -3753,7 +3745,7 @@ msgstr ""
msgid "Thank you very much for your support, your donations help CAcert to continue to operate."
msgstr ""
-#: www/index.php:549
+#: www/index.php:548
msgid "Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!"
msgstr ""
@@ -3821,7 +3813,7 @@ msgstr ""
msgid "The Organisational Unit field is the 'free' field. It is often the department or Server name for reference."
msgstr ""
-#: includes/account.php:1258 www/index.php:117
+#: includes/account.php:1258 www/index.php:116
#, 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 ""
@@ -3830,7 +3822,7 @@ msgstr ""
msgid "The Pass Phrase you submitted was too short."
msgstr ""
-#: www/index.php:111
+#: www/index.php:110
msgid "The Pass Phrase you submitted was too short. It must be at least 6 characters."
msgstr ""
@@ -3991,7 +3983,7 @@ msgstr ""
msgid "The list of tests you did pass at"
msgstr ""
-#: includes/account.php:80 includes/account.php:552 www/index.php:504
+#: includes/account.php:80 includes/account.php:552 www/index.php:503
msgid "The mail server responsible for your domain indicated a temporary failure. This may be due to anti-SPAM measures, such as greylisting. Please try again in a few minutes."
msgstr ""
@@ -4109,7 +4101,7 @@ msgstr ""
msgid "This dispute no longer seems to be in the database, can't continue."
msgstr ""
-#: www/index.php:482
+#: www/index.php:481
msgid "This email address is currently valid in the system."
msgstr ""
@@ -4149,11 +4141,11 @@ msgstr ""
msgid "This policy discloses what information we gather about you when you visit any of our Web site, and when you issue or use our certificates. It describes how we use that information and how you can control it."
msgstr ""
-#: www/index.php:586 www/index.php:593
+#: www/index.php:585 www/index.php:592
msgid "This seems like potential spam, cannot continue."
msgstr ""
-#: www/index.php:572 www/index.php:579
+#: www/index.php:571 www/index.php:578
msgid "This seems like you have cookies or Javascript disabled, cannot continue."
msgstr ""
@@ -4307,7 +4299,7 @@ msgstr ""
msgid "Unable to locate a valid request for that UID."
msgstr ""
-#: www/index.php:143
+#: www/index.php:142
msgid "Unable to match your details with any user accounts on file"
msgstr ""
@@ -4468,7 +4460,7 @@ msgstr ""
msgid "We collect two kinds of information about website users: 1) data that users volunteer by signing up to our website or when you send us an email via our contact form; and 2) aggregated tracking data we collect when users interact with our site."
msgstr ""
-#: www/index.php:492
+#: www/index.php:491
#, php-format
msgid "We don't allow signups from people using email addresses from %s"
msgstr ""
@@ -4491,8 +4483,8 @@ msgstr ""
#: www/account.php:37 www/account.php:52 www/analyse.php:21 www/gpg.php:53
#: www/gpg.php:126 www/gpg.php:149 www/gpg.php:257 www/gpg.php:493
-#: www/gpg.php:513 www/help.php:23 www/index.php:122 www/index.php:612
-#: www/index.php:623 www/index.php:632 www/logos.php:19 www/news.php:23
+#: www/gpg.php:513 www/help.php:23 www/index.php:121 www/index.php:611
+#: www/index.php:622 www/index.php:631 www/logos.php:19 www/news.php:23
#: www/stats.php:21
msgid "Welcome to CAcert.org"
msgstr ""
@@ -4558,7 +4550,7 @@ msgstr ""
msgid "Why?"
msgstr ""
-#: includes/about_menu.php:6 pages/index/0.php:168
+#: includes/about_menu.php:5 pages/index/0.php:168
msgid "Wiki Documentation"
msgstr ""
@@ -4607,6 +4599,11 @@ msgstr ""
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."
msgstr ""
+#: pages/index/16.php:19 pages/index/3.php:19
+#, php-format
+msgid "You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."
+msgstr ""
+
#: www/wot.php:118
msgid "You are never allowed to Assure yourself!"
msgstr ""
@@ -4730,7 +4727,7 @@ msgstr ""
msgid "You failed to enter a location of your meeting."
msgstr ""
-#: www/index.php:107
+#: www/index.php:106
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 ""
@@ -4797,7 +4794,7 @@ msgstr ""
msgid "You have passed the Assurer Challenge, but to become an Assurer you still have to reach 100 Assurance Points!"
msgstr ""
-#: www/index.php:447
+#: www/index.php:446
msgid "You have to agree to the CAcert Community agreement."
msgstr ""
@@ -4947,7 +4944,7 @@ msgstr ""
msgid "Your Name"
msgstr ""
-#: www/index.php:123
+#: www/index.php:122
msgid "Your Pass Phrase has been changed now. You can now login with your new password."
msgstr ""
@@ -4959,7 +4956,7 @@ msgstr ""
msgid "Your account and/or email address has been verified. You can now start issuing certificates for this address."
msgstr ""
-#: www/index.php:350
+#: www/index.php:349
msgid "Your account has not been verified yet, please check your email account for the signup messages."
msgstr ""
@@ -5055,11 +5052,11 @@ msgstr ""
msgid "Your location has been updated"
msgstr ""
-#: www/account.php:53 www/index.php:624
+#: www/account.php:53 www/index.php:623
msgid "Your message has been sent to the general support list."
msgstr ""
-#: www/account.php:38 www/index.php:613
+#: www/account.php:38 www/index.php:612
msgid "Your message has been sent."
msgstr ""
diff --git a/pages/account/49.php b/pages/account/49.php
index 8b22399..688b9a4 100644
--- a/pages/account/49.php
+++ b/pages/account/49.php
@@ -24,7 +24,7 @@
$domainsearch = "%$domain%";
if(preg_match("/^\d+$/",$domain))
$domainsearch = "";
- $query = "select `users`.`id` as `id`, `domains`.`domain` as `domain` from `users`,`domains`
+ $query = "select `users`.`id` as `id`, `domains`.`domain` as `domain`, `domains`.`id`as `domid` from `users`,`domains`
where `users`.`id`=`domains`.`memid` and
(`domains`.`domain` like '$domainsearch' or `domains`.`id`='$domain') and
`domains`.`deleted`=0 and `users`.`deleted`=0 and
@@ -41,15 +41,16 @@
{ ?>
<tr>
<td class="DataTD"><?=_("Domain")?>:</td>
+ <td class="DataTD"><?=$row['domid']?></td>
<td class="DataTD"><a href="account.php?id=43&amp;userid=<?=$row['id']?>"><?=sanitizeHTML($row['domain'])?></a></td>
</tr>
<? } if(mysql_num_rows($res) >= 100) { ?>
<tr>
- <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td>
+ <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td>
</tr>
<? } else { ?>
<tr>
- <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
+ <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
</tr>
<? } ?>
</table><br><br>
@@ -60,7 +61,7 @@
printf(_("No personal domains found matching %s"), sanitizeHTML($domain));
}
- $query = "select `orgid`,`domain` from `orgdomains` where `domain` like '$domainsearch' or `id`='$domain' limit 100";
+ $query = "select `orgid`,`domain`,`id` from `orgdomains` where `domain` like '$domainsearch' or `id`='$domain' limit 100";
$res = mysql_query($query);
if(mysql_num_rows($res) >= 1) { ?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
@@ -72,15 +73,16 @@
{ ?>
<tr>
<td class="DataTD"><?=_("Domain")?>:</td>
+ <td class="DataTD"><?=$row['id']?></td>
<td class="DataTD"><a href="account.php?id=26&amp;orgid=<?=intval($row['orgid'])?>"><?=sanitizeHTML($row['domain'])?></a></td>
</tr>
<? } if(mysql_num_rows($res) >= 100) { ?>
<tr>
- <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td>
+ <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td>
</tr>
<? } else { ?>
<tr>
- <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
+ <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
</tr>
<? } ?>
</table><br><br>
diff --git a/pages/index/0.php b/pages/index/0.php
index 0a1d11e..d1d3fef 100644
--- a/pages/index/0.php
+++ b/pages/index/0.php
@@ -19,7 +19,7 @@
<p><?=sprintf(_("If you want to have free certificates issued to you, join the %s CAcert Community %s."),"<a href=\"https://www.cacert.org/index.php?id=1\">","</a>")?></p>
-<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."),'<a href="/policy/NRPDisclaimerAndLicence.php">',"</a>")?>
+<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."),'<a href="/policy/RootDistributionLicense.php">',"</a>")?>
<?=sprintf(_("This license applies to using the CAcert %s root keys %s."),'<a href="/index.php?id=3">','</a>')?></p>
diff --git a/pages/index/16.php b/pages/index/16.php
index 5b75815..ad493f2 100755
--- a/pages/index/16.php
+++ b/pages/index/16.php
@@ -15,6 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
+
+<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p>
+
<p>
Class 1 <?=_("PKI Key")?><br>
<a href="index.php?id=17"><?=_("Click here if you want to import the root certificate into Microsoft Internet Explorer 5.x/6.x")?></a><br>
diff --git a/pages/index/3.php b/pages/index/3.php
index 5b75815..ad493f2 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -15,6 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
+
+<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p>
+
<p>
Class 1 <?=_("PKI Key")?><br>
<a href="index.php?id=17"><?=_("Click here if you want to import the root certificate into Microsoft Internet Explorer 5.x/6.x")?></a><br>
diff --git a/pages/wot/7-old.php b/pages/wot/7-old.php
deleted file mode 100644
index af167a0..0000000
--- a/pages/wot/7-old.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<? /*
- LibreSSL - CAcert web application
- Copyright (C) 2004-2008 CAcert Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/ ?>
-<?
-exit;
-if($_GET['action'] != "update")
-{
- $total1 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `users`.`id`=`notary`.`to`
- group by `notary`.`to` HAVING SUM(`points`) >= 100"));
-
- $town = mysql_escape_string(stripslashes($_GET['town']));
- $start = intval($_GET['start']);
- $limit = 25;
-
- echo "<div id='listshow'><ul class='top'>\n<li>";
- echo "<a href='wot.php?id=7'>"._("Home")." ("._("Listed").": $total1)</a>\n";
-
- $display = "";
- $ccid=intval($_GET['ccid']);
- $locid=intval($_GET['locid']);
- $regid=intval($_GET['regid']);
-
- if($locid > 0)
- {
- $total4 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `locid`='".$locid."' and
- `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100"));
- $loc = mysql_fetch_assoc(mysql_query("select * from `locations` where `id`='".$locid."'"));
- $display = "<ul class='top'>\n<li>\n".
- "<a href='wot.php?id=7&locid=".$locid."'>$loc[name] ("._("Listed").": $total4)</a>\n".
- $display;
- $regid = $loc['regid'];
- }
-
- if($regid > 0)
- {
- $total3 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `regid`='".$regid."' and
- `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100"));
- $reg = mysql_fetch_assoc(mysql_query("select * from `regions` where `id`='".$regid."'"));
- $display = "<ul class='top'>\n<li>\n".
- "<a href='wot.php?id=7&regid=".$regid."'>$reg[name] ("._("Listed").": $total3)</a>\n".
- $display;
- $ccid = $reg['ccid'];
- }
-
- if($ccid > 0)
- {
- $total2 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and
- `ccid`='".$ccid."' and `users`.`id`=`notary`.`to`
- group by `notary`.`to` HAVING SUM(`points`) >= 100"));
- $cnt = mysql_fetch_assoc(mysql_query("select * from `countries` where `id`='".$ccid."'"));
- $display = "<ul class='top'>\n<li>\n".
- "<a href='wot.php?id=7&ccid=".$ccid."'>$cnt[name] ("._("Listed").": $total2)</a>\n".
- $display;
- }
-
- if($display)
- echo $display;
-
- if($ccid <= 0)
- {
- echo "<ul>\n";
- $query = "select * from `countries` order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
- echo "<li><a href='wot.php?id=7&ccid=$row[id]'>$row[name]</a></li>\n";
-
- echo "</ul>\n</li>\n</ul></div>\n<br>\n";
- } elseif($regid <= 0) {
- echo "<ul>\n";
- $query = "select * from `regions` where `ccid`='".$ccid."' order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
- echo "<li><a href='wot.php?id=7&regid=$row[id]'>$row[name]</a></li>\n";
-
- echo "</ul>\n</li>\n</ul>\n</li>\n</ul></div>\n<br>\n";
- } elseif($locid <= 0) {
- echo "<ul>\n";
- if($town != "")
- {
- $query = "select * from `locations` where `regid`='".$regid."' and `name` < '$town'";
- $start = mysql_num_rows(mysql_query($query));
- }
- $query = "select * from `locations` where `regid`='".$regid."' order by `name` limit $start, $limit";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
- echo "<li><a href='wot.php?id=7&locid=$row[id]'>$row[name]</a></li>\n";
-
- echo "</ul>\n</li>\n</ul>\n</li>\n</ul></div>\n<br>\n";
- $rc = mysql_num_rows(mysql_query("select * from `locations` where `regid`='".$regid."'"));
- if($start > 0)
- {
- $prev = $start - $limit;
- if($prev < 0)
- $prev = 0;
-
- $st = "[ <a href='wot.php?id=7&regid=".$regid."'><< Start</a> ] ";
- $prev = "[ <a href='wot.php?id=7&regid=".$regid."&start=$prev'>< Previous $limit</a> ] ";
- }
- if($start < $rc - $limit)
- {
- $next = $start + $limit;
- $last = $rc - $limit;
-
- $next = "[ <a href='wot.php?id=7&regid=".$regid."&start=$next'>Next $limit ></a> ] ";
- $end = "[ <a href='wot.php?id=7&regid=".$regid."&start=$last'>End >></a> ]";
- }
- echo "<div id='search1'>$st</div><div id='search3'>$end</div>\n";
- echo "<div id='search2'>$prev</div><div id='search4'>$next</div>\n";
-?>
-<div align="left">
-<form method="get" action="wot.php">
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="200">
- <tr>
- <td colspan="2" class="title"><?=_("Search this region")?></td>
- </tr>
- <tr>
- <td class="DataTD" width="125"><?=_("Location Name")?>: </td>
- <td class="DataTD" width="125"><input type="text" name="town" value="<?=sanitizeHTML($_GET['town'])?>" size="10"></td>
- </tr>
- <tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Search")?>"></td>
- </tr>
-</table>
-<input type="hidden" name="regid" value="<?=$regid?>">
-<input type="hidden" name="id" value="7">
-</form>
-</div>
-<?
- } else {
- echo "</ul>\n</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n<br>\n";
- echo "<p><a href='wot.php?id=7&action=update&locid=".$locid."'>";
- echo _("Make my location here");
- echo "</a></p>\n";
- echo "<p>"._("If you are happy with this location, click 'Make my location here' to update your location details.")."</p><br>\n";
- }
-} else {
- $total1 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `users`.`id`=`notary`.`to`
- group by `notary`.`to` HAVING SUM(`points`) >= 100"));
-
- if($locid > 0)
- {
- $total4 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `locid`='".$locid."' and
- `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100"));
- $loc = mysql_fetch_assoc(mysql_query("select * from `locations` where `id`='".$locid."'"));
- $regid = $loc['regid'];
- }
-
- if($regid) > 0)
- {
- $total3 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `regid`='".$regid."' and
- `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100"));
- $reg = mysql_fetch_assoc(mysql_query("select * from `regions` where `id`='".$regid."'"));
- $ccid = $reg['ccid'];
- }
-
- $total2 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and
- `ccid`='".$ccid."' and `users`.`id`=`notary`.`to`
- group by `notary`.`to` HAVING SUM(`points`) >= 100"));
-
- $_SESSION['profile']['ccid'] = $ccid;
- $_SESSION['profile']['regid'] = $regid;
- $_SESSION['profile']['locid'] = $locid;
-
- mysql_query("update `users` set `ccid`='".$ccid."',`regid`='".$regid."',`locid`='".$locid."'
- where `id`='".$_SESSION['profile']['id']."'");
-
- echo _("Your details have been updated.");
-}
-?>
diff --git a/scripts/21de-ate-essen-email.txt b/scripts/21de-ate-essen-email.txt
new file mode 100644
index 0000000..bfeea13
--- /dev/null
+++ b/scripts/21de-ate-essen-email.txt
@@ -0,0 +1,97 @@
+CAcert Assurer Training Event Essen [Deutsch]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unters Volk zu bringen:
+
+- Was hast du auf dem CAP Formular hinzuzufuegen, wenn du Minderjaehrige ueberpruefst ?
+- Was sind die 2 wesentlichen Punkte der CCA die du einem Assuree vermitteln koennen sollst ?
+- Unter welchen Umstaenden koennen z.Bsp. niederlaendische Rufnamen akzeptiert werden?
+
+Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs).
+
+Die kommende Veranstaltung in deiner Naehe findet statt am:
+
+Dienstag den 28. September 2010
+Zeit: 19:00 - 22:00
+
+Unperfekthaus Essen
+Friedrich-Ebert-Str. 18
+45127 Essen-City
+
+Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme.
+
+Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im
+Wiki [https://wiki.cacert.org/events/2010_09_28-ATE-Essen]
+Blog [https://blog.cacert.org/2010/09/483.html]
+
+Unverbindliche Anmeldung und Registrierung:
+Rueckantwort mit 'Ich moechte teilnehmen: ATE-Essen'
+
+Kontakt: events@cacert.org
+
+
+
+CAcert Assurer Training Event Essen [Dutch]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Er is veel gebeurd de afgelopen 3 jaar. De oude manier van mondelink doorgegeven procedures is nu verdwenen, en onze regels zijn uitgebracht in formeel beleid. Nieuwe procedures (bijvoorbeeld de Assurer Challenge) en verplichtingen (bv in de CAcert Community Agreement) zijn goedgekeurd. De Assurer Training evenementen brengen dit alles naar u, de Gemeenschap:
+
+- Wat heb je aan toe te voegen aan het CAP formulier bij het waarmerken van jongere leden die nog geen 18+ zijn?
+- Wat zijn de 2 essentile thema's van de CCA als u die presenteert aan iemand?
+- Wanneer kun je een Nederlandse "roepnaam" accepteren?
+
+Antwoorden op deze, en vele andere vragen worden gegeven op Assurer Training Evenementen (ATE).
+
+ATE-Essen vindt plaats op: Dinsdag 28 September 2010, 19:00 - 22:00
+
+Unperfekthaus Essen
+Friedrich-Ebert-Str. 18
+45127 Essen-City
+
+Het Event-Team kijkt er naar uit om van u te horen.
+
+Details over locatie en vervoer vindt u onder
+Wiki [https://wiki.cacert.org/events/2010_09_28-ATE-Essen]
+Blog [https://blog.cacert.org/2010/09/483.html]
+
+Voor registratie van ATE-Essen kunt u reageren met
+ 'Ik zal aanwezig zijn: ATE-Essen'
+gericht aan events@cacert.org
+
+Voor andere vragen of opmerkingen kunt u ook terecht bij events@cacert.org
+
+
+
+CAcert Assurer Training Event Essen [English]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Much has happened during the past 3 years. The old way of
+orally-transmitted procedures has now gone, and our rules have been cast
+into formal policies. New procedures (e.g. the Assurer Challenge) and
+obligations (e.g. in the CAcert Community Agreement) have been approved.
+The Assurer Training Events bring all this to you, the Community:
+
+- What you have to add onto the CAP form if you assure U18 people ?
+- What are the 2 essential topics regarding CCA you have to present an Assuree ?
+- When you can accept i.e. a Dutch "roepnaam" ?
+
+Answers to these and many other questions are given at the Assurer
+Training Events (ATEs).
+
+ATE-Essen takes place on:
+Tuesday, Sept 28, 2010, 19:00 - 22:00
+
+Unperfekthaus Essen
+Friedrich-Ebert-Str. 18
+45127 Essen-City
+
+The Event-Team is looking forward to hearing from you.
+
+Details on Location and Transportation you will find under
+Wiki [https://wiki.cacert.org/events/2010_09_28-ATE-Essen]
+Blog [https://blog.cacert.org/2010/09/483.html]
+
+Registration for ATE-Essen: please reply
+'I will attend: ATE-Essen'
+
+Contact: events@cacert.org
diff --git a/scripts/21de-ate-essen-mail.php.txt b/scripts/21de-ate-essen-mail.php.txt
new file mode 100644
index 0000000..18437d2
--- /dev/null
+++ b/scripts/21de-ate-essen-mail.php.txt
@@ -0,0 +1,135 @@
+#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("21de-ate-essen-email.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+ $maxdist = 200;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+ $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+ $eventname = "ATE-Essen";
+ $city = "September 28, 2010";
+
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ echo "invitation sent to $xrows recipients.\n";
+?>
diff --git a/scripts/22de-ate-aachen-email.txt b/scripts/22de-ate-aachen-email.txt
new file mode 100644
index 0000000..a93ba8d
--- /dev/null
+++ b/scripts/22de-ate-aachen-email.txt
@@ -0,0 +1,133 @@
+CAcert Assurer Training Event Aachen [Deutsch]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unters Volk zu bringen:
+
+- Was hast du auf dem CAP Formular hinzuzufuegen, wenn du Minderjaehrige ueberpruefst ?
+- Was sind die 2 wesentlichen Punkte der CCA die du einem Assuree vermitteln koennen sollst ?
+- Unter welchen Umstaenden koennen z.Bsp. niederlaendische Rufnamen akzeptiert werden?
+
+Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs).
+
+Die kommende Veranstaltung in deiner Naehe findet statt am:
+
+Montag den 04. Oktber 2010
+in den Seminarraeumen (Madrid and Lissabon)
+
+Jugendherberge Aachen
+- Euregionales Jugendgaestehaus -
+Maria-Theresia-Allee 260
+52074 Aachen
+
+Es finden 2 Veranstaltungen statt. Eine am Nachmittag, eine am Abend:
+Unverbindliche Anmeldung und Registrierung:
+
+Nachmittag 14:00 - 17:00 (I)
+Rueckantwort mit 'Ich moechte am ATE-Aachen am Nachmittag teilnehmen'
+
+oder
+
+Abend: 19:00 - 22:00 (II)
+Rueckantwort mit 'Ich moechte am ATE-Aachen am Abend teilnehmen'
+
+Zur Durchfuehrung der jeweiligen Veranstaltung ist eine Mindestteilnehmerzahl von 6 Personen erforderlich.
+
+Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme.
+
+Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im
+Wiki [https://wiki.cacert.org/Events/2010_10_04-ATE-Aachen]
+Blog [https://blog.cacert.org/2010/08/482.html]
+and [https://blog.cacert.org/2010/09/484.html]
+
+Kontakt: events@cacert.org
+
+
+
+CAcert Assurer Training Event Aachen [Dutch]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Er is veel gebeurd de afgelopen 3 jaar. De oude manier van mondeling doorgegeven procedures is nu verdwenen, en onze regels zijn uitgebracht in formeel beleid. Nieuwe procedures (bijvoorbeeld de Assurer Challenge) en verplichtingen (bv in de CAcert Community Agreement) zijn goedgekeurd. De Assurer Training evenementen brengen dit alles naar u, de Gemeenschap:
+
+- Wat heb je toe te voegen aan het CAP formulier bij het waarmerken van jongere leden die nog geen 18+ zijn?
+- Wat zijn de 2 essentile thema's van de CCA als u die presenteert aan iemand?
+- Wanneer kun je een Nederlandse "roepnaam" accepteren?
+
+Antwoorden op deze, en vele andere vragen worden gegeven op Assurer Training Evenementen (ATE).
+
+ATE-Aken vindt plaats op: maandag 04 october 2010
+In de hoorzalen (Madrid en Lissabon) van
+
+Jugendherberge Aken
+- Euregionales Jugendgaestehaus -
+Maria-Theresia-Allee 260
+52074 Aachen
+
+Er zullen 2 bijeenkomsten plaatsvinden. Een 's middags, de ander 's avonds.
+U kunt uw aanmelding/registratie ten alle tijden wijzigen.
+
+'s middags 14:00--17:00 (I)
+Reactie met "Ik wil graag 's middags deelnemen aan ATE-Aken (!)." gericht aan events@cacert.org.
+
+of
+
+'s avonds 19:00--22:00 (II)
+Reactie met "Ik wil graag 's avonds deelnemen aan ATE-Aken (II)." gericht aan events@cacert.org.
+
+(Om een bijeenkomst door te laten gaan hebben wij graag 6 of meer deelnemers.)
+
+Het Event-Team kijkt er naar uit om van u te horen.
+
+Details over locatie en vervoer vindt u onder
+Wiki [https://wiki.cacert.org/Events/2010_10_04-ATE-Aachen]
+Blog [https://blog.cacert.org/2010/08/482.html]
+en [https://blog.cacert.org/2010/09/484.html]
+
+Voor andere vragen of opmerkingen kunt u ook terecht bij events@cacert.org
+
+
+
+CAcert Assurer Training Event Aachen [English]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Much has happened during the past 3 years. The old way of
+orally-transmitted procedures has now gone, and our rules have been cast
+into formal policies. New procedures (e.g. the Assurer Challenge) and
+obligations (e.g. in the CAcert Community Agreement) have been approved.
+The Assurer Training Events bring all this to you, the Community:
+
+- What you have to add onto the CAP form if you assure U18 people ?
+- What are the 2 essential topics regarding CCA you have to present an Assuree ?
+- When you can accept i.e. a Dutch "roepnaam" ?
+
+Answers to these and many other questions are given at the Assurer
+Training Events (ATEs).
+
+ATE-Aachen takes place on:
+Monday, Oct 4th, 2010
+Lecture Rooms (Madrid and Lissabon)
+
+Jugendherberge Aachen
+- Euregionales Jugendgaestehaus -
+Maria-Theresia-Allee 260
+52074 Aachen
+
+We have scheduled two events: one in the afternoon, one in the evening:
+
+Afternoon 14:00-17:00 (I):
+For Registration please reply: 'I will attend ATE-Aachen in the afternoon'
+
+or
+
+Evening 19:00-22:00 (II):
+For Registration please reply: 'I will attend ATE-Aachen in the evening'
+
+For each of the events to take place, we will need at least 6 attendees.
+
+The Event-Team is looking forward to hearing from you.
+
+Details on Location and Transportation you will find under
+Wiki [https://wiki.cacert.org/Events/2010_10_04-ATE-Aachen]
+Blog [https://blog.cacert.org/2010/08/482.html]
+and [https://blog.cacert.org/2010/09/484.html]
+
+Contact: events@cacert.org
diff --git a/scripts/22de-ate-aachen-mail.php.txt b/scripts/22de-ate-aachen-mail.php.txt
new file mode 100644
index 0000000..fa60d74
--- /dev/null
+++ b/scripts/22de-ate-aachen-mail.php.txt
@@ -0,0 +1,141 @@
+#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("22de-ate-aachen-email.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+// maxdist in [Km]
+ $maxdist = 200;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Essen";
+// $city = "September 28, 2010";
+
+// ATE Aachen, DE, Oct 4th 2010
+ $locid = 78; // Aachen, Nordrhein-Westfalen, Germany
+ $eventname = "ATE-Aachen";
+ $city = "October 4th, 2010";
+
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ echo "invitation sent to $xrows recipients.\n";
+?>
diff --git a/scripts/23au-ate-canberra-email.txt b/scripts/23au-ate-canberra-email.txt
new file mode 100644
index 0000000..58d4e55
--- /dev/null
+++ b/scripts/23au-ate-canberra-email.txt
@@ -0,0 +1,31 @@
+CAcert Assurer Training Event -- Canberra
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Dear Member of the CAcert Community,
+
+Much has happened during recent years. The old way of orally-transmitted procedures has now gone, and our rules have been cast into formal policies. New procedures (e.g. the Assurer Challenge) and obligations (e.g. in the CAcert Community Agreement) have been approved.
+
+The Assurer Training Events bring all this to you, the Assurer, and the Community:
+
+- What do you have to add onto the CAP form if you assure minors ?
+- What are the 2 essential CCA points you have to present an Assuree ?
+- Who can access the Member's privacy information?
+
+Answers to these and many other questions typically faced by Assurers are given at the Assurer Training Events (ATEs).
+
+ATE-Canberra takes place at:
+* Tuesday, Oct 12th, 2010
+* Grant Cameron Community Centre, 27-29 Mulley St, Holder
+* 7:00pm
+
+For Registration please reply: 'I will attend ATE-Canberra'
+
+We are looking forward to hearing from you.
+
+
+- Best regards from the Event Team!
+
+
+PS: Contact: events@cacert.org
+Location, Transportation and other event details at
+[https://wiki.cacert.org/events/20101012Canberra]
diff --git a/scripts/23au-ate-canberra-mail.php.txt b/scripts/23au-ate-canberra-mail.php.txt
new file mode 100644
index 0000000..b7293cc
--- /dev/null
+++ b/scripts/23au-ate-canberra-mail.php.txt
@@ -0,0 +1,142 @@
+#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("23au-ate-canberra-email.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+ $maxdist = 200;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Essen";
+// $city = "September 28, 2010";
+
+// ATE Canberra, AU, Oct 12 2010
+ $locid = 2255408; // Canberra, Australian Capital Territory, Australia
+ $eventname = "ATE-Canberra";
+ $city = "Tuesday 12th October";
+
+
+
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ echo "invitation sent to $xrows recipients.\n";
+?>
diff --git a/scripts/24de-blit2010-email.txt b/scripts/24de-blit2010-email.txt
new file mode 100644
index 0000000..8c186cd
--- /dev/null
+++ b/scripts/24de-blit2010-email.txt
@@ -0,0 +1,15 @@
+7. Brandenburger Linux-Infotag 2010 -- Helfer Gesucht
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Hallo CAcerties,
+
+am Samstag, dem 6. November 2010 moechte sich CAcert mit einem Stand auf dem 7. Brandenburger Linux-Infotag 2010 praesentieren. Hierzu wurde nun im Wiki eine Organisationsseite eingerichtet, auf der Ihr Euch als Helfer eintragen koennt (http://wiki.cacert.org/events/blit2010). Sofern Ihr aus Berlin, Potsdam sowie Umgebung oder von woanders kommt und Zeit wie auch Lust habt, dann tragt Euch bitte ein. Wer im vergangenen Jahr dabei war, weiss vieviel Spass es allen gemacht hat!
+
+Auf der Veranstaltung sind Professoren, wissenschaftliche Mitarbeiter und in jedem Fall viele Studenten zu erwarten. Es waere daher super, wenn wir dort moeglichst viele von CAcert ueberzeugen koennen, um eine neue Keimzelle entstehen lassen zu koennen. Daher benoetigen wir mindestens drei Assurer, um 100 Punkte vergeben zu koennen.
+
+Wir freuen uns auf Eure Mithilfe.
+
+
+Wiki Organisationsseite: [http://wiki.cacert.org/events/blit2010]
+
+Kontakt: events@cacert.org
diff --git a/scripts/24de-blit2010-mail.php.txt b/scripts/24de-blit2010-mail.php.txt
new file mode 100644
index 0000000..fbc5342
--- /dev/null
+++ b/scripts/24de-blit2010-mail.php.txt
@@ -0,0 +1,147 @@
+#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("24de-blit2010-email.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+ $maxdist = 200;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Essen";
+// $city = "September 28, 2010";
+
+// ATE Canberra, AU, Oct 12 2010
+// $locid = 2255408; // Canberra, Australian Capital Territory, Australia
+// $eventname = "ATE-Canberra";
+// $city = "Tuesday 12th October";
+
+// BLIT2010, 7. Brandenburger Linux-Infotag, 6.11.2010
+ $locid = 1486658; // Potsdam, Brandenburg, Germany
+ $eventname = "7. Brandenburger Linux-Infotag (BLIT2010)";
+ $city = "Potsdam - 6. Nov 2010";
+
+
+
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ echo "invitation sent to $xrows recipients.\n";
+?>
diff --git a/scripts/25de-ate-hamburg-mail.php.txt b/scripts/25de-ate-hamburg-mail.php.txt
new file mode 100644
index 0000000..64c43b0
--- /dev/null
+++ b/scripts/25de-ate-hamburg-mail.php.txt
@@ -0,0 +1,143 @@
+#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("25de-ate-hamburg-mail.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+ $maxdist = 200;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Essen";
+// $city = "September 28, 2010";
+
+// ATE Hamburg, DE, Nov 05 2010
+ $locid = 715191; // Hamburg
+ $eventname = "ATE-Hamburg";
+ $city = "Nov 05, 2010";
+
+
+
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "ate-hh@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to ate-hh@cacert.org
+ sendmail("ate-hh@cacert.org", "[CAcert.org] $eventname - $city", $lines, "ate-hh@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ echo "invitation sent to $xrows recipients.\n";
+?>
+
diff --git a/scripts/25de-ate-hamburg-mail.txt b/scripts/25de-ate-hamburg-mail.txt
new file mode 100644
index 0000000..41786d5
--- /dev/null
+++ b/scripts/25de-ate-hamburg-mail.txt
@@ -0,0 +1,67 @@
+CAcert Assurer Training Event Hamburg [Deutsch]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unters Volk zu bringen:
+
+- Was hast du auf dem CAP Formular hinzuzufuegen, wenn du Minderjaehrige ueberpruefst ?
+- Was sind die 2 wesentlichen Punkte der CCA die du einem Assuree vermitteln koennen sollst ?
+- Unter welchen Umstaenden koennen z.Bsp. niederlaendische Rufnamen akzeptiert werden?
+
+Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs).
+
+Die kommende Veranstaltung in deiner Naehe findet statt am:
+
+Freitag den 05. November 2010, 19:00 - 22:00
+
+Attraktor e.V.
+Mexikoring 21
+22297 Hamburg
+
+Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme.
+
+Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im
+Wiki [https://wiki.cacert.org/events/2010-11-05-ATE-Hamburg]
+Blog [https://blog.cacert.org/2010/10/491.html]
+
+
+
+Unverbindliche Anmeldung und Registrierung:
+Rueckantwort mit 'Ich moechte teilnehmen: ATE-Hamburg'
+
+Kontakt: ate-hh@cacert.org
+
+
+CAcert Assurer Training Event Hamburg [English]
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Much has happened during the past 3 years. The old way of
+orally-transmitted procedures has now gone, and our rules have been cast
+into formal policies. New procedures (e.g. the Assurer Challenge) and
+obligations (e.g. in the CAcert Community Agreement) have been approved.
+The Assurer Training Events bring all this to you, the Community:
+
+- What you have to add onto the CAP form if you assure U18 people ?
+- What are the 2 essential topics regarding CCA you have to present an Assuree ?
+- When you can accept i.e. a Dutch "roepnaam" ?
+
+Answers to these and many other questions are given at the Assurer
+Training Events (ATEs).
+
+ATE-Hamburg takes place on:
+Friday, Nov 05, 2010, 19:00 - 22:00
+
+Attraktor e.V.
+Mexikoring 21
+22297 Hamburg
+
+The Event-Team is looking forward to hearing from you.
+
+Details on Location and Transportation you will find under
+Wiki [https://wiki.cacert.org/events/2010-11-05-ATE-Hamburg]
+Blog [https://blog.cacert.org/2010/10/491.html]
+
+Registration for ATE-Hamburg: please reply
+'I will attend: ATE-Hamburg'
+
+Contact: ate-hh@cacert.org
+
diff --git a/scripts/26us-lisa2010-email.txt b/scripts/26us-lisa2010-email.txt
new file mode 100644
index 0000000..15cdc56
--- /dev/null
+++ b/scripts/26us-lisa2010-email.txt
@@ -0,0 +1,26 @@
+Dear CAcert Assurer,
+
+If you are attending the LISA'2010 conference in San Jose, CA, or if you live in the area, please consider attending the BoF (Birds of a Feather) sessions on Tuesday evening, 11/09/2010. I will be leading two seperate hour long BoF sessions. Both will be held in the Blossom Hill room of the San Jose Convention Center. The first is a GPG key signing event at 8:00pm. The second is a CAcert BoF, where we hope to educate and enroll some new assurers.
+
+I presented these same two BoF sessions at the LISA'09 conference in Baltimore. In order to bring any new assurers up to the 100 point level, we will need a few other assurers to help them earn their first trust points. I will also encourage them to them assurer each other on paper. They can then go on-line after the event and once they complete the Assurer Challenge, they start earning experience points.
+
+I can't pull off a successful CAcert event without a few other assurers. I am qualified to give out 35 points. I have one other assurer who has already contacted me and he is good for up to 15 points (and looking to earn more experience points himself). There were a few assurers who showed up to help last year, but I did not know in advance who was coming. If you can help, please reply to this e-mail letting me know you can attend and how many points you are qualified to assign.
+
+For more details on the events, please visit the following web pages or contact Ken. I don't really need help with the GPG key signing BoF, but you are certainly welcome to join us.
+
+[http://www.usenix.org/events/lisa10/bofs.html#gpg]
+[http://www.usenix.org/events/lisa10/bofs.html#cacert]
+
+I have updated the Event entry on the CAcert Wiki. The listing is found at:
+[https://wiki.cacert.org/events/LISA2010]
+Feel free to add your own information if you can attend, or I can add your information if you like.
+
+Ken Schumacher
+My own CAcert Assurance web page at [http://wiki.cacert.org/KenSchumacher]
+
+CAcert Bof Session, Tues Nov 9, 2010 9:00pm till 10:00pm
+Blossom Hill Room at the San Jose Marriott Hotel
+Free Admission to BoFs, no badge or ticket required
+
+
+Contact: events@cacert.org
diff --git a/scripts/26us-lisa2010-mail.php.txt b/scripts/26us-lisa2010-mail.php.txt
new file mode 100644
index 0000000..95f07c7
--- /dev/null
+++ b/scripts/26us-lisa2010-mail.php.txt
@@ -0,0 +1,151 @@
+#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("26us-lisa2010-email.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+ $maxdist = 50;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Essen";
+// $city = "September 28, 2010";
+
+// ATE Canberra, AU, Oct 12 2010
+// $locid = 2255408; // Canberra, Australian Capital Territory, Australia
+// $eventname = "ATE-Canberra";
+// $city = "Tuesday 12th October";
+
+// BLIT2010, 7. Brandenburger Linux-Infotag, 6.11.2010
+// $locid = 1486658; // Potsdam, Brandenburg, Germany
+// $eventname = "7. Brandenburger Linux-Infotag (BLIT2010)";
+// $city = "Potsdam - 6. Nov 2010";
+
+// LISA2010, Nov 7-12, 2010
+ $locid = 2096344; // San Jose (Santa Clara), California, United States
+ $eventname = "LISA2010";
+ $city = "San Jose, CA - Nov 7-12, 2010";
+
+
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ echo "invitation sent to $xrows recipients.\n";
+?>
diff --git a/scripts/27au-ate-melbourne-email.txt b/scripts/27au-ate-melbourne-email.txt
new file mode 100644
index 0000000..4b3e525
--- /dev/null
+++ b/scripts/27au-ate-melbourne-email.txt
@@ -0,0 +1,31 @@
+CAcert Assurer Training Event -- Melbourne
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
+Dear Member of the CAcert Community,
+
+Much has happened during recent years. The old way of orally-transmitted procedures has now gone, and our rules have been cast into formal policies. New procedures (e.g. the Assurer Challenge) and obligations (e.g. in the CAcert Community Agreement) have been approved.
+
+The Assurer Training Events bring all this to you, the Assurer, and the Community:
+
+- What do you have to add onto the CAP form if you assure minors ?
+- What are the 2 essential CCA points you have to present an Assuree ?
+- Who can access the Member's privacy information?
+
+Answers to these and many other questions typically faced by Assurers are given at the Assurer Training Events (ATEs). Bring your ID for assurances. Especially note that Tverify/Thawte people need to boost up their Assurance Points.
+
+ATE-Melbourne takes place at:
+* Thursday, 16th Dec, 2010
+* Readify P/L; Level 4, Life.Lab Building, 198 Harbour Esplanade, Docklands
+* 6:00pm
+
+For Registration please reply: 'I will attend ATE-Melbourne' Don't forget your ID!
+
+We are looking forward to hearing from you.
+
+
+- Best regards from the Event Team!
+
+
+PS: Contact: events@cacert.org
+Location, Transportation and other event details at
+https://wiki.cacert.org/events/20101216Melbourne
diff --git a/scripts/27au-ate-melbourne-mail.php.txt b/scripts/27au-ate-melbourne-mail.php.txt
new file mode 100644
index 0000000..55870bf
--- /dev/null
+++ b/scripts/27au-ate-melbourne-mail.php.txt
@@ -0,0 +1,156 @@
+#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("27au-ate-melbourne-email.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+ $maxdist = 50;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Essen";
+// $city = "September 28, 2010";
+
+// ATE Canberra, AU, Oct 12 2010
+// $locid = 2255408; // Canberra, Australian Capital Territory, Australia
+// $eventname = "ATE-Canberra";
+// $city = "Tuesday 12th October";
+
+// BLIT2010, 7. Brandenburger Linux-Infotag, 6.11.2010
+// $locid = 1486658; // Potsdam, Brandenburg, Germany
+// $eventname = "7. Brandenburger Linux-Infotag (BLIT2010)";
+// $city = "Potsdam - 6. Nov 2010";
+
+// LISA2010, Nov 7-12, 2010
+// $locid = 2096344; // San Jose (Santa Clara), California, United States
+// $eventname = "LISA2010";
+// $city = "San Jose, CA - Nov 7-12, 2010";
+
+// ATE Melbourne, AU, Dec 16 2010
+ $locid = 2262656; // Melbourne, VIC, Australia
+ $eventname = "ATE-Melbourne";
+ $city = "Thursday 16th December";
+
+
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ echo "invitation sent to $xrows recipients.\n";
+?>
diff --git a/scripts/addpoints.php b/scripts/addpoints.php
index a518ceb..932cd83 100755
--- a/scripts/addpoints.php
+++ b/scripts/addpoints.php
@@ -47,7 +47,7 @@
`points`='$newpoints', `method`='Administrative Increase', `date`=NOW()";
mysql_query($query);
$drow['points'] += $newpoints;
- fix_assurer_flag($drow['id'])
+ fix_assurer_flag($drow['id']);
}
}
}
diff --git a/www/cats/.#cats_import.php.1.2 b/www/cats/.#cats_import.php.1.2
deleted file mode 100644
index ec73b1b..0000000
--- a/www/cats/.#cats_import.php.1.2
+++ /dev/null
@@ -1,165 +0,0 @@
-<? /*
- LibreSSL - CAcert web application
- Copyright (C) 2004-2008 CAcert Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-// Comment (to be romeved): better to disable shot open tags in php.ini
-
-/*
- cats_import.php
-
- API for CATS to import passed tests into main CAcert database.
-*/
-
-function sanitize_string($buffer) {
- return htmlentities(utf8_decode($buffer), (int)ENQ_QUOTES);
-}
-
-define ('UNDEFINED', 'nd');
-define ('ALLOWED_IP', '72.21.48.90');
-define ('CONFIG_FILEPATH', '/www/');
-
-$remote_addr = (isset($_SERVER['REMOTE_ADDR']))?$_SERVER['REMOTE_ADDR']:UNDEFINED;
-$server_name = (isset($_SERVER['SERVER_NAME']))?$_SERVER['SERVER_NAME']:UNDEFINED;
-$https = (isset($_SERVER['HTTPS']))?$_SERVER['HTTPS']:UNDEFINED;
-$ssl_client_s_dn = (isset($_SERVER['SSL_CLIENT_S_DN']))?$_SERVER['SSL_CLIENT_S_DN']:UNDEFINED;
-
-$access = FALSE;
-
-// Access only from CATS.cacert.org with a client certificate for cats@cacert.org
-if (
- $remote_addr == ALLOWED_IP &&
- $https == 'on' &&
- // Comment (to be romeved): better to use preg_match matching the end of the line (since this is on the end of the line right?)
- // Ted: Is this specified? I don't think so, therefore I'd keep stristr
- strlen(stristr($ssl_client_s_dn, '/emailAddress=cats@cacert.org')) > 0
-) $access = TRUE;
-
-if ($access !== TRUE) {
- echo 'UNAUTHORIZED ACCESS<br>'."\r\n";
- echo 'IP: '.sanitize_string($remote_addr).'<br>'."\r\n";
- echo 'Server: '.sanitize_string($server_name).'<br>'."\r\n";
- echo 'HTTPS: '.sanitize_string($https).'<br>'."\r\n";
- echo 'Client cert: '.sanitize_string($ssl_client_s_dn).'<br>'."\r\n";
- trigger_error('Unauthorized access: ip('.$remote_addr.') server('.$server_name.') https('.$https.') cert('.$ssl_client_s_dn.')', E_USER_ERROR);
- exit();
-}
-
-// Comment (to be romeved): do you we session autostart in php.ini??
-// Ted: Sessions are quite meaningless for me since the upload protocol is stateless. Should session_start be called nevertheless?
-session_start();
-
-require_once(CONFIG_FILEPATH.'includes/mysql.php');
-
-// Comment (to be romeved): dunno the difference between stripslashes and stripcslashes
-// manual is iunclear too, please make sure there are no decoding issues
-// Ted: I just used it here because I saw it elsewhere and it seems to work. Would you prefer stripslashes?
-if (get_magic_quotes_gpc()) {
- $serial = stripcslashes($_POST['serial']);
- $root = stripcslashes($_POST['root']);
- $type = stripcslashes($_POST['type']);
- $variant = stripcslashes($_POST['variant']);
- $date = stripcslashes($_POST['date']);
-} else {
- $serial = $_POST['serial'];
- $root = $_POST['root'];
- $type = $_POST['type'];
- $variant = $_POST['variant'];
- $date = $_POST['date'];
-}
-
-// Explicitly select all those IDs so I can insert new rows if needed.
-$query = mysql_query('SELECT `id` FROM `cats_type` WHERE `type_text` = \''.mysql_real_escape_string($type).'\';');
-if (!$query) {
- echo 'Invalid query'."\r\n";
- trigger_error('Invalid query', E_USER_ERROR);
- exit();
-}
-
-if (mysql_num_rows($query) > 0) {
- $result = mysql_fetch_array($query);
- $typeID = $result['0'];
-} else {
- $query = mysql_query('INSERT INTO `cats_type` (`type_text`) VALUES (\''.mysql_real_escape_string($type).'\');');
- if (!$query) {
- echo 'Invalid query'."\r\n";
- trigger_error('Invalid query', E_USER_ERROR);
- exit();
- }
-
- $typeID = mysql_insert_id();
-}
-
-$query = mysql_query('SELECT `id` FROM `cats_variant` WHERE `type_id` = \''.(int)intval($typeID).'\' AND `test_text` = \''.mysql_real_escape_string($variant).'\';');
-if (!$query) {
- echo 'Invalid query'."\r\n";
- trigger_error('Invalid query', E_USER_ERROR);
- exit();
-}
-
-if (mysql_num_rows($query) > 0) {
- $result = mysql_fetch_array($query);
- $variantID = $result['0'];
-} else {
- $query = mysql_query('INSERT INTO `cats_variant` (`type_id`, `test_text`) VALUES (\''.(int)intval($typeID).'\', \''.mysql_real_escape_string($variant).'\');');
- if (!$query) {
- echo 'Invalid query'."\r\n";
- trigger_error('Invalid query', E_USER_ERROR);
- exit();
- }
-
- $variantID = mysql_insert_id();
-}
-
-// Now find the userid from cert serial
-$query = mysql_query('SELECT `ec`.`memid` FROM `emailcerts` AS `ec`, `root_certs` AS `rc` WHERE `ec`.`rootcert` = `rc`.`id` AND `ec`.`serial` = \''.mysql_real_escape_string($serial).'\' AND `rc`.`cert_text` = \''.mysql_real_escape_string($root).'\';');
-if (!$query) {
- echo 'Invalid query'."\r\n";
- trigger_error('Invalid query', E_USER_ERROR);
- exit();
-}
-
-if (mysql_num_rows($query) > 0) {
- $result = mysql_fetch_array($query);
- $userID = $result['0'];
-} else {
- echo 'Cannot find cert '.sanitize_string($serial).' / '.sanitize_string($root)."\r\n";
- // Let's treat this as an error, since it should not happen.
- trigger_error('Cannot find cert '.$serial.' / '.$root.'!'.mysql_error(), E_USER_ERROR);
- exit();
-}
-
-// The unique constraint on cats_passed assures that records are not stored multiply
-$query = mysql_query('INSERT INTO `cats_passed` (`user_id`, `variant_id`, `pass_date`) VALUES (\''.(int)intval($userID).'\', \''.(int)intval($variantID).'\', \''.mysql_real_escape_string($date).'\');');
-if (!$query) {
- if (mysql_errno() != 1062) { // Duplicate Entry is considered success
- echo 'Invalid query'."\r\n";
- trigger_error('Invalid query', E_USER_ERROR);
- exit();
- }
-}
-
-// Update Assurer-Flag on users table if 100 points. Should the number of points be SUM(points) or SUM(awarded)?
-$query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 1 WHERE `u`.`id` = \''.(int)intval($userID).'\' AND EXISTS(SELECT 1 FROM `cats_passed` AS `tp` WHERE `tp`.`user_id` = `u`.`id`) AND (SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` AND `expire` < now()) >= 100;'); // Challenge has been passed and non-expired points >= 100
-if (!$query) {
- echo 'Invalid query'."\r\n";
- trigger_error('Invalid query', E_USER_ERROR);
- exit();
-}
-
-echo 'OK'."\r\n";
-
-?>
diff --git a/www/images/CAcert-logo-mono-1000.png b/www/images/CAcert-logo-mono-1000.png
new file mode 100644
index 0000000..1beeb43
--- /dev/null
+++ b/www/images/CAcert-logo-mono-1000.png
Binary files differ
diff --git a/www/index.php b/www/index.php
index 73ba399..fb215c6 100644
--- a/www/index.php
+++ b/www/index.php
@@ -98,7 +98,6 @@
$body = "Someone has just attempted to update the pass phrase on the following account:\n".
"Username(ID): ".$_SESSION['lostpw']['user']['email']."(".$_SESSION['lostpw']['user']['id'].")\n".
"email: ".$_SESSION['lostpw']['user']['email']."\n".
- "Requested Pass Phrase: ".$_SESSION['lostpw']['pw1']."\n".
"IP/Hostname: ".$_SERVER['REMOTE_ADDR'].(array_key_exists('REMOTE_HOST',$_SERVER)?"/".$_SERVER['REMOTE_HOST']:"")."\n".
"---------------------------------------------------------------------\n".$body.
"---------------------------------------------------------------------\n";
diff --git a/www/policy/NRPDisclaimerAndLicence.php b/www/policy/NRPDisclaimerAndLicence.php
index 6dbc647..bee8f26 100644
--- a/www/policy/NRPDisclaimerAndLicence.php
+++ b/www/policy/NRPDisclaimerAndLicence.php
@@ -1,99 +1,14 @@
-<?php
-loadem("index");
-$id = intval($id);
-//showheader(_("CAcert - Non-Related Persons - Disclaimer and Licence"));
-?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head><title>NRP-DAL was replaced by the Root Distribution License</title></head>
+<body>
<table border="1" bgcolor="#EEEEEE"><tr><td>
-<h1 align="center"> <?=_("Non-Related Persons")?> </h1>
-<h2 align="center"> <?=_("(Disclaimer and Licence)")?> </h2>
-
-
-<h2> <?=_("Definitions")?> </h2>
-
-<p>
-<?=_("This is a Disclaimer and Licence from
-<u> CAcert Inc </u>,
-the 'issuer',
-to you, the 'user',
-being a general user of the Internet.")?>
-</p>
-
-<h2> Disclaimer </h2>
-
-<p>
-<?=_("The issuer has no other agreement with you,
-and has no control nor knowledge
-as to how you intend to use the products of the issuer.
-You alone take on all of the risk and all of the
-liability of your usage.
-The issuer makes no guarantee, warranty nor promise to you.")?>
-</p>
-
-<p>
-<?=_("Therefore, to the fullest extent possible in law,
-<b>ISSUER DISCLAIMS ALL LIABILITY TO YOU</b>
-on behalf of itself and its related parties.")?>
-</p>
-
-<h2> <?=_("Licence")?> </h2>
-
-<p>
-<?=_("This licence offers you a non-exclusive, non-transferable
-'PERMISSION TO USE' certificates issued by issuer.")?>
-</p>
-
-<ul><li>
- <?=_("You may 'USE' the certificates as facilitated
- by your software. For example,
- you may construct connections, read emails,
- load code or otherwise, as facilitated by your
- software.")?>
- </li><li>
- <?=_("You may NOT RELY on any statements or claims
- made by the certificates or implied in any way.")?>
- </li><li>
- <?=_("If your software is licensed under a separate
- third party agreement, it may be permitted
- to make statements or claims based on the certificates.
- You may NOT RELY on these statements or claims.")?>
- </li><li>
- <?=_("You may NOT distribute certificates or root keys
- under this licence, nor make representation
- about them.")?>
-</li></ul>
-
-</td></tr></table>
-
-<h2> <?=_("Alternatives")?> </h2>
-
-<p>
-<?=_("If you find the terms of the above
-Non-Related Persons
-Disclaimer and Licence
-difficult or inadequate for your use, you may wish to")?>
-</p>
-
-<ul><li>
- <?=sprintf(_("As an individual,
- %sregister with issuer%s
- and enter into the user agreement.
- This is free."),"<a href='https://www.cacert.org/index.php?id=1'>","</a>")?>
- </li><li>
- <?=_("As a Third Party Distributor,
- enter into a separate third party agreement
- with issuer.")?>
- </li><li>
- <?=_("Delete issuer's roots from your software.
- Your software documentation should give
- directions and assistance for this.")?>
-</li></ul>
-
-<p>
-<?=_("These alternatives are outside the above
-Non-Related Persons Disclaimer and Licence
-and do not incorporate.")?>
-</p>
-
+The document "Non Related Persons - Disclaimer And Licence" was replaced by the Root Distribution Licence, which can be found <a href="/policy/RootDistributionLicense.php">here</a>.
+</td>
+</tr>
+</table>
+</body>
+</html>
diff --git a/www/policy/index.php b/www/policy/index.php
index 8506489..d3bfb06 100644
--- a/www/policy/index.php
+++ b/www/policy/index.php
@@ -25,7 +25,7 @@ showheader(_("CAcert - Policies"));
foreach (glob("*.php") as $filename)
{
- if($filename != "index.php")
+ if($filename != "index.php" && $filename != "NRPDisclaimerAndLicence.php")
{
echo "<li><a href='$filename'>$filename</a></li>\n";
}
diff --git a/www/wot.php b/www/wot.php
index 25eb213..2bd4622 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -245,7 +245,7 @@
if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0)
{
- $_POST['method'] == "Administrative Increase";
+ $_POST['method'] = "Administrative Increase";
$newpoints = 200 - $drow['total'];
if(intval($_POST['expire']) > 45)
$_POST['expire'] = 45;