diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-17 15:52:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-17 15:52:40 +0000 |
| commit | 9134cb217504dcd942045679c0c9e1aa1be0bedc (patch) | |
| tree | 9dac1983e96a1b4a5ef032cdac0d4d220e5db7f2 /phpBB/language/en/common.php | |
| parent | a862451b195c0e55a9e24e5896c378dbeb6a1c09 (diff) | |
| download | forums-9134cb217504dcd942045679c0c9e1aa1be0bedc.tar forums-9134cb217504dcd942045679c0c9e1aa1be0bedc.tar.gz forums-9134cb217504dcd942045679c0c9e1aa1be0bedc.tar.bz2 forums-9134cb217504dcd942045679c0c9e1aa1be0bedc.tar.xz forums-9134cb217504dcd942045679c0c9e1aa1be0bedc.zip | |
remove hardcoded size unit for PHP_SIZE_OVERRUN error (Bug #29935)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9464 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f603506b40..12510d5d5e 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -87,7 +87,7 @@ $lang = array_merge($lang, array( 'AVATAR_NO_SIZE' => 'The width or height of the linked avatar could not be determined. Please enter them manually.', 'AVATAR_PARTIAL_UPLOAD' => 'The specified file was only partially uploaded.', 'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.', - 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.', + 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.', '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’s filesize must be between 0 and %1d %2s.', @@ -228,6 +228,8 @@ $lang = array_merge($lang, array( 'FTP_USERNAME_EXPLAIN' => 'Username used to connect to your server.', 'GENERAL_ERROR' => 'General Error', + 'GB' => 'GB', + 'GIB' => 'GiB', 'GO' => 'Go', 'GOTO_PAGE' => 'Go to page', 'GROUP' => 'Group', |