aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:33 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:33 +0100
commitee82970d96e0a6772b24c48aab8ebd1888ec5216 (patch)
tree2f284a1671eb3667a4b280b252ecd6e930b5920c /phpBB/language/en/common.php
parentc9f68f0b5c339cf7c0126eef8e7c533a0107bd66 (diff)
parent108312d52a447e3ad5a2e8d1682f0439e5443cf0 (diff)
downloadforums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar
forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar.gz
forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar.bz2
forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar.xz
forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.zip
Merge commit 'release-3.0-B2'
Diffstat (limited to 'phpBB/language/en/common.php')
-rw-r--r--phpBB/language/en/common.php48
1 files changed, 34 insertions, 14 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ef9da82592..183f465a98 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -29,11 +29,12 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang = array_merge($lang, array(
- 'ENCODING' => 'iso-8859-1',
- 'DIRECTION' => 'ltr',
- 'LEFT' => 'left',
- 'RIGHT' => 'right',
- 'DATE_FORMAT' => '|d M Y|',
+ 'TRANSLATION_INFO' => '',
+ 'ENCODING' => 'iso-8859-1',
+ 'DIRECTION' => 'ltr',
+ 'LEFT' => 'left',
+ 'RIGHT' => 'right',
+ 'DATE_FORMAT' => '|d M Y|',
'1_DAY' => '1 day',
'1_MONTH' => '1 month',
@@ -50,6 +51,7 @@ $lang = array_merge($lang, array(
'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.',
'ADMINISTRATOR' => 'Administrator',
'ADMINISTRATORS' => 'Administrators',
+ 'AGE' => 'Age',
'ALLOWED' => 'Allowed',
'ALL_FILES' => 'All files',
'ALL_FORUMS' => 'All forums',
@@ -63,6 +65,7 @@ $lang = array_merge($lang, array(
'ASCENDING' => 'Ascending',
'ATTACHMENTS' => 'Attachments',
'AUTHOR' => 'Author',
+ 'AUTH_NO_PROFILE_CREATED' => 'Creating a user profile failed',
'AVATAR_DISALLOWED_EXTENSION' => 'The extension %s is not allowed',
'AVATAR_EMPTY_REMOTE_DATA' => 'Avatar could not be uploaded, the remote data appears to be invalid or corrupted.',
'AVATAR_INVALID_FILENAME' => '%s is an invalid filename',
@@ -85,20 +88,20 @@ $lang = array_merge($lang, array(
'BOARD_BAN_REASON' => 'Reason given for ban: <strong>%s</strong>',
'BOARD_BAN_TIME' => 'You have been banned from this board until <strong>%1$s</strong>.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
'BOARD_DISABLE' => 'Sorry but this board is currently unavailable',
+ 'BOARD_DISABLED' => 'This board is currently disabled',
'BOARD_UNAVAILABLE' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes',
'BROWSING_FORUM_GUEST' => 'Users browsing this forum: %1$s and %2$d guest',
'BROWSING_FORUM_GUESTS' => 'Users browsing this forum: %1$s and %2$d guests',
'BYTES' => 'Bytes',
- 'BY' => 'by',
'CANCEL' => 'Cancel',
'CHANGE' => 'Change',
- 'CLICK_VIEW_PRIVMSG' => '%sReturn to your Inbox%s',
+ 'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s',
'CLOSE_WINDOW' => 'Close window',
'COLOUR_SWATCH' => 'Colour swatch',
'CONFIRM' => 'Confirm',
'CONFIRM_CODE' => 'Confirmation code',
- 'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as you see it in the image, it is case insensitive.',
+ 'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as you see it in the image, it is case insensitive. Please note that a zero does not exist.',
'CONFIRM_CODE_WRONG' => 'The confirmation code you entered was incorrect.',
'CONGRATULATIONS' => 'Congratulations to',
'CONNECTION_FAILED' => 'Connection failed',
@@ -242,6 +245,9 @@ $lang = array_merge($lang, array(
'LAST_POST' => 'Last post',
'LAST_UPDATED' => 'Last updated',
+ 'LAST_VISIT' => 'Last visit',
+ 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not availible',
+ 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server',
'LEGEND' => 'Legend',
'LOCATION' => 'Location',
'LOCK_POST' => 'Lock Post',
@@ -290,12 +296,13 @@ $lang = array_merge($lang, array(
'NEW_POST' => 'New post',
'NEW_POSTS' => 'New posts',
'NEXT' => 'Next',
+ 'NEVER' => 'Never',
'NO' => 'No',
- 'NONE' => 'None',
'NOT_AUTHORIZED' => 'You are not authorised to access this area.',
'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.',
'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.',
'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.',
+ 'NO_ADMINISTRATORS' => 'No administrators assigned at this board.',
'NO_AUTH_ADMIN' => 'You do not have admin permissions and therefore not allowed to access the administration control panel.',
'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.',
'NO_AUTH_OPERATION' => 'You do not have the neccessary permissions to complete this operation.',
@@ -307,12 +314,15 @@ $lang = array_merge($lang, array(
'NO_FORUM' => 'The forum you selected does not exist',
'NO_FORUMS' => 'This board has no forums',
'NO_GROUP' => 'The requested usergroup does not exist.',
- 'NO_GROUP_MEMBERS' => 'This group is currently not having any members assigned',
+ 'NO_GROUP_MEMBERS' => 'This group currently has no members',
+ 'NO_IPS_DEFINED' => 'No IPs or Hostnames defined',
'NO_MEMBERS' => 'No members found for this search criteria',
'NO_MESSAGES' => 'No messages',
+ 'NO_MODERATORS' => 'No moderators assigned at this board.',
'NO_NEW_MESSAGES' => 'No new messages',
'NO_NEW_PM' => '<strong>0</strong> new messages',
'NO_NEW_POSTS' => 'No new posts',
+ 'NO_ONLINE_USERS' => 'No registered users',
'NO_POSTS' => 'No posts',
'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn\'t exist',
'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods',
@@ -321,10 +331,10 @@ $lang = array_merge($lang, array(
'NO_UNREAD_PM' => '<strong>0</strong> unread messages',
'NO_USER' => 'The requested user does not exist.',
'NO_USERS' => 'The requested users do not exist',
+ 'NO_USER_SPECIFIED' => 'No username was specified',
'OCCUPATION' => 'Occupation',
'OFFLINE' => 'Offline',
- 'ON' => 'On',
'ONLINE' => 'Online',
'ONLINE_BUDDIES' => 'Online Buddies',
'ONLINE_USERS_TOTAL' => 'In total there are <strong>%d</strong> users online :: ',
@@ -340,13 +350,17 @@ $lang = array_merge($lang, array(
'POST_ANNOUNCEMENT' => 'Announce',
'POST_STICKY' => 'Sticky',
'POSTED' => 'Posted',
+ 'POSTED_IN_FORUM' => 'in',
+ 'POSTED_ON_DATE' => 'on',
'POSTS' => 'Posts',
'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved',
- 'POST_BY_FOE' => 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. To display this post click %2$sHERE%3$s.',
+ 'POST_BY_AUTHOR' => 'by',
+ 'POST_BY_FOE' => 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
'POST_DAY' => '%.2f posts per day',
'POST_DETAILS' => 'Post details',
'POST_NEW_TOPIC' => 'Post new topic',
'POST_PCT' => '%.2f%% of all posts',
+ 'POST_PCT_ACTIVE' => '%.2f%% of your posts',
'POST_REPORTED' => 'Click to view report',
'POST_SUBJECT' => 'Post subject',
'POST_TIME' => 'Post time',
@@ -429,6 +443,7 @@ $lang = array_merge($lang, array(
'SKIP' => 'Skip to content',
'SMTP_NO_AUTH_SUPPORT' => 'SMTP server does not support authentication',
'SORRY_AUTH_READ' => 'You are not authorised to read this forum',
+ 'SORRY_AUTH_VIEW_ATTACH' => 'You are not authorised to download this attachment',
'SORT_BY' => 'Sort by',
'SORT_JOINED' => 'Joined date',
'SORT_LOCATION' => 'Location',
@@ -436,7 +451,7 @@ $lang = array_merge($lang, array(
'SORT_TOPIC_TITLE' => 'Topic title',
'SORT_USERNAME' => 'Username',
'SPLIT_TOPIC' => 'Split topic',
- 'SQL_ERROR_OCCURRED' => 'An SQL error occurred while fetching this page. Please contact the %sBoard Administrator%s if this problem persist.',
+ 'SQL_ERROR_OCCURRED' => 'An SQL error occurred while fetching this page. Please contact the %sBoard Administrator%s if this problem persists.',
'STATISTICS' => 'Statistics',
'START_WATCHING_FORUM' => 'Subscribe forum',
'START_WATCHING_TOPIC' => 'Subscribe topic',
@@ -510,7 +525,10 @@ $lang = array_merge($lang, array(
'TOTAL_TOPICS_ZERO' => 'Total topics <strong>0</strong>',
'TOTAL_USERS_OTHER' => 'Total members <strong>%d</strong>',
'TOTAL_USERS_ZERO' => 'Total members <strong>0</strong>',
+ 'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s',
+ 'UNABLE_GET_IMAGE_SIZE' => 'Accessing the image was impossible or file isn\'t a valid image.',
+ 'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
'UNKNOWN_BROWSER' => 'Unknown browser',
'UNMARK_ALL' => 'Unmark all',
'UNREAD_MESSAGES' => 'Unread messages',
@@ -540,12 +558,13 @@ $lang = array_merge($lang, array(
'VIEW_BOOKMARKS' => 'View bookmarks',
'VIEW_FORUM_LOGS' => 'View Logs',
'VIEW_LATEST_POST' => 'View latest post',
- 'VIEW_NEWEST_POST' => 'View newest post',
+ 'VIEW_NEWEST_POST' => 'View latest unread post',
'VIEW_NOTES' => 'View user notes',
'VIEW_ONLINE_TIME' => 'This data is based on users active over the past %d minute',
'VIEW_ONLINE_TIMES' => 'This data is based on users active over the past %d minutes',
'VIEW_TOPIC' => 'View topic',
'VIEW_TOPIC_ANNOUNCEMENT' => 'Announcement: ',
+ 'VIEW_TOPIC_GLOBAL' => 'Global Announcement: ',
'VIEW_TOPIC_LOCKED' => 'Locked: ',
'VIEW_TOPIC_LOGS' => 'View logs',
'VIEW_TOPIC_MOVED' => 'Moved: ',
@@ -609,6 +628,7 @@ $lang = array_merge($lang, array(
'Feb' => 'Feb',
'Mar' => 'Mar',
'Apr' => 'Apr',
+ 'May_short' => 'May', // Short representation of "May". May_short used because in english the short and long date are the same for May.
'Jun' => 'Jun',
'Jul' => 'Jul',
'Aug' => 'Aug',