diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 01:22:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 01:22:45 +0200 |
| commit | b87fcf70c01c96dc07b46ff78313f2efed5c88e5 (patch) | |
| tree | b0305f4c8bf2e2f6a8150d3ce6950cd5264ed7f1 /phpBB/language | |
| parent | ad90f262ffc511c6c3f28a946eff411754936e38 (diff) | |
| parent | a7258fc6ce5059eba0e9b521dd24e5a29d83f05d (diff) | |
| download | forums-b87fcf70c01c96dc07b46ff78313f2efed5c88e5.tar forums-b87fcf70c01c96dc07b46ff78313f2efed5c88e5.tar.gz forums-b87fcf70c01c96dc07b46ff78313f2efed5c88e5.tar.bz2 forums-b87fcf70c01c96dc07b46ff78313f2efed5c88e5.tar.xz forums-b87fcf70c01c96dc07b46ff78313f2efed5c88e5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 655fa4d56c..9299d96823 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -208,7 +208,7 @@ $lang = array_merge($lang, array( 'ACP_REGISTER_SETTINGS_EXPLAIN' => 'Here you are able to define registration and profile related settings.', 'ACC_ACTIVATION' => 'Account activation', - 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. "Board-wide e-mail" must be enabled in order to use user or admin activation.', + 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. “Board-wide e-mail” must be enabled in order to use user or admin activation.', 'NEW_MEMBER_POST_LIMIT' => 'New member post limit', 'NEW_MEMBER_POST_LIMIT_EXPLAIN' => 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>', 'NEW_MEMBER_GROUP_DEFAULT' => 'Set Newly Registered Users group to default', @@ -217,7 +217,7 @@ $lang = array_merge($lang, array( 'ACC_ADMIN' => 'By admin', 'ACC_DISABLE' => 'Disable registration', 'ACC_NONE' => 'No activation (immediate access)', - 'ACC_USER' => 'By user (email verification)', + 'ACC_USER' => 'By user (e-mail verification)', // 'ACC_USER_ADMIN' => 'User + Admin', 'ALLOW_EMAIL_REUSE' => 'Allow e-mail address re-use', 'ALLOW_EMAIL_REUSE_EXPLAIN' => 'Different users can register with the same e-mail address.', |