diff options
| author | David King <imkingdavid@gmail.com> | 2012-03-31 13:49:49 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-03-31 13:49:49 -0400 |
| commit | 26a999c83c743cc94423ba548e4c27f3694a602f (patch) | |
| tree | 769bed8b92903ccdf27431a008cab00cc09e7da4 /phpBB | |
| parent | 1d4253319cf2a48fee43e892b3ca815b276d8f6a (diff) | |
| parent | 56629d8e3c80cd490b8ec39d4fa102d0303f9a4b (diff) | |
| download | forums-26a999c83c743cc94423ba548e4c27f3694a602f.tar forums-26a999c83c743cc94423ba548e4c27f3694a602f.tar.gz forums-26a999c83c743cc94423ba548e4c27f3694a602f.tar.bz2 forums-26a999c83c743cc94423ba548e4c27f3694a602f.tar.xz forums-26a999c83c743cc94423ba548e4c27f3694a602f.zip | |
Merge remote-tracking branch 'brunoais/ticket/10705' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/mcp.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_warn_front.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_warn_list.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_warn_front.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_warn_list.html | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index bd25d403ab..3ee619ea16 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -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_SUBJECT' => 'Board warning issued', '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.', diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html index 8f42e28cc0..2f7d939b16 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_front.html +++ b/phpBB/styles/prosilver/template/mcp_warn_front.html @@ -55,7 +55,7 @@ </tbody> </table> <!-- ELSE --> - <p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> + <p><strong>{L_NO_WARNINGS}</strong></p> <!-- ENDIF --> <span class="corners-bottom"><span></span></span></div> @@ -88,7 +88,7 @@ </tbody> </table> <!-- ELSE --> - <p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> + <p><strong>{L_NO_WARNINGS}</strong></p> <!-- ENDIF --> <span class="corners-bottom"><span></span></span></div> diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index d9c0bce088..5e43903f11 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -53,7 +53,7 @@ </li> </ul> <!-- ELSE --> - <p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> + <p><strong>{L_NO_WARNINGS}</strong></p> <!-- ENDIF --> <span class="corners-bottom"><span></span></span></div> diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html index 417355d537..020a79f419 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_front.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html @@ -38,7 +38,7 @@ </tr> <!-- BEGINELSE --> <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> <!-- END highest --> </table> @@ -64,7 +64,7 @@ </tr> <!-- BEGINELSE --> <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> <!-- END latest --> </table> diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html index 6ed0b68bd5..0b0cfa8a45 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_list.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_list.html @@ -21,7 +21,7 @@ </tr> <!-- BEGINELSE --> <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> <!-- END user --> <tr align="center"> |