diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-12 23:33:55 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-12 23:33:55 -0500 |
| commit | 089e3a9ff4cced1570a21d40c3cca215642ccfe5 (patch) | |
| tree | c218e67a8673a7aa0fc89443dfc2f844cd7c2170 /phpBB | |
| parent | 8053be52e0c606747c6d9b1cd98acd41cace964c (diff) | |
| parent | 4d231112b67ab714c96605233bee2ba67f56a2eb (diff) | |
| download | forums-089e3a9ff4cced1570a21d40c3cca215642ccfe5.tar forums-089e3a9ff4cced1570a21d40c3cca215642ccfe5.tar.gz forums-089e3a9ff4cced1570a21d40c3cca215642ccfe5.tar.bz2 forums-089e3a9ff4cced1570a21d40c3cca215642ccfe5.tar.xz forums-089e3a9ff4cced1570a21d40c3cca215642ccfe5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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.
Diffstat (limited to 'phpBB')
| -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 d5311c5820..4a17deb32e 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 2112db3cf8..ff1faa6734 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 --> |