makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'brunoais/ticket/10705' into develop

Browse source
This commit is contained in:
David King 2012-03-31 13:49:49 -04:00
commit 26a999c83c
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/language/en/mcp.php
View file

@ -389,7 +389,7 @@ $lang = array_merge($lang, array(
'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]', 'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
'WARNING_PM_SUBJECT' => 'Board warning issued', 'WARNING_PM_SUBJECT' => 'Board warning issued',
'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s .', 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s .',
'WARNINGS_ZERO_TOTAL' => 'No warnings exist.', 'NO_WARNINGS' => 'No warnings exist.',
'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s.', 'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s.',

4
phpBB/styles/prosilver/template/mcp_warn_front.html
View file

@ -55,7 +55,7 @@
</tbody> </tbody>
</table> </table>
<!-- ELSE --> <!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> <p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF --> <!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>
@ -88,7 +88,7 @@
</tbody> </tbody>
</table> </table>
<!-- ELSE --> <!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> <p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF --> <!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>

2
phpBB/styles/prosilver/template/mcp_warn_list.html
View file

@ -53,7 +53,7 @@
</li> </li>
</ul> </ul>
<!-- ELSE --> <!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> <p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF --> <!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>

4
phpBB/styles/subsilver2/template/mcp_warn_front.html
View file

@ -38,7 +38,7 @@
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> <td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
</tr> </tr>
<!-- END highest --> <!-- END highest -->
</table> </table>
@ -64,7 +64,7 @@
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> <td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
</tr> </tr>
<!-- END latest --> <!-- END latest -->
</table> </table>

2
phpBB/styles/subsilver2/template/mcp_warn_list.html
View file

@ -21,7 +21,7 @@
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> <td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
</tr> </tr>
<!-- END user --> <!-- END user -->
<tr align="center"> <tr align="center">