merged stable

htdocs/templates2/ocstyle/articles/DE/contact.tpl

@@ -20,7 +20,7 @@
 			<br />
 			<br />
 			Wenn du ein spezielles Problem hast und darauf keine Antwort findest, 
-			kannst du dir unter <a href="http://forum.geocaching-network.com/">forum.geocaching-network.com</a>
+			kannst du dir unter <a href="http://forum.opencaching-network.org/">forum.opencaching-network.org</a>
 			ein passendes Forum raussuchen und dich dort erkundigen.<br />
 			&nbsp;
 		</td>
@@ -34,7 +34,7 @@
 	<tr>
 		<td>
 			Hierfür gibt es ein eigenes Unterforum auf 
-			<a href="http://forum.geocaching-network.com/index.php?board=33.0">forum.geocaching-network.com</a>.
+			<a href="http://forum.opencaching-network.org/index.php?board=33.0">forum.opencaching-network.org</a>.
 			Dort findest du auch weitere Informationen, falls du in unserem Team mitmachen möchtest.
 			<br />
 			&nbsp;

htdocs/templates2/ocstyle/articles/EN/contact.tpl

@@ -19,7 +19,7 @@
 		  For general questions, you will find lots of information at the German websites <a href="http://wiki.opencaching.de">wiki.opencaching.de</a> and <a href="http://www.geocaching.de">www.geocaching.de</a>.
 			<br />
 			<br />
-			If you encounter a special problem, you may ask your questions in one of the German or international discussion boards at <a href="http://forum.geocaching-network.com/">forum.geocaching-network.com</a>.<br />
+			If you encounter a special problem, you may ask your questions in one of the German or international discussion boards at <a href="http://forum.opencaching-network.org/">forum.opencaching-network.org</a>.<br />
 			&nbsp;
 		</td>
 	</tr>
@@ -32,7 +32,7 @@
 	<tr>
 		<td>
 		  There is a board for this purpose at  
-			<a href="http://forum.geocaching-network.com/index.php?board=33.0">forum.geocaching-network.com</a> (<em>Opencaching 3.0 &ndash; Ideen und Gedanken</em>). It also conatains (German) information on joining our team.
+			<a href="http://forum.opencaching-network.org/index.php?board=33.0">forum.opencaching-network.org</a> (<em>Opencaching 3.0 &ndash; Ideen und Gedanken</em>). It also conatains (German) information on joining our team.
 			<br />
 			&nbsp;
 		</td>

htdocs/templates2/ocstyle/res_passworderror.tpl

@@ -7,6 +7,7 @@
 		<li>{t}Do not use parts of your username, name or email{/t}</li>
 		<li>{t}Do not use common geocaching words{/t}</li>
 		<li>{t}Do not use dictionary words like 'master'{/t}</li>
+		<li>{t}Do not use easy-to-guess number and letter sequences like '123456' or 'qwerty'{/t}</i>
 		<li>{t}Not all special characters are allowed. You may only use{/t}<br />
 		    {t}a-z A-Z 0-9 and .-_ @&auml;&uuml;&ouml;&Auml;&Uuml;&Ouml;=)(/\&amp;*+~#{/t}</li>
 	</ul>