OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

merge stable

Browse Source
This commit is contained in:
following
2013-03-25 13:06:58 +01:00
parent 2b2619d009 7c668cfdd4
commit bb927dca49
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/templates2/ocstyle/newemail.tpl
+2 -1
View File
@@ -45,7 +45,8 @@
{elseif $emailErrorInvalid==true}
<tr><td>&nbsp;</td><td class="errormsg">{t}The E-Mail is not valid.{/t}</td></tr>
{elseif $emailRequested==true}
<tr><td>&nbsp;</td><td class="successmsg">{t}An E-Mail was sent to you with the security code.{/t}</td></tr>
<tr><td>&nbsp;</td><td class="successmsg">{t}An E-Mail was sent to you with the security code.{/t}<br />
{t}If you do not see any E-Mail, please check the spam folder of your mailbox.{/t}</td></tr>
{elseif $emailErrorUnkown==true}
<tr><td>&nbsp;</td><td class="errormsg">{t}An unknown error occured.{/t}</td></tr>
{elseif $emailErrorExists==true}
htdocs/templates2/ocstyle/newpw.tpl
+1 -1
View File
@@ -42,7 +42,7 @@
{if $emailErrorNotFound==true}
<tr><td width="150px">&nbsp;</td><td><span class="errormsg">{t}This E-Mail-Address is not registered with a valid username.{/t}</span></td></tr>
{elseif $emailRequested==true}
<tr><td width="150px">&nbsp;</td><td><span class="successmsg">{t}An E-Mail was sent to you with the security code.{/t}</span></td></tr>
<tr><td width="150px">&nbsp;</td><td><span class="successmsg">{t}An E-Mail was sent to you with the security code.{/t}<br />{t}If you do not see any E-Mail, please check the spam folder of your mailbox.{/t}</span></td></tr>
{elseif $emailErrorUnknown==true}
<tr><td width="150px">&nbsp;</td><td><span class="errormsg">{t}An unknown error occured. The security code could not be sent to you.{/t}</span></td></tr>
{/if}
htdocs/templates2/ocstyle/register.tpl
+3 -2
View File
@@ -14,8 +14,9 @@
<tr>
<td colspan="2" class="help">
<img src="resource2/{$opt.template.style}/images/misc/hint.gif" border="0" width="15" height="11" alt="{t}Note{/t}" title="{t}Note{/t}" align="middle">
{t}The activation code was sent with an E-Mail to you.<br>
Please follow the instructions in the E-Mail.{/t}
{t}The activation code was sent with an E-Mail to you.<br />
Please follow the instructions in the E-Mail.{/t}<br />
{t}If you do not see any E-Mail, please check the spam folder of your mailbox.{/t}
</td>
</tr>
<tr><td class="spacer" colspan="2"></td></tr>
htdocs/templates2/ocstyle/remindemail.tpl
+2 -1
View File
@@ -33,7 +33,8 @@
{elseif $errorUnkown==true}
<tr><td colspan="2" class="errormsg">{t}An unkown error occured.{/t}</td></tr>
{elseif $remindMailSent==true}
<tr><td colspan="2" class="successmsg">{t}The remind E-Mail was sent.{/t}</td></tr>
<tr><td colspan="2" class="successmsg">{t}The remind E-Mail was sent.{/t}<br />
{t}If you do not see any E-Mail, please check the spam folder of your mailbox.{/t}</td></tr>
{/if}
<tr><td class="spacer" colspan="2"></td></tr>