diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 23:56:55 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 23:56:55 +0200 |
| commit | 09776d2302b751ea9d6d49d5d1c27e634bce7a7f (patch) | |
| tree | 9e95988d09c22bdd1a3998583235b55281182500 | |
| parent | 93a8c54bcb9d3590493da52457ef249aa37ce42d (diff) | |
| parent | e0ce73e3b8bf96034327a1b7a1abdb21dfa1abca (diff) | |
| download | forums-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.
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_topic.html | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 7bfddf059c..1fceaaa9ba 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -329,7 +329,7 @@ $lang = array_merge($lang, array( 'MEMBERLIST' => 'Members', 'MEMBERLIST_EXPLAIN' => 'View complete list of members', 'MERGE' => 'Merge', - 'MERGE_POSTS' => 'Merge posts', + 'MERGE_POSTS' => 'Move posts', 'MERGE_TOPIC' => 'Merge topic', 'MESSAGE' => 'Message', 'MESSAGES' => 'Messages', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index e2c0012430..16d6db061e 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -209,9 +209,8 @@ $lang = array_merge($lang, array( 'MCP_WARN_POST' => 'Warn for specific post', 'MCP_WARN_USER' => 'Warn user', - 'MERGE_POSTS' => 'Merge posts', - 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to merge the selected posts?', - 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.', + 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to move the selected posts?', + 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can move selected posts into another topic. The posts will be split from this topic and merged into the other topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.', 'MERGE_TOPIC_ID' => 'Destination topic identification number', 'MERGE_TOPICS' => 'Merge topics', 'MERGE_TOPICS_CONFIRM' => 'Are you sure you want to merge the selected topics?', diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index ecd650e093..6943dd41b3 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> 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> |