aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-05-23 23:56:31 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-05-23 23:56:31 +0200
commite0ce73e3b8bf96034327a1b7a1abdb21dfa1abca (patch)
tree12b83c7f19b7af90548b51b06b44c8dffb30e05f /phpBB/styles/prosilver/template
parente4681f0929eb9633289e4517d8185418b7a9d07b (diff)
parentc651948cb3effbd2960062114f4b93d6507a2fe8 (diff)
downloadforums-e0ce73e3b8bf96034327a1b7a1abdb21dfa1abca.tar
forums-e0ce73e3b8bf96034327a1b7a1abdb21dfa1abca.tar.gz
forums-e0ce73e3b8bf96034327a1b7a1abdb21dfa1abca.tar.bz2
forums-e0ce73e3b8bf96034327a1b7a1abdb21dfa1abca.tar.xz
forums-e0ce73e3b8bf96034327a1b7a1abdb21dfa1abca.zip
Merge remote-tracking branch 'p/ticket/9630' into develop-olympus
* p/ticket/9630: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
Diffstat (limited to 'phpBB/styles/prosilver/template')
-rw-r--r--phpBB/styles/prosilver/template/mcp_topic.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index db36ebf5ac..a4d2a0f600 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -31,7 +31,7 @@ onload_functions.push('subPanels()');
</li>
<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
<span class="corners-top"><span></span></span>
- <a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_TOPIC}</span></a>
+ <a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_POSTS}</span></a>
</li>
</ul>
</div>