Merge remote-tracking branch 'origin/0.9.31'

This commit is contained in:
Michael Kaufmann (d00p)
2013-12-05 12:00:54 +01:00
5 changed files with 58 additions and 1 deletions

View File

@@ -77,6 +77,22 @@ $header
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['PASSWORD']}</td>
</tr>
<tr>
<td><em>{SERVER_HOSTNAME}</em></td>
<td>{$lng['admin']['templates']['SERVER_HOSTNAME']}</td>
</tr>
<tr>
<td><em>{SERVER_IP}</em></td>
<td>{$lng['admin']['templates']['SERVER_IP']}</td>
</tr>
<tr>
<td><em>{SERVER_PORT}</em></td>
<td>{$lng['admin']['templates']['SERVER_PORT']}</td>
</tr>
<tr>
<td><em>{DOMAINNAME}</em></td>
<td>{$lng['admin']['templates']['DOMAINNAME']}</td>
</tr>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['pop_success']}</strong>

View File

@@ -78,6 +78,22 @@ $header
<td><em>{PASSWORD}</em></td>
<td>{$lng['admin']['templates']['PASSWORD']}</td>
</tr>
<tr>
<td><em>{SERVER_HOSTNAME}</em></td>
<td>{$lng['admin']['templates']['SERVER_HOSTNAME']}</td>
</tr>
<tr>
<td><em>{SERVER_IP}</em></td>
<td>{$lng['admin']['templates']['SERVER_IP']}</td>
</tr>
<tr>
<td><em>{SERVER_PORT}</em></td>
<td>{$lng['admin']['templates']['SERVER_PORT']}</td>
</tr>
<tr>
<td><em>{DOMAINNAME}</em></td>
<td>{$lng['admin']['templates']['DOMAINNAME']}</td>
</tr>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['pop_success']}</strong>