diff options
| author | Cesar G <prototech91@gmail.com> | 2014-07-03 23:02:11 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-07-03 23:02:11 -0700 |
| commit | 5878314671954526c4cbf74417b02c1c963f0e37 (patch) | |
| tree | 206b6fa20ab144467674c66d4612192ea0970a18 /phpBB/language/en | |
| parent | 0deacb843865bea01f24d39040209c73eb087056 (diff) | |
| parent | d8d6e3e943e718b4520059a04624a3922b916534 (diff) | |
| download | forums-5878314671954526c4cbf74417b02c1c963f0e37.tar forums-5878314671954526c4cbf74417b02c1c963f0e37.tar.gz forums-5878314671954526c4cbf74417b02c1c963f0e37.tar.bz2 forums-5878314671954526c4cbf74417b02c1c963f0e37.tar.xz forums-5878314671954526c4cbf74417b02c1c963f0e37.zip | |
Merge remote-tracking branch 'PayBas/ticket/12662' into develop-ascraeus
* PayBas/ticket/12662: (29 commits)
[ticket/12662] Hide quick-links when empty
[ticket/12662] Fix white-space issue to make dropdowns uniform
[ticket/12662] Remove last remaining linklist outside navbars
[ticket/12662] Use data-last-responsive attr instead of hardcoded list
[ticket/12662] Remove <li> container from logged_out_content event
[ticket/12662] Username <span> fix for list columns
[ticket/12662] Fix notifications dropdown positioning for RTL
[ticket/12662] Update tests that utilize get_username_string
[ticket/12662] Update subsilver2 index template event names
[ticket/12662] Update events docs from b5 to rc1/rc2
[ticket/12662] Move dropdown container from <li> to new inner div
[ticket/12662] Remove linklist container and update template events
[ticket/12662] Add span containers to all usernames for consistency
[ticket/12662] IE8 fixes
[ticket/12662] Fix responsive positioning of notifications dropdown
[ticket/12662] Remove inherited props from ddown-extendended
[ticket/12662] Change CSS selectors to direct descendants for linklist
[ticket/12662] Reorder icon CSS rules alphabetically
[ticket/12662] Use slack variable to determine line-break sensitivity
[ticket/12662] Change new event names and fix events.md
...
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 61baef663b..dbef16c5f2 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -64,7 +64,7 @@ $lang = array_merge($lang, array( 'ACCOUNT_DEACTIVATED' => 'Your account has been manually deactivated and is only able to be reactivated by an administrator.', 'ACCOUNT_NOT_ACTIVATED' => 'Your account has not been activated yet.', 'ACP' => 'Administration Control Panel', - 'ACP_SHORT' => 'Administer', + 'ACP_SHORT' => 'ACP', 'ACTIVE' => 'active', 'ACTIVE_ERROR' => 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.', 'ADMINISTRATOR' => 'Administrator', @@ -393,7 +393,7 @@ $lang = array_merge($lang, array( 'MB' => 'MB', 'MIB' => 'MiB', 'MCP' => 'Moderator Control Panel', - 'MCP_SHORT' => 'Moderate', + 'MCP_SHORT' => 'MCP', 'MEMBERLIST' => 'Members', 'MEMBERLIST_EXPLAIN' => 'View complete list of members', 'MERGE' => 'Merge', @@ -595,6 +595,8 @@ $lang = array_merge($lang, array( 'PRIVATE_MESSAGING' => 'Private messaging', 'PROFILE' => 'User Control Panel', + 'QUICK_LINKS' => 'Quick links', + 'RANK' => 'Rank', 'READING_FORUM' => 'Viewing topics in %s', 'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement', @@ -661,15 +663,15 @@ $lang = array_merge($lang, array( 'SEARCH_ADV_EXPLAIN' => 'View the advanced search options', 'SEARCH_KEYWORDS' => 'Search for keywords', 'SEARCHING_FORUMS' => 'Searching forums', - 'SEARCH_ACTIVE_TOPICS' => 'View active topics', + 'SEARCH_ACTIVE_TOPICS' => 'Active topics', 'SEARCH_FOR' => 'Search for', 'SEARCH_FORUM' => 'Search this forum…', - 'SEARCH_NEW' => 'View new posts', + 'SEARCH_NEW' => 'New posts', 'SEARCH_POSTS_BY' => 'Search posts by', - 'SEARCH_SELF' => 'View your posts', + 'SEARCH_SELF' => 'Your posts', 'SEARCH_TOPIC' => 'Search this topic…', - 'SEARCH_UNANSWERED' => 'View unanswered posts', - 'SEARCH_UNREAD' => 'View unread posts', + 'SEARCH_UNANSWERED' => 'Unanswered posts', + 'SEARCH_UNREAD' => 'Unread posts', 'SEARCH_USER_POSTS' => 'Search user’s posts', 'SECONDS' => 'Seconds', 'SEE_ALL' => 'See All', |