aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2/template
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-05-23 23:56:55 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-05-23 23:56:55 +0200
commit09776d2302b751ea9d6d49d5d1c27e634bce7a7f (patch)
tree9e95988d09c22bdd1a3998583235b55281182500 /phpBB/styles/subsilver2/template
parent93a8c54bcb9d3590493da52457ef249aa37ce42d (diff)
parente0ce73e3b8bf96034327a1b7a1abdb21dfa1abca (diff)
downloadforums-09776d2302b751ea9d6d49d5d1c27e634bce7a7f.tar
forums-09776d2302b751ea9d6d49d5d1c27e634bce7a7f.tar.gz
forums-09776d2302b751ea9d6d49d5d1c27e634bce7a7f.tar.bz2
forums-09776d2302b751ea9d6d49d5d1c27e634bce7a7f.tar.xz
forums-09776d2302b751ea9d6d49d5d1c27e634bce7a7f.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
Diffstat (limited to 'phpBB/styles/subsilver2/template')
-rw-r--r--phpBB/styles/subsilver2/template/mcp_topic.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 12c0f73b97..13865d26ee 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -35,7 +35,7 @@
<!-- IF S_CAN_MERGE -->
<tr>
- <th colspan="3" nowrap="nowrap">{L_MERGE_TOPIC}</th>
+ <th colspan="3" nowrap="nowrap">{L_MERGE_POSTS}</th>
</tr>
<tr>
<td class="row2" colspan="3" align="center"><span class="gensmall">{L_MERGE_TOPIC_EXPLAIN}</span></td>