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 /phpBB/language/en/common.php | |
| 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.
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 1 insertions, 1 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', |