mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
This commit is contained in:
Andreas Fischer
2011-05-23 23:56:55 +02:00
parent 93a8c54bcb e0ce73e3b8
commit 09776d2302
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/mcp_topic.html
View File

@@ -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>

2
phpBB/styles/subsilver2/template/mcp_topic.html
View File

@@ -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>