diff options
author | David King <imkingdavid@gmail.com> | 2012-03-29 20:37:50 -0400 |
---|---|---|
committer | David King <imkingdavid@gmail.com> | 2012-03-29 20:37:50 -0400 |
commit | 10d4f8c35e325049002e8bb0c12d792d83ff7298 (patch) | |
tree | 317ed845e2c2cb7267ca70435fd348f0e6c73ec0 /phpBB/language/en/acp/common.php | |
parent | ccf83dd69b5cde3ea08f798b0220c428c49bad52 (diff) | |
parent | 2768db44f557cd5db4b54a287ecb1d2fcbe94140 (diff) | |
download | forums-10d4f8c35e325049002e8bb0c12d792d83ff7298.tar forums-10d4f8c35e325049002e8bb0c12d792d83ff7298.tar.gz forums-10d4f8c35e325049002e8bb0c12d792d83ff7298.tar.bz2 forums-10d4f8c35e325049002e8bb0c12d792d83ff7298.tar.xz forums-10d4f8c35e325049002e8bb0c12d792d83ff7298.zip |
Merge branch 'harderthanfire/ticket/10129' into develop-olympus
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r-- | phpBB/language/en/acp/common.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 958b9c7598..e64ba3c371 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -96,10 +96,10 @@ $lang = array_merge($lang, array( 'ACP_GLOBAL_MODERATORS' => 'Global moderators', 'ACP_GLOBAL_PERMISSIONS' => 'Global permissions', 'ACP_GROUPS' => 'Groups', - 'ACP_GROUPS_FORUM_PERMISSIONS' => 'Groups’ forum permissions', + 'ACP_GROUPS_FORUM_PERMISSIONS' => 'Group forum permissions', 'ACP_GROUPS_MANAGE' => 'Manage groups', 'ACP_GROUPS_MANAGEMENT' => 'Group management', - 'ACP_GROUPS_PERMISSIONS' => 'Groups’ permissions', + 'ACP_GROUPS_PERMISSIONS' => 'Group permissions', 'ACP_ICONS' => 'Topic icons', 'ACP_ICONS_SMILIES' => 'Topic icons/smilies', @@ -172,9 +172,9 @@ $lang = array_merge($lang, array( 'ACP_THEMES' => 'Themes', 'ACP_UPDATE' => 'Updating', - 'ACP_USERS_FORUM_PERMISSIONS' => 'Users’ forum permissions', + 'ACP_USERS_FORUM_PERMISSIONS' => 'User forum permissions', 'ACP_USERS_LOGS' => 'User logs', - 'ACP_USERS_PERMISSIONS' => 'Users’ permissions', + 'ACP_USERS_PERMISSIONS' => 'User permissions', 'ACP_USER_ATTACH' => 'Attachments', 'ACP_USER_AVATAR' => 'Avatar', 'ACP_USER_FEEDBACK' => 'Feedback', |