diff options
| author | David King <imkingdavid@gmail.com> | 2012-03-29 20:43:03 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-03-29 20:43:03 -0400 |
| commit | 29a904ce45f16eac928aa516be366780f05c0950 (patch) | |
| tree | 44da156e60003065f7e1c3c96e5c0f7d0ebc1a06 /phpBB/language/en/acp/common.php | |
| parent | ae824aef1255f7bd4da502fc1d9d0e85219ce32a (diff) | |
| parent | 10d4f8c35e325049002e8bb0c12d792d83ff7298 (diff) | |
| download | forums-29a904ce45f16eac928aa516be366780f05c0950.tar forums-29a904ce45f16eac928aa516be366780f05c0950.tar.gz forums-29a904ce45f16eac928aa516be366780f05c0950.tar.bz2 forums-29a904ce45f16eac928aa516be366780f05c0950.tar.xz forums-29a904ce45f16eac928aa516be366780f05c0950.zip | |
Merge branch 'develop-olympus' into develop
Conflicts:
phpBB/language/en/acp/common.php
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 7f1ecb5c01..242329a041 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -95,10 +95,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_GROUPS_POSITION' => 'Manage group positions', 'ACP_ICONS' => 'Topic icons', @@ -175,9 +175,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', |