diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-12 23:32:43 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-12 23:32:43 -0500 |
| commit | 4d231112b67ab714c96605233bee2ba67f56a2eb (patch) | |
| tree | af35f1e533a772c0462ee43eb716247a76709352 | |
| parent | 3dd5c95b6c94320e527ad40b979d7e75032fbe6f (diff) | |
| parent | 67fa589ba28b64cf8fa2aace610f103a200fd336 (diff) | |
| download | forums-4d231112b67ab714c96605233bee2ba67f56a2eb.tar forums-4d231112b67ab714c96605233bee2ba67f56a2eb.tar.gz forums-4d231112b67ab714c96605233bee2ba67f56a2eb.tar.bz2 forums-4d231112b67ab714c96605233bee2ba67f56a2eb.tar.xz forums-4d231112b67ab714c96605233bee2ba67f56a2eb.zip | |
Merge branch 'ticket/bantu/8802' into develop-olympus
* ticket/bantu/8802:
[ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
[ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
| -rw-r--r-- | phpBB/language/en/common.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index db60cbf227..731f674120 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -190,7 +190,7 @@ $lang = array_merge($lang, array( 'FORM_INVALID' => 'The submitted form was invalid. Try submitting again.', 'FORUM' => 'Forum', 'FORUMS' => 'Forums', - 'FORUMS_MARKED' => 'All forums have been marked read.', + 'FORUMS_MARKED' => 'The selected forums have been marked read.', 'FORUM_CAT' => 'Forum category', 'FORUM_INDEX' => 'Board index', 'FORUM_LINK' => 'Forum link', @@ -322,6 +322,7 @@ $lang = array_merge($lang, array( 'MARK' => 'Mark', 'MARK_ALL' => 'Mark all', 'MARK_FORUMS_READ' => 'Mark forums read', + 'MARK_SUBFORUMS_READ' => 'Mark subforums read', 'MB' => 'MB', 'MIB' => 'MiB', 'MCP' => 'Moderator Control Panel', diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 12073a39d2..f4e80fd625 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -28,7 +28,7 @@ <!-- IF S_HAS_SUBFORUM --> <!-- IF not S_IS_BOT and U_MARK_FORUMS --> <ul class="linklist"> - <li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a></li> + <li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li> </ul> <!-- ENDIF --> <!-- INCLUDE forumlist_body.html --> |