diff options
author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-26 22:57:30 -0400 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-26 22:57:30 -0400 |
commit | 2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7 (patch) | |
tree | 1c3204b5d0b28102f53bf0e19c2e4c10ec55cbdf /phpBB/language/en/acp/permissions.php | |
parent | cd6f6d2813c4436d9ca49b6a16b531def7218c9b (diff) | |
parent | 0858a8023be7b01e308959383bc1f955dbd4bf2d (diff) | |
download | forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar.gz forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar.bz2 forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar.xz forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.zip |
Merge PR #753 branch 'Senky/ticket/10161' into develop
* Senky/ticket/10161:
[ticket/10161] added fullstop to the end of sentence
[ticket/10161] coding-guidelines.html updated
[ticket/10161] all "e-mail" strings in language files changed to "email"
Diffstat (limited to 'phpBB/language/en/acp/permissions.php')
-rw-r--r-- | phpBB/language/en/acp/permissions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 2a8d857197..cf5ad33bab 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -202,7 +202,7 @@ $lang = array_merge($lang, array( 'ROLE_DESCRIPTION_MOD_SIMPLE' => 'Can only use basic topic actions. Cannot send warnings or use moderation queue.', 'ROLE_DESCRIPTION_MOD_STANDARD' => 'Can use most moderating tools, but cannot ban users or change the post author.', 'ROLE_DESCRIPTION_USER_FULL' => 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.', - 'ROLE_DESCRIPTION_USER_LIMITED' => 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.', + 'ROLE_DESCRIPTION_USER_LIMITED' => 'Can access some of the user features. Attachments, emails, or instant messages are not allowed.', 'ROLE_DESCRIPTION_USER_NOAVATAR' => 'Has a limited feature set and is not allowed to use the Avatar feature.', 'ROLE_DESCRIPTION_USER_NOPM' => 'Has a limited feature set, and is not allowed to use Private Messages.', 'ROLE_DESCRIPTION_USER_STANDARD' => 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.', |