Merge commit 'release-3.0-B3'

author: Nils Adermann <naderman@naderman.de> 2010-03-02 01:05:34 +0100
committer: Nils Adermann <naderman@naderman.de> 2010-03-02 01:05:34 +0100
commit: 07633a66e8c9bbb2b288a286bfbea6f562eeca4d (patch)
tree: a255efa70ed6f202542649148c0445445504d181 /phpBB/language/en/common.php
parent: ee82970d96e0a6772b24c48aab8ebd1888ec5216 (diff)
parent: 5cfa0ec0c32ddc424f9651d8766db3e4ced59f96 (diff)
download: forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.gz
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.bz2
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.xz
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.zip
1 files changed, 154 insertions, 128 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 183f465a98..d7e4cbd50e 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
 
 // DEVELOPERS PLEASE NOTE
 //
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
 // Placeholders can now contain order information, e.g. instead of
 // 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
 // translators to re-order the output of data while ensuring it remains correct
@@ -30,11 +32,11 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'TRANSLATION_INFO'	=> '',
-	'ENCODING'			=> 'iso-8859-1',
 	'DIRECTION'			=> 'ltr',
 	'LEFT'				=> 'left',
 	'RIGHT'				=> 'right',
 	'DATE_FORMAT'		=> '|d M Y|',
+	'USER_LANG'			=> 'en-gb',
 
 	'1_DAY'			=> '1 day',
 	'1_MONTH'		=> '1 month',
@@ -52,6 +54,7 @@ $lang = array_merge($lang, array(
 	'ADMINISTRATOR'					=> 'Administrator',
 	'ADMINISTRATORS'				=> 'Administrators',
 	'AGE'							=> 'Age',
+	'AIM'							=> 'AIM',
 	'ALLOWED'						=> 'Allowed',
 	'ALL_FILES'						=> 'All files',
 	'ALL_FORUMS'					=> 'All forums',
@@ -72,8 +75,8 @@ $lang = array_merge($lang, array(
 	'AVATAR_NOT_UPLOADED'			=> 'Avatar could not be uploaded.',
 	'AVATAR_NO_SIZE'				=> 'Could not obtain width or height of linked avatar, please enter them manually.',
 	'AVATAR_PARTIAL_UPLOAD'			=> 'The uploaded file was only partially uploaded',
-	'AVATAR_PHP_SIZE_NA'			=> 'The avatar\'s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
-	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar\'s filesize is too large, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
+	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
+	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
 	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
 	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
 	'AVATAR_WRONG_FILESIZE'			=> 'The avatar must be between 0 and %1d %2s.',
@@ -81,6 +84,9 @@ $lang = array_merge($lang, array(
 
 	'BACK_TO_TOP'			=> 'Top',
 	'BACK_TO_PREV'			=> 'Back to previous page',
+	'BAN_TRIGGERED_BY_EMAIL'=> 'This ban has been issued on your email address.',
+	'BAN_TRIGGERED_BY_IP'	=> 'This ban has been issued on your ip address.',
+	'BAN_TRIGGERED_BY_USER'	=> 'This ban has been issued on your username.',
 	'BBCODE_GUIDE'			=> 'BBCode guide',
 	'BCC'					=> 'BCC',
 	'BIRTHDAYS'				=> 'Birthdays',
@@ -96,6 +102,7 @@ $lang = array_merge($lang, array(
 
 	'CANCEL'				=> 'Cancel',
 	'CHANGE'				=> 'Change',
+	'CHANGE_FONT_SIZE'		=> 'Change font size',
 	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
 	'CLOSE_WINDOW'			=> 'Close window',
 	'COLOUR_SWATCH'			=> 'Colour swatch',
@@ -107,7 +114,7 @@ $lang = array_merge($lang, array(
 	'CONNECTION_FAILED'		=> 'Connection failed',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
 	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
-	'CURRENT_TIME'			=> 'The time is %s',
+	'CURRENT_TIME'			=> 'It is currently %s',
 
 	'DAY'					=> 'Day',
 	'DAYS'					=> 'Days',
@@ -133,13 +140,15 @@ $lang = array_merge($lang, array(
 	'EDIT_POST'							=> 'Edit post',
 	'EMAIL'								=> 'Email',
 	'EMAIL_ADDRESS'						=> 'Email address',
-	'EMAIL_SMTP_ERROR_RESPONSE'			=> "Ran into problems sending Mail at <strong>Line %s</strong>. Response: %s",
+	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending email at <strong>Line %1$s</strong>. Response: %2$s',
 	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
 	'ENABLED'							=> 'Enabled',
 	'ENCLOSURE'							=> 'Enclosure',
 	'ERR_CHANGING_DIRECTORY'			=> 'Unable to change directory',
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server',
 	'ERR_UNABLE_TO_LOGIN'				=> 'Error on login. Supplied username or password wrong.',
+	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path entered seems to be not valid.',
+	'EXPAND_VIEW'						=> 'Expand view',
 	'EXTENSION'							=> 'Extension',
 	'EXTENSION_DISABLED_AFTER_POSTING'	=> 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed',
 
@@ -147,6 +156,7 @@ $lang = array_merge($lang, array(
 	'FAQ_EXPLAIN'			=> 'Frequently Asked Questions',
 	'FILENAME'				=> 'Filename',
 	'FILESIZE'				=> 'Filesize',
+	'FILEDATE'				=> 'Filedate',
 	'FILE_COMMENT'			=> 'File comment',
 	'FILE_NOT_FOUND'		=> 'The requested file could not be found',
 	'FIND_USERNAME'			=> 'Find a member',
@@ -208,8 +218,6 @@ $lang = array_merge($lang, array(
 	'G_ADMINISTRATORS'			=> 'Administrators',
 	'G_BOTS'					=> 'Bots',
 	'G_GUESTS'					=> 'Guests',
-	'G_INACTIVE'				=> 'Unapproved Users',
-	'G_INACTIVE_COPPA'			=> 'Unapproved COPPA Users',
 	'G_REGISTERED'				=> 'Registered Users',
 	'G_REGISTERED_COPPA'		=> 'Registered COPPA Users',
 	'G_GLOBAL_MODERATORS'		=> 'Global Moderators',
@@ -225,9 +233,12 @@ $lang = array_merge($lang, array(
 	'HOURS'						=> 'Hours',
 	'HOME'						=> 'Home',
 
-	'ICQ_STATUS'				=> 'ICQ status',
+	'ICQ'						=> 'ICQ',
+	'ICQ_STATUS'				=> 'ICQ status',	
 	'IF'						=> 'if',
 	'IMAGE'						=> 'Image',
+	'IMAGE_FILETYPE_INVALID'	=> 'Image filetype %d for mimetype %s not supported.',
+	'IMAGE_FILETYPE_MISMATCH'	=> 'Image filetype mismatch: expected extension %1$s but extension %2$s given.',
 	'IN'						=> 'in',
 	'INDEX'						=> 'Index page',
 	'INFORMATION'				=> 'Information',
@@ -235,57 +246,59 @@ $lang = array_merge($lang, array(
 	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge',
 	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid email address?',
 	'IP'						=> 'IP',
+	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
 
+	'JABBER'				=> 'Jabber',
 	'JOINED'				=> 'Joined',
 	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
 	'JUMP_TO'				=> 'Jump to',
-	'JUMP_TO_PAGE'			=> 'Click to jump to page...',
-
-	'KB'				=> 'KB',
-
-	'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',
-	'LOCK_POST_EXPLAIN'		=> 'Prevent editing',
-	'LOCK_TOPIC'			=> 'Lock topic',
-	'LOGIN'					=> 'Login',
-	'LOGIN_CHECK_PM'		=> 'Log in to check your private messages',
-	'LOGIN_CONFIRMATION'	=> 'Confirmation of login',
-	'LOGIN_CONFIRM_EXPLAIN'	=> 'To prevent brute forcing accounts the board administrator requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_ATTEMPTS'	=> 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now have to additionally confirm the image you see below.',
+	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
+
+	'KB'					=> 'KB',
+
+	'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',
+	'LOCK_POST_EXPLAIN'					=> 'Prevent editing',
+	'LOCK_TOPIC'						=> 'Lock topic',
+	'LOGIN'								=> 'Login',
+	'LOGIN_CHECK_PM'					=> 'Log in to check your private messages',
+	'LOGIN_CONFIRMATION'				=> 'Confirmation of login',
+	'LOGIN_CONFIRM_EXPLAIN'				=> 'To prevent brute forcing accounts the board administrator requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
+	'LOGIN_ERROR_ATTEMPTS'				=> 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to enter the confirm code from the image you see below.',
 	'LOGIN_ERROR_EXTERNAL_AUTH_APACHE'	=> 'You have not been authenticated by apache.',
-	'LOGIN_ERROR_PASSWORD'	=> 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_USERNAME'	=> 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_FORUM'			=> 'To view or post in this forum you must enter its password.',
-	'LOGIN_INFO'			=> 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilies. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
-	'LOGIN_VIEWFORUM'		=> 'The board administrator requires you to be registered and logged in to view this forum.',
-	'LOGIN_EXPLAIN_EDIT'	=> 'In order to edit posts in this forum you have to be registered and logged in.',
-	'LOGOUT'				=> 'Logout',
-	'LOGOUT_USER'			=> 'Logout [ %s ]',
-	'LOG_ME_IN'				=> 'Log me on automatically each visit',
-
-	'MARK'				=> 'Mark',
-	'MARK_ALL'			=> 'Mark all',
-	'MARK_FORUMS_READ'	=> 'Mark forums read',
-	'MB'				=> 'MB',
-	'MCP'				=> 'Moderator Control Panel',
-	'MEMBERLIST'		=> 'Members',
+	'LOGIN_ERROR_PASSWORD'				=> 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
+	'LOGIN_ERROR_USERNAME'				=> 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
+	'LOGIN_FORUM'						=> 'To view or post in this forum you must enter its password.',
+	'LOGIN_INFO'						=> 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilities. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
+	'LOGIN_VIEWFORUM'					=> 'The board administrator requires you to be registered and logged in to view this forum.',
+	'LOGIN_EXPLAIN_EDIT'				=> 'In order to edit posts in this forum you have to be registered and logged in.',
+	'LOGOUT'							=> 'Logout',
+	'LOGOUT_USER'						=> 'Logout [ %s ]',
+	'LOG_ME_IN'							=> 'Log me on automatically each visit',
+
+	'MARK'					=> 'Mark',
+	'MARK_ALL'				=> 'Mark all',
+	'MARK_FORUMS_READ'		=> 'Mark forums read',
+	'MB'					=> 'MB',
+	'MCP'					=> 'Moderator Control Panel',
+	'MEMBERLIST'			=> 'Members',
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
-	'MERGE_TOPIC'		=> 'Merge Topic',
-	'MESSAGE'			=> 'Message',
-	'MESSAGES'			=> 'Messages',
-	'MESSAGE_BODY'		=> 'Message body',
-	'MINUTES'			=> 'Minutes',
-	'MODERATE'			=> 'Moderate',
-	'MODERATOR'			=> 'Moderator',
-	'MODERATORS'		=> 'Moderators',
-	'MONTH'				=> 'Month',
-	'MOVE'				=> 'Move',
+	'MERGE_TOPIC'			=> 'Merge Topic',
+	'MESSAGE'				=> 'Message',
+	'MESSAGES'				=> 'Messages',
+	'MESSAGE_BODY'			=> 'Message body',
+	'MINUTES'				=> 'Minutes',
+	'MODERATE'				=> 'Moderate',
+	'MODERATOR'				=> 'Moderator',
+	'MODERATORS'			=> 'Moderators',
+	'MONTH'					=> 'Month',
+	'MOVE'					=> 'Move',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s%s%s</strong>',
@@ -302,35 +315,40 @@ $lang = array_merge($lang, array(
 	'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_ACTION'					=> 'No action specified.',
 	'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.',
+	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
 	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %s : %s',
 	'NO_BIRTHDAYS'				=> 'No birthdays today',
 	'NO_EMAIL_MESSAGE'			=> 'Email message was blank',
 	'NO_EMAIL_RESPONSE_CODE'	=> 'Could not get mail server response codes',
 	'NO_EMAIL_SUBJECT'			=> 'No email subject specified',
-	'NO_FORUM'					=> 'The forum you selected does not exist',
+	'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 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_MODE'					=> 'No mode specified.',
 	'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_POSTS_TIME_FRAME'		=> 'No posts exist inside this topic for the selected time frame.',
+	'NO_SUCH_SEARCH_MODULE'		=> 'The specified search backend doesn’t exist',
 	'NO_SUPPORTED_AUTH_METHODS'	=> 'No supported authentication methods',
 	'NO_TOPIC'					=> 'The requested topic does not exist.',
 	'NO_TOPICS'					=> 'There are no topics or posts in this forum.',
+	'NO_TOPICS_TIME_FRAME'		=> 'No topics exist inside this forum for the selected time frame.',
 	'NO_UNREAD_PM'				=> '<strong>0</strong> unread messages',
+	'NO_UPLOAD_FORM_FOUND'		=> 'Upload initiated but no valid file upload form found.',
 	'NO_USER'					=> 'The requested user does not exist.',
-	'NO_USERS'					=> 'The requested users do not exist',
+	'NO_USERS'					=> 'The requested users do not exist.',
 	'NO_USER_SPECIFIED'			=> 'No username was specified',
 
 	'OCCUPATION'				=> 'Occupation',
@@ -342,36 +360,37 @@ $lang = array_merge($lang, array(
 	'ONLINE_USER_TOTAL'			=> 'In total there is <strong>%d</strong> user online :: ',
 	'OPTIONS'					=> 'Options',
 
-	'PAGE_OF'			=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
-	'PASSWORD'			=> 'Password',
-	'PM'				=> 'PM',
-	'POSTING_MESSAGE'	=> 'Posting message in %s',
-	'POST'				=> 'Post',
-	'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_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',
-	'POST_UNAPPROVED'	=> 'This post is waiting for approval',
-	'PREVIEW'			=> 'Preview',
-	'PREVIOUS'			=> 'Previous',
-	'PRIVACY'			=> 'Privacy policy',
-	'PRIVATE_MESSAGE'	=> 'Private Message',
-	'PRIVATE_MESSAGES'	=> 'Private Messages',
-	'PRIVATE_MESSAGING'	=> 'Private Messaging',
-	'PROFILE'			=> 'User Control Panel',
+	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
+	'PASSWORD'				=> 'Password',
+	'PLAY_QUICKTIME_FILE'	=> 'Play quicktime file',
+	'PM'					=> 'PM',
+	'POSTING_MESSAGE'		=> 'Posting message in %s',
+	'POST'					=> 'Post',
+	'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_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',
+	'POST_UNAPPROVED'		=> 'This post is waiting for approval',
+	'PREVIEW'				=> 'Preview',
+	'PREVIOUS'				=> 'Previous',
+	'PRIVACY'				=> 'Privacy policy',
+	'PRIVATE_MESSAGE'		=> 'Private Message',
+	'PRIVATE_MESSAGES'		=> 'Private Messages',
+	'PRIVATE_MESSAGING'		=> 'Private Messaging',
+	'PROFILE'				=> 'User Control Panel',
 
 	'READING_FORUM'				=> 'Viewing topics in %s',
 	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
@@ -389,7 +408,7 @@ $lang = array_merge($lang, array(
 	'REG_USER_ONLINE'			=> 'There is %d registered user and ',
 	'REG_USER_TOTAL'			=> '%d registered, ',
 	'REMOVE'					=> 'Remove',
-	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory.',
+	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory before you use your forum. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
 	'REPLIES'					=> 'Replies',
 	'REPLY_WITH_QUOTE'			=> 'Reply with quote',
 	'REPLYING_GLOBAL_ANNOUNCE'	=> 'Replying to Global Announcement',
@@ -429,8 +448,11 @@ $lang = array_merge($lang, array(
 	'SEARCHING_FORUMS'			=> 'Searching forums',
 	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
 	'SEARCH_FOR'				=> 'Search for',
+	'SEARCH_FORUM'				=> 'Search this forum',	
 	'SEARCH_NEW'				=> 'View new posts',
+	'SEARCH_POSTS_BY'			=> 'Search posts by',
 	'SEARCH_SELF'				=> 'View your posts',
+	'SEARCH_TOPIC'				=> 'Search this topic',
 	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
 	'SECONDS'					=> 'Seconds',
 	'SELECT'					=> 'Select',
@@ -527,7 +549,7 @@ $lang = array_merge($lang, array(
 	'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_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',
@@ -542,6 +564,7 @@ $lang = array_merge($lang, array(
 	'USERGROUPS'			=> 'Groups',
 	'USERNAME'				=> 'Username',
 	'USERNAMES'				=> 'Usernames',
+	'USER_AVATAR'			=> 'User avatar',
 	'USER_CANNOT_READ'		=> 'You cannot read posts in this forum',
 	'USER_POST'				=> '%d Post',
 	'USER_POSTS'			=> '%d Posts',
@@ -570,6 +593,7 @@ $lang = array_merge($lang, array(
 	'VIEW_TOPIC_MOVED'			=> 'Moved: ',
 	'VIEW_TOPIC_POLL'			=> 'Poll: ',
 	'VIEW_TOPIC_STICKY'			=> 'Sticky: ',
+	'VISIT_WEBSITE'				=> 'Visit website',
 
 	'WARNINGS'			=> 'Warnings',
 	'WARN_USER'			=> 'Warn user',
@@ -586,6 +610,7 @@ $lang = array_merge($lang, array(
 
 	'YEAR'				=> 'Year',
 	'YES'				=> 'Yes',
+	'YIM'				=> 'YIM',	
 	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
 	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox',
 	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox',
@@ -593,6 +618,7 @@ $lang = array_merge($lang, array(
 
 	'datetime'			=> array(
 		'TODAY'		=> 'Today, ',
+		'TOMORROW'	=> 'Tomorrow, ',
 		'YESTERDAY'	=> 'Yesterday, ',
 
 		'Sunday'	=> 'Sunday',
@@ -682,45 +708,45 @@ $lang = array_merge($lang, array(
 	),
 
 	'tz_zones'	=> array(
-		'-12'	=> '[UTC - 12, Y] Baker Island Time',
-		'-11'	=> '[UTC - 11, X] Niue Time, Samoa Standard Time',
-		'-10'	=> '[UTC - 10, W] Hawaii-Aleutian Standard Time, Cook Island Time',
-		'-9.5'	=> '[UTC - 9:30, V*] Marquesas Islands Time',
-		'-9'	=> '[UTC - 9, V] Alaska Standard Time, Gambier Island Time',
-		'-8'	=> '[UTC - 8, U] Pacific Standard Time',
-		'-7'	=> '[UTC - 7, T] Mountain Standard Time',
-		'-6'	=> '[UTC - 6, S] Central Standard Time',
-		'-5'	=> '[UTC - 5, R] Eastern Standard Time',
-		'-4'	=> '[UTC - 4, Q] Atlantic Standard Time',
-		'-3.5'	=> '[UTC - 3:30, P*] Newfoundland Standard Time',
-		'-3'	=> '[UTC - 3, P] Amazon Standard Time, Central Greenland Time',
-		'-2'	=> '[UTC - 2, O] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
-		'-1'	=> '[UTC - 1, N] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
-		'0'		=> '[UTC, Z] Western European Time, Greenwich Mean Time',
-		'1'		=> '[UTC + 1, A] Central European Time, West African Time',
-		'2'		=> '[UTC + 2, B] Eastern European Time, Central African Time',
-		'3'		=> '[UTC + 3, C] Moscow Standard Time, Eastern African Time',
-		'3.5'	=> '[UTC + 3:30, C*] Iran Standard Time',
-		'4'		=> '[UTC + 4, D] Gulf Standard Time, Samara Standard Time',
-		'4.5'	=> '[UTC + 4:30, D*] Afghanistan Time',
-		'5'		=> '[UTC + 5, E] Pakistan Standard Time, Yekaterinburg Standard Time',
-		'5.5'	=> '[UTC + 5:30, E*] Indian Standard Time, Sri Lanka Time',
-		'5.75'	=> '[UTC + 5:45, E&Dagger;] Nepal Time',
-		'6'		=> '[UTC + 6, F] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
-		'6.5'	=> '[UTC + 6:30, F*] Cocos Islands Time, Myanmar Time',
-		'7'		=> '[UTC + 7, G] Indochina Time, Krasnoyarsk Standard Time',
-		'8'		=> '[UTC + 8, H] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
-		'8.75'	=> '[UTC + 8:45, H&Dagger;] Southeastern Western Australia Standard Time',
-		'9'		=> '[UTC + 9, I] Japan Standard Time, Korea Standard Time, Chita Standard Time',
-		'9.5'	=> '[UTC + 9:30, I*] Australian Central Standard Time',
-		'10'	=> '[UTC + 10, K] Australian Eastern Standard Time, Vladivostok Standard Time',
-		'10.5'	=> '[UTC + 10:30, K*] Lord Howe Standard Time',
-		'11'	=> '[UTC + 11, L] Solomon Island Time, Magadan Standard Time',
-		'11.5'	=> '[UTC + 11:30, L*] Norfolk Island Time',
-		'12'	=> '[UTC + 12, M] New Zealand Time, Fiji Time, Kamchatka Standard Time',
-		'12.75'	=> '[UTC + 12:45, M&Dagger;] Chatham Islands Time',
-		'13'	=> '[UTC + 13, M*] Tonga Time, Phoenix Islands Time',
-		'14'	=> '[UTC + 14, M&dagger;] Line Island Time',
+		'-12'	=> '[UTC - 12] Baker Island Time',
+		'-11'	=> '[UTC - 11] Niue Time, Samoa Standard Time',
+		'-10'	=> '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time',
+		'-9.5'	=> '[UTC - 9:30] Marquesas Islands Time',
+		'-9'	=> '[UTC - 9] Alaska Standard Time, Gambier Island Time',
+		'-8'	=> '[UTC - 8] Pacific Standard Time',
+		'-7'	=> '[UTC - 7] Mountain Standard Time',
+		'-6'	=> '[UTC - 6] Central Standard Time',
+		'-5'	=> '[UTC - 5] Eastern Standard Time',
+		'-4'	=> '[UTC - 4] Atlantic Standard Time',
+		'-3.5'	=> '[UTC - 3:30] Newfoundland Standard Time',
+		'-3'	=> '[UTC - 3] Amazon Standard Time, Central Greenland Time',
+		'-2'	=> '[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
+		'-1'	=> '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
+		'0'		=> '[UTC] Western European Time, Greenwich Mean Time',
+		'1'		=> '[UTC + 1] Central European Time, West African Time',
+		'2'		=> '[UTC + 2] Eastern European Time, Central African Time',
+		'3'		=> '[UTC + 3] Moscow Standard Time, Eastern African Time',
+		'3.5'	=> '[UTC + 3:30] Iran Standard Time',
+		'4'		=> '[UTC + 4] Gulf Standard Time, Samara Standard Time',
+		'4.5'	=> '[UTC + 4:30] Afghanistan Time',
+		'5'		=> '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time',
+		'5.5'	=> '[UTC + 5:30] Indian Standard Time, Sri Lanka Time',
+		'5.75'	=> '[UTC + 5:45] Nepal Time',
+		'6'		=> '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
+		'6.5'	=> '[UTC + 6:30] Cocos Islands Time, Myanmar Time',
+		'7'		=> '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time',
+		'8'		=> '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
+		'8.75'	=> '[UTC + 8:45] Southeastern Western Australia Standard Time',
+		'9'		=> '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time',
+		'9.5'	=> '[UTC + 9:30] Australian Central Standard Time',
+		'10'	=> '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time',
+		'10.5'	=> '[UTC + 10:30] Lord Howe Standard Time',
+		'11'	=> '[UTC + 11] Solomon Island Time, Magadan Standard Time',
+		'11.5'	=> '[UTC + 11:30] Norfolk Island Time',
+		'12'	=> '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time',
+		'12.75'	=> '[UTC + 12:45] Chatham Islands Time',
+		'13'	=> '[UTC + 13] Tonga Time, Phoenix Islands Time',
+		'14'	=> '[UTC + 14] Line Island Time',
 	),
 
 	// The value is only an example and will get replaced by the current time on view
author	Nils Adermann <naderman@naderman.de>	2010-03-02 01:05:34 +0100
committer	Nils Adermann <naderman@naderman.de>	2010-03-02 01:05:34 +0100
commit	07633a66e8c9bbb2b288a286bfbea6f562eeca4d (patch)
tree	a255efa70ed6f202542649148c0445445504d181 /phpBB/language/en/common.php
parent	ee82970d96e0a6772b24c48aab8ebd1888ec5216 (diff)
parent	5cfa0ec0c32ddc424f9651d8766db3e4ced59f96 (diff)
download	forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.gz forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.bz2 forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.xz forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.zip