diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-31 14:58:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-31 14:58:14 +0000 |
| commit | 3e42df098cedbd4c70f893ea23de7f06df519fe2 (patch) | |
| tree | df5d5b407cf15af4219b244c79d530bc3e1424ba /phpBB/language/en/acp | |
| parent | 45c97a40d268ec2be7e3300a46a2068e75f5ce52 (diff) | |
| download | forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.gz forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.bz2 forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.xz forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.zip | |
merging some changes
git-svn-id: file:///svn/phpbb/trunk@8484 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 8 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 47cb5de680..f380b1f570 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -264,10 +264,10 @@ $lang = array_merge($lang, array( 'SELECT_ANONYMOUS' => 'Select anonymous user', 'SELECT_OPTION' => 'Select option', - 'SETTING_TOO_LOW' => 'The entered value for the setting %s is too low. The minimal allowed value is %d.', - 'SETTING_TOO_BIG' => 'The entered value for the setting %s is too big. The maximal allowed value is %d.', - 'SETTING_TOO_LONG' => 'The entered value for the setting %s is too long. The maximal allowed length is %d.', - 'SETTING_TOO_SHORT' => 'The entered value for the setting %s is not long enough. The minimal allowed length is %d.', + 'SETTING_TOO_LOW' => 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.', + 'SETTING_TOO_BIG' => 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.', + 'SETTING_TOO_LONG' => 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.', + 'SETTING_TOO_SHORT' => 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.', 'UCP' => 'User Control Panel', 'USERNAMES_EXPLAIN' => 'Place each username on a separate line.', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 0217238a0d..dc28032483 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -47,7 +47,7 @@ $lang = array_merge($lang, array( 'CANNOT_DEACTIVATE_BOT' => 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.', 'CANNOT_DEACTIVATE_FOUNDER' => 'You are not allowed to deactivate founder accounts.', 'CANNOT_DEACTIVATE_YOURSELF' => 'You are not allowed to deactivate your own account.', - 'CANNOT_FORCE_REACT_BOT' => 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot within the bots page instead.', + 'CANNOT_FORCE_REACT_BOT' => 'You are not allowed to force reactivation on bot accounts. Please reactivate the bot within the bots page instead.', 'CANNOT_FORCE_REACT_FOUNDER' => 'You are not allowed to force reactivation on founder accounts.', 'CANNOT_FORCE_REACT_YOURSELF' => 'You are not allowed to force reactivation of your own account.', 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', |