diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-06 17:15:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-06 17:15:45 +0000 |
| commit | 431e494ae43257bea251a59ed6b2a4bb20eb7fd4 (patch) | |
| tree | 66bea58ebc6be0c6a76b5444a73016fd2a97f7ff /phpBB/language/en/common.php | |
| parent | 3933f0bab385f7702cd6335842aa42e004b3d195 (diff) | |
| download | forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar.gz forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar.bz2 forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar.xz forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.zip | |
To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.
- fix a bunch of bugs
- <!-- $Id$ --> is no longer allowed in template (.html) files
- changed layout of private message screens (folders are menu items)
- removed unread mode for private messages
- added new feature to template engine - "jump out of loop" or "loop another loop within my loop" :D (will be documented within the coding guidelines)
- added autologin field to sessions
- check session length checks
- added add_log statement to sessions to track session valid to invalid changes if ip/browser change depending on config settings (only debug)
- added multibyte support for various variables (exception at the moment is usernames which needs some discussion)
- hopefully not broke something. :/
git-svn-id: file:///svn/phpbb/trunk@5765 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 0a4be6edb3..1170e1b32d 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -71,6 +71,7 @@ $lang = array_merge($lang, array( 'AVATAR_PHP_SIZE_NA' => 'The avatar is too huge in filesize.<br />Could not determine the maximum size defined by PHP in php.ini.', 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar is too huge in filesize, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.', 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', + 'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.', 'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %1d %2s.', 'AVATAR_WRONG_SIZE' => 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.', @@ -251,6 +252,8 @@ $lang = array_merge($lang, array( 'LOG_USER_WARNING' => '<b>Added user warning</b><br />»%s', 'LOG_USER_WARNING_BODY' => '<b>The following warning was issued to this user</b><br />»%s', + 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />»User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".', + 'MARK' => 'Mark', 'MARK_ALL' => 'Mark all', 'MARK_FORUMS_READ' => 'Mark Forums Read', @@ -260,6 +263,7 @@ $lang = array_merge($lang, array( 'MEMBERLIST_EXPLAIN' => 'View complete list of members', 'MERGE_TOPIC' => 'Merge Topic', 'MESSAGE' => 'Message', + 'MESSAGES' => 'Messages', 'MESSAGE_BODY' => 'Message body', 'MINUTES' => 'Minutes', 'MODERATE' => 'Moderate', @@ -469,6 +473,7 @@ $lang = array_merge($lang, array( 'USERGROUPS' => 'Groups', 'USERNAME' => 'Username', 'USERNAMES' => 'Usernames', + 'USER_CANNOT_READ' => 'You cannot read posts in this forum', 'USER_POST' => '%d Post', 'USER_POSTS' => '%d Posts', 'USERS' => 'Users', |