diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-21 10:37:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-21 10:37:50 +0000 |
| commit | 515085a2a2d4b06989566a60b8add3fa4864f1e3 (patch) | |
| tree | 9000d688dc33511560a9d08191b87d1340f70af3 /phpBB/language | |
| parent | 2e1eef2713f7891ce9d78736ceae6d2faf93fc4b (diff) | |
| download | forums-515085a2a2d4b06989566a60b8add3fa4864f1e3.tar forums-515085a2a2d4b06989566a60b8add3fa4864f1e3.tar.gz forums-515085a2a2d4b06989566a60b8add3fa4864f1e3.tar.bz2 forums-515085a2a2d4b06989566a60b8add3fa4864f1e3.tar.xz forums-515085a2a2d4b06989566a60b8add3fa4864f1e3.zip | |
- some fixes
- important bugfix for the mcp and determining allowed ids in general (if global announcements are included)
git-svn-id: file:///svn/phpbb/trunk@6787 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index e1c281eb4a..6b380a8ea6 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -449,7 +449,7 @@ $lang = array_merge($lang, array( 'LOG_FORK' => '<strong>Copied topic</strong><br />» from %s', 'LOG_LOCK' => '<strong>Locked topic</strong><br />» %s', 'LOG_LOCK_POST' => '<strong>Locked post</strong><br />» %s', - 'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />»%s', + 'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />» %s', 'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %s', 'LOG_TOPIC_DELETED' => '<strong>Deleted topic</strong><br />» %s', 'LOG_TOPIC_RESYNC' => '<strong>Resynchronised topic counters</strong><br />» %s', @@ -622,8 +622,8 @@ $lang = array_merge($lang, array( 'LOG_USER_MOVE_POSTS_USER' => '<strong>Moved all posts to forum "%s"</strong>', 'LOG_USER_REACTIVATE_USER' => '<strong>Forced user account re-activation</strong>', 'LOG_USER_UNLOCK' => '<strong>User unlocked own topic</strong><br />» %s', - 'LOG_USER_WARNING' => '<strong>Added user warning</strong><br />»%s', - 'LOG_USER_WARNING_BODY' => '<strong>The following warning was issued to this user</strong><br />»%s', + 'LOG_USER_WARNING' => '<strong>Added user warning</strong><br />» %s', + 'LOG_USER_WARNING_BODY' => '<strong>The following warning was issued to this user</strong><br />» %s', 'LOG_USER_GROUP_CHANGE' => '<strong>User changed default group</strong><br />» %s', 'LOG_USER_GROUP_DEMOTE' => '<strong>User demoted as leaders from usergroup</strong><br />» %s', |