diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 13:38:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 13:41:54 +0200 |
| commit | 8b8c25194a42a365f9da5eee84fe9163dbb610d5 (patch) | |
| tree | cc1be52b29bf23a36ffb734348e553e4927d0028 /phpBB/language/en/common.php | |
| parent | dacece711b24ac0b8828b6b5d7776ab6ae7b5333 (diff) | |
| parent | f2500da8ec2c649ee59afd47fe99321e92a249e7 (diff) | |
| download | forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar.gz forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar.bz2 forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar.xz forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12540] Fix broken placeholders in language files
Conflicts:
phpBB/language/en/common.php
phpBB/language/en/posting.php
phpBB/language/en/ucp.php
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 7026e60911..982ca4cf5a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -109,7 +109,7 @@ $lang = array_merge($lang, array( '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.', + 'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1$d %2$s.', 'AVATAR_WRONG_SIZE' => 'The submitted avatar is %5$s wide and %6$s high. Avatars must be at least %1$s wide and %2$s high, but no larger than %3$s wide and %4$s high.', 'BACK_TO_TOP' => 'Top', |